Date: Mon, 8 Jun 2009 00:30:57 GMT From: Sahil Tandon <sahil@tandon.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135340: [PATCH] dns/powerdns: amend Makefile so installation does not fail in case of custom PREFIX Message-ID: <200906080030.n580UvFt084494@www.freebsd.org> Resent-Message-ID: <200906080040.n580e1nk099505@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jun 08 00:40:00 UTC 2009 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906080030.n580UvFt084494>