From brad@liquidneon.com  Sun Jul  7 19:49:36 2013
Return-Path: <brad@liquidneon.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id BFC1FAFB
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Jul 2013 19:49:36 +0000 (UTC)
	(envelope-from brad@liquidneon.com)
Received: from valentine.liquidneon.com (cl-1479.chi-02.us.sixxs.net [IPv6:2001:4978:f:5c6::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D019121D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Jul 2013 19:49:36 +0000 (UTC)
Received: by valentine.liquidneon.com (Postfix, from userid 1001)
	id 3F6538FF88; Sun,  7 Jul 2013 13:49:29 -0600 (MDT)
Message-Id: <20130707194929.3F6538FF88@valentine.liquidneon.com>
Date: Sun,  7 Jul 2013 13:49:29 -0600 (MDT)
From: Brad Davis <brd@FreeBSD.org>
Reply-To: Brad Davis <brd@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] net-mgmt/collectd5 Fix build with PGSQL and GCRYPT
X-Send-Pr-Version: 3.113
X-GNATS-Notify: ports@bsdserwis.com

>Number:         180370
>Category:       ports
>Synopsis:       [patch] net-mgmt/collectd5 Fix build with PGSQL and GCRYPT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 07 19:50:00 UTC 2013
>Closed-Date:    Sun Jul 07 21:55:48 UTC 2013
>Last-Modified:  Sun Jul  7 22:00:00 UTC 2013
>Originator:     Brad Davis
>Release:        FreeBSD 9.1-RELEASE i386
>Organization:
>Environment:
	
>Description:
	- Fix a few typos in the descriptions
	- Fix build with PGSQL
	- Fix build with GCRYPT
>How-To-Repeat:
	
>Fix:

	

--- collectd5-build.diff begins here ---
Index: net-mgmt/collectd5/Makefile
===================================================================
--- net-mgmt/collectd5/Makefile	(revision 322457)
+++ net-mgmt/collectd5/Makefile	(working copy)
@@ -27,9 +27,9 @@
 JSON_DESC=		Enable JSON plugins
 MEMCACHEC_DESC=		Enable memcachec plugin
 MODBUS_DESC=		Enable modbus plugin
-MYSQL_DESC=		Enable mysql-basd plugins
+MYSQL_DESC=		Enable mysql-based plugins
 NUTUPS_DESC=		Enable nut (ups) plugin
-PGSQL_DESC=		Enable postgresql-basd plugins
+PGSQL_DESC=		Enable postgresql-based plugins
 PING_DESC=		Enable ping plugin
 PYTHON_DESC=		Enable python-based plugins
 REDIS_DESC=		Enable redis-based plugins
@@ -206,6 +206,7 @@
 .if ${PORT_OPTIONS:MGCRYPT}
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=--with-libgcrypt=${LOCALBASE}
+LDFLAGS+=	-lgcrypt
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
@@ -258,7 +259,7 @@
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
-CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql
+CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql --with-libpq
 PLIST_SUB+=	PGSQL=""
 .else
 PLIST_SUB+=	PGSQL="@comment "
--- collectd5-build.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jul 7 19:50:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180370 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: ports@bsdserwis.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/180370: [patch] net-mgmt/collectd5 Fix build with PGSQL and GCRYPT
Date: Sun, 7 Jul 2013 19:50:07 UT

 Maintainer of net-mgmt/collectd5,
 
 Please note that PR ports/180370 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180370
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Krzysztof Stryjek <ports@bsdserwis.com>
To: bug-followup@FreeBSD.org
Cc: ports@bsdserwis.com
Subject: Re: ports/180370: [patch] net-mgmt/collectd5 Fix build with PGSQL
 and GCRYPT
Date: Sun, 7 Jul 2013 22:48:05 +0200

 Hello,
 
 On Sun, Jul 07, 2013 at 07:50:07PM +0000, Edwin Groothuis wrote:
 > Maintainer of net-mgmt/collectd5,
 > 
 > Please note that PR ports/180370 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180370
 > 
 Yes, I 've found bug with pgsql plugin lately. I wanted to make a PR,
 but it seems, that someone did it earlier :-)))
 
 So I apporve this patch. Thank a lot for your work Brad and Edwin.
 
 Greetings,
 -- 
 Krzysztof Stryjek
 UNIX administrator/Juniper Networks Specialist
 email: wtp (at) bsdserwis (dot) com
 http://www.linkedin.com/in/KrzysztofStryjek
 GPG fingerprint: 8BD7 40CE 8994 0BBE CE6C  91CD 1292 8959 DC61 0E76
 
 In theory, there is no difference between theory and practice.
 In practice, there is.
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Sun Jul 7 21:53:07 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180370 
State-Changed-From-To: feedback->closed 
State-Changed-By: wg 
State-Changed-When: Sun Jul 7 21:55:48 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180370 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180370: commit references a PR
Date: Sun,  7 Jul 2013 21:55:51 +0000 (UTC)

 Author: wg
 Date: Sun Jul  7 21:55:43 2013
 New Revision: 322460
 URL: http://svnweb.freebsd.org/changeset/ports/322460
 
 Log:
   net-mgmt/collectd5: fix build with PGSQL and GCRYPT
   
   - Fix build with PGSQL and GCRYPT
   - Fix typo in a couple descriptions
   
   PR:		ports/180370
   Submitted by:	brd
   Approved by:	maintainer
 
 Modified:
   head/net-mgmt/collectd5/Makefile
 
 Modified: head/net-mgmt/collectd5/Makefile
 ==============================================================================
 --- head/net-mgmt/collectd5/Makefile	Sun Jul  7 21:41:02 2013	(r322459)
 +++ head/net-mgmt/collectd5/Makefile	Sun Jul  7 21:55:43 2013	(r322460)
 @@ -27,9 +27,9 @@ GCRYPT_DESC=		Build with libgcrypt
  JSON_DESC=		Enable JSON plugins
  MEMCACHEC_DESC=		Enable memcachec plugin
  MODBUS_DESC=		Enable modbus plugin
 -MYSQL_DESC=		Enable mysql-basd plugins
 +MYSQL_DESC=		Enable mysql-based plugins
  NUTUPS_DESC=		Enable nut (ups) plugin
 -PGSQL_DESC=		Enable postgresql-basd plugins
 +PGSQL_DESC=		Enable postgresql-based plugins
  PING_DESC=		Enable ping plugin
  PYTHON_DESC=		Enable python-based plugins
  REDIS_DESC=		Enable redis-based plugins
 @@ -206,6 +206,7 @@ PLIST_SUB+=	DBI="@comment "
  .if ${PORT_OPTIONS:MGCRYPT}
  LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
  CONFIGURE_ARGS+=--with-libgcrypt=${LOCALBASE}
 +LDFLAGS+=	-lgcrypt
  .endif
  
  .if ${PORT_OPTIONS:MJSON}
 @@ -258,7 +259,7 @@ PLIST_SUB+=	NUTUPS="@comment "
  
  .if ${PORT_OPTIONS:MPGSQL}
  USE_PGSQL=	yes
 -CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql
 +CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql --with-libpq
  PLIST_SUB+=	PGSQL=""
  .else
  PLIST_SUB+=	PGSQL="@comment "
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
