From nobody@FreeBSD.org  Mon Jun  8 00:30:57 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F047F106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Jun 2009 00:30:57 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id DE1AC8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  8 Jun 2009 00:30:57 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n580UvcA084495
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 8 Jun 2009 00:30:57 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n580UvFt084494;
	Mon, 8 Jun 2009 00:30:57 GMT
	(envelope-from nobody)
Message-Id: <200906080030.n580UvFt084494@www.freebsd.org>
Date: Mon, 8 Jun 2009 00:30:57 GMT
From: Sahil Tandon <sahil@tandon.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] dns/powerdns: amend Makefile so installation does not fail in case of custom PREFIX
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: tremere@cainites.net

>Number:         135340
>Category:       ports
>Synopsis:       [PATCH] dns/powerdns: amend Makefile so installation does not fail in case of custom PREFIX
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 08 00:40:00 UTC 2009
>Closed-Date:    Mon Jun 08 10:15:35 UTC 2009
>Last-Modified:  Mon Jun  8 10:20:04 UTC 2009
>Originator:     Sahil Tandon
>Release:        7.1-RELEASE
>Organization:
>Environment:
FreeBSD internal.hamla.org 7.1-RELEASE FreeBSD 7.1-RELEASE
>Description:
See one-line description or build failture log:
http://qatty.tecnik93.com//errors/7-STABLE-FPT-CustDir/powerdns-2.9.22.log


>How-To-Repeat:
Install with port with non-default PREFIX.
>Fix:
Apply patch in which we:

- bump PORTREVISION
- modify CONFIGURE_ARGS when WITH_PGSQL is set (which is the default)
- fix upstream configure script to look for PGSQL includes where they are actually installed, no matter the value of PREFIX.

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/powerdns/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- Makefile	1 Feb 2009 16:51:56 -0000	1.65
+++ Makefile	8 Jun 2009 00:21:04 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	powerdns
 PORTVERSION=	2.9.22
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
@@ -64,6 +65,7 @@
 .if defined(WITH_PGSQL)
 USE_PGSQL?=		YES
 CONFIGURE_MODULES+=	"gpgsql"
+CONFIGURE_ARGS+=	--with-pgsql=${PREFIX}
 PLIST_SUB+=		WITHPGSQL=""
 .else
 CONFIGURE_ARGS+=	--disable-pgsql
@@ -124,7 +126,11 @@
 		-e 's;@modulelibs@;@modulelibs@ -llber;' \
 		${WRKSRC}/pdns/Makefile.in
 .endif
-
+.if defined(WITH_PGSQL)
+pre-configure:
+	@${REINPLACE_CMD} -E -e 's;(PGSQL_inc_check="\$$withval/include/pgsql)";\1 \$$withval/include";' \
+		${WRKSRC}/configure
+.endif
 post-install:
 .if !exists(${PREFIX}/etc/pdns/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns/pdns.conf-dist ${PREFIX}/etc/pdns/pdns.conf


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jun 8 00:40:11 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: tremere@cainites.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/135340: [PATCH] dns/powerdns: amend Makefile so installation does not fail in case of custom PREFIX
Date: Mon, 8 Jun 2009 00:40:10 UT

 Maintainer of dns/powerdns,
 
 Please note that PR ports/135340 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/135340
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Mon Jun 8 08:32:44 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

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

From: "Ralf van der Enden" <Ralf.vanderEnden@deltares.nl>
To: <bug-followup@FreeBSD.org>,
	<sahil@tandon.net>
Cc:  
Subject: Re: ports/135340: [PATCH] dns/powerdns: amend Makefile so installation does not fail in case of custom PREFIX
Date: Mon, 8 Jun 2009 10:36:31 +0200

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_00E1_01C9E824.FCFEBF30
 Content-Type: text/plain;
 	charset="Windows-1252"
 Content-Transfer-Encoding: quoted-printable
 
 Looks good to me, but cannot test it right now.
 
 Cheers,
 Ralf
 ------=_NextPart_000_00E1_01C9E824.FCFEBF30
 Content-Type: text/html;
 	charset="Windows-1252"
 Content-Transfer-Encoding: quoted-printable
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML><HEAD>
 <META content=3Dtext/html;charset=3DWindows-1252 =
 http-equiv=3DContent-Type>
 <META name=3DGENERATOR content=3D"MSHTML 8.00.6001.18702"></HEAD>
 <BODY style=3D"PADDING-LEFT: 10px; PADDING-RIGHT: 10px; PADDING-TOP: =
 15px"=20
 id=3DMailContainerBody leftMargin=3D0 topMargin=3D0 bgColor=3D#ffffff=20
 CanvasTabStop=3D"true" name=3D"Compose message area">
 <DIV><FONT size=3D2>Looks good to me, but cannot test it right =
 now.</FONT></DIV>
 <DIV><FONT size=3D2></FONT>&nbsp;</DIV>
 <DIV><FONT size=3D2>Cheers,</FONT></DIV>
 <DIV><FONT size=3D2>Ralf</FONT></DIV></BODY></HTML>
 
 ------=_NextPart_000_00E1_01C9E824.FCFEBF30--
 
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Mon Jun 8 09:41:13 UTC 2009 
State-Changed-Why:  
Maintainer OK'ed. I'll test and commit. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135340 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Mon Jun 8 10:15:34 UTC 2009 
State-Changed-Why:  
Committed, with changes (+CONFIGURE_ARGS+= 
--with-pgsql=${LOCALBASE}). Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135340: commit references a PR
Date: Mon,  8 Jun 2009 10:14:55 +0000 (UTC)

 itetcu      2009-06-08 10:14:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     dns/powerdns         Makefile 
   Log:
   Fix build with custom LOCALBASE
   
   PR:             135340
   Submitted by:   Sahil Tandon
   Approved by:    maintainer
   Reported by:    QATty
   
   Revision  Changes    Path
   1.66      +7 -1      ports/dns/powerdns/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
