From nobody@FreeBSD.org  Tue May 13 22:26:02 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id D95C675B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 13 May 2014 22:26:02 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id AE1622566
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 13 May 2014 22:26:02 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DMQ2i9081474
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 13 May 2014 22:26:02 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4DMQ2cd081471;
	Tue, 13 May 2014 22:26:02 GMT
	(envelope-from nobody)
Message-Id: <201405132226.s4DMQ2cd081471@cgiserv.freebsd.org>
Date: Tue, 13 May 2014 22:26:02 GMT
From: "Mikhail T." <m.tsatsenko@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer] [patch] databases/pgbouncer: support stage
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         189787
>Category:       ports
>Synopsis:       [maintainer] [patch] databases/pgbouncer: support stage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 13 22:30:00 UTC 2014
>Closed-Date:    Sun May 25 12:24:42 UTC 2014
>Last-Modified:  Sun May 25 12:30:01 UTC 2014
>Originator:     Mikhail T.
>Release:        
>Organization:
>Environment:
>Description:
- Add STAGE support
- Depend on xmlto to generate man pages. Add DOCS option

Build log: https://redports.org/~mtsatsenko/20140512100032-55108-205965/pgbouncer-1.5.4_1.log
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: pgbouncer/Makefile
===================================================================
--- pgbouncer/Makefile	(revision 26596)
+++ pgbouncer/Makefile	(revision 26618)
@@ -14,6 +14,14 @@
 
 LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
+.endif
+
 PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000258
 
 USERS=		pgbouncer
@@ -25,11 +33,6 @@
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-.if ! defined(NO_INSTALL_MANPAGES)
-MAN1=		pgbouncer.1
-MAN5=		pgbouncer.5
-.endif
-
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --enable-evdns
 CONFIGURE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
@@ -46,7 +49,6 @@
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 SUB_LIST+=	PGBOUNCER_USER="${USERS}" \
@@ -62,19 +64,20 @@
 	@${REINPLACE_CMD} -e "s|sed -n|${LOCALBASE}/bin/gsed -n|g" \
 		${WRKSRC}/lib/find_modules.sh
 
+.if empty(PORT_OPTIONS:MDOCS)
+	${REINPLACE_CMD} -e "s| = doc| = |g" ${WRKSRC}/Makefile
+.endif
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${PREFIX}/bin/
-.if ! defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${PREFIX}/man/man5/
+	${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${STAGEDIR}${PREFIX}/man/man5/
 .endif
-	${INSTALL_DATA} ${WRKSRC}/etc/pgbouncer.ini ${PREFIX}/etc/pgbouncer.ini.sample
-	${INSTALL_DATA} ${WRKSRC}/etc/userlist.txt ${PREFIX}/etc/pgbouncer.users.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/pgbouncer.ini ${STAGEDIR}${PREFIX}/etc/pgbouncer.ini.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/userlist.txt ${STAGEDIR}${PREFIX}/etc/pgbouncer.users.sample
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/pgbouncer.ini ]; then \
-		${CP} -p ${PREFIX}/etc/pgbouncer.ini.sample ${PREFIX}/etc/pgbouncer.ini ; \
-	fi
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Tue May 13 22:30:04 UTC 2014 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189787 
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue May 13 22:30:06 UTC 2014 
Responsible-Changed-Why:  
swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

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

From: Steve Wills <swills@freebsd.org>
To: bug-followup@freebsd.org
Cc: m.tsatsenko@gmail.com;swills@freebsd.org;;
Subject: Re: ports/189787: [maintainer] [patch] databases/pgbouncer: support stage
Date: Thu, 22 May 2014 22:57:25 GMT

 --------cb4ed1a3e4d23ee764eeb9143db409f9
 Content-Type: text/plain; charset=utf-8; format=flowed
 Content-Transfer-Encoding: 8bit
 
 
 Description:
 Additional stage changes were needed, see updated diff for maintainer approval. Thanks!
 
 Responsible committer (m.tsatsenko@gmail.com; swills@FreeBSD.org) is cc'd.
 
 Generated with FreeBSD Port Tools 1.02 (mode: change, diff: SVN)
 
 
 --------cb4ed1a3e4d23ee764eeb9143db409f9
 Content-Type: text/plain; charset=utf-8;
   name="pgbouncer-1.5.4.patch"
 Content-Transfer-Encoding: base64;
 Content-Disposition: attachment;
   filename="pgbouncer-1.5.4.patch"
 
 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE1ha2VmaWxlCShyZXZpc2lvbiAzNTQ4OTUp
 CisrKyBNYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMTAsMTAgKzEwLDE4IEBACiBNQUlOVEFJ
 TkVSPQltLnRzYXRzZW5rb0BnbWFpbC5jb20KIENPTU1FTlQ9CUxpZ2h0d2VpZ2h0IGNvbm5lY3Rp
 b24gcG9vbGVyIGZvciBQb3N0Z3JlU1FMCiAKLUxJQ0VOU0U9CUJTRAorTElDRU5TRT0JQlNEMkNM
 QVVTRQogCiBMSUJfREVQRU5EUz0JbGliZXZlbnQtMi4wLnNvOiR7UE9SVFNESVJ9L2RldmVsL2xp
 YmV2ZW50MgogCitPUFRJT05TX0RFRklORT0JRE9DUworCisuaW5jbHVkZSA8YnNkLnBvcnQub3B0
 aW9ucy5taz4KKworLmlmICR7UE9SVF9PUFRJT05TOk1ET0NTfQorQlVJTERfREVQRU5EUys9CXht
 bHRvOiR7UE9SVFNESVJ9L3RleHRwcm9jL3htbHRvCisuZW5kaWYKKwogUE9SVFNDT1VUPQlzaXRl
 Omh0dHA6Ly9wZ2ZvdW5kcnkub3JnL2Zycy8/Z3JvdXBfaWQ9MTAwMDI1OAogCiBVU0VSUz0JCXBn
 Ym91bmNlcgpAQCAtMjAsMjQgKzI4LDE0IEBACiBHUk9VUFM9CQlwZ2JvdW5jZXIKIAogVVNFX1JD
 X1NVQlI9CXBnYm91bmNlcgotU1VCX0ZJTEVTPQlwa2ctbWVzc2FnZSBwa2ctaW5zdGFsbCBwa2ct
 ZGVpbnN0YWxsCiAKIEdOVV9DT05GSUdVUkU9CXllcwotVVNFX0dNQUtFPQl5ZXMKK1VTRVM9CQln
 bWFrZQogCi0uaWYgISBkZWZpbmVkKE5PX0lOU1RBTExfTUFOUEFHRVMpCi1NQU4xPQkJcGdib3Vu
 Y2VyLjEKLU1BTjU9CQlwZ2JvdW5jZXIuNQotLmVuZGlmCi0KIENPTkZJR1VSRV9BUkdTPQktLXdp
 dGgtbGliZXZlbnQ9JHtMT0NBTEJBU0V9IC0tZW5hYmxlLWV2ZG5zCiBDT05GSUdVUkVfRU5WKz0J
 UFRIUkVBRF9DRkxBR1M9JHtQVEhSRUFEX0NGTEFHU30gXAogCQlQVEhSRUFEX0xJQlM9JHtQVEhS
 RUFEX0xJQlN9CiAKLVBLR0lOU1RBTEw9CSR7V1JLRElSfS9wa2ctaW5zdGFsbAotUEtHREVJTlNU
 QUxMPQkke1dSS0RJUn0vcGtnLWRlaW5zdGFsbAotUEtHTUVTU0FHRT0JJHtXUktESVJ9L3BrZy1t
 ZXNzYWdlCi0KIFBHQk9VTkNFUl9VU0VSPz0JcGdib3VuY2VyCiBQR0JPVU5DRVJfR1JPVVA/PQlw
 Z2JvdW5jZXIKIApAQCAtNDYsMTQgKzQ0LDEyIEBACiAKIEJVSUxEX0RFUEVORFMrPQkJJHtMT0NB
 TEJBU0V9L2Jpbi9nc2VkOiR7UE9SVFNESVJ9L3RleHRwcm9jL2dzZWQKIAotTk9fU1RBR0U9CXll
 cwogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4KIAogU1VCX0xJU1QrPQlQR0JPVU5DRVJfVVNF
 Uj0iJHtVU0VSU30iIFwKIAkJUEdCT1VOQ0VSX0dST1VQPSIke0dST1VQU30iIFwKIAkJUEdCT1VO
 Q0VSX0xPR0RJUj0iJHtQR0JPVU5DRVJfTE9HRElSfSIgXAotCQlQR0JPVU5DRVJfUlVORElSPSIk
 e1BHQk9VTkNFUl9SVU5ESVJ9IiBcCi0JCUNITU9EPSIke0NITU9EfSIgQ0hPV049IiR7Q0hPV059
 IiBNS0RJUj0iJHtNS0RJUn0iIFBXPSIke1BXfSIKKwkJUEdCT1VOQ0VSX1JVTkRJUj0iJHtQR0JP
 VU5DRVJfUlVORElSfSIKIAogcG9zdC1wYXRjaDoKIAlAJHtSRUlOUExBQ0VfQ01EfSAtZSAic3w9
 IHBnYm91bmNlci5sb2d8PSAke1BHQk9VTkNFUl9MT0dESVJ9L3BnYm91bmNlci5sb2d8ZyIgXApA
 QCAtNjIsMjAgKzU4LDE3IEBACiAJQCR7UkVJTlBMQUNFX0NNRH0gLWUgInN8c2VkIC1ufCR7TE9D
 QUxCQVNFfS9iaW4vZ3NlZCAtbnxnIiBcCiAJCSR7V1JLU1JDfS9saWIvZmluZF9tb2R1bGVzLnNo
 CiAKKy5pZiBlbXB0eShQT1JUX09QVElPTlM6TURPQ1MpCisJJHtSRUlOUExBQ0VfQ01EfSAtZSAi
 c3wgPSBkb2N8ID0gfGciICR7V1JLU1JDfS9NYWtlZmlsZQorLmVuZGlmCisKIGRvLWluc3RhbGw6
 Ci0JJHtJTlNUQUxMX1BST0dSQU19ICR7V1JLU1JDfS9wZ2JvdW5jZXIgJHtQUkVGSVh9L2Jpbi8K
 LS5pZiAhIGRlZmluZWQoTk9fSU5TVEFMTF9NQU5QQUdFUykKLQkke0lOU1RBTExfTUFOfSAke1dS
 S1NSQ30vZG9jL3BnYm91bmNlci4xICR7UFJFRklYfS9tYW4vbWFuMS8KLQkke0lOU1RBTExfTUFO
 fSAke1dSS1NSQ30vZG9jL3BnYm91bmNlci41ICR7UFJFRklYfS9tYW4vbWFuNS8KKwkke0lOU1RB
 TExfUFJPR1JBTX0gJHtXUktTUkN9L3BnYm91bmNlciAke1NUQUdFRElSfSR7UFJFRklYfS9iaW4v
 CisuaWYgJHtQT1JUX09QVElPTlM6TURPQ1N9CisJJHtJTlNUQUxMX01BTn0gJHtXUktTUkN9L2Rv
 Yy9wZ2JvdW5jZXIuMSAke1NUQUdFRElSfSR7UFJFRklYfS9tYW4vbWFuMS8KKwkke0lOU1RBTExf
 TUFOfSAke1dSS1NSQ30vZG9jL3BnYm91bmNlci41ICR7U1RBR0VESVJ9JHtQUkVGSVh9L21hbi9t
 YW41LwogLmVuZGlmCi0JJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9ldGMvcGdib3VuY2VyLmlu
 aSAke1BSRUZJWH0vZXRjL3BnYm91bmNlci5pbmkuc2FtcGxlCi0JJHtJTlNUQUxMX0RBVEF9ICR7
 V1JLU1JDfS9ldGMvdXNlcmxpc3QudHh0ICR7UFJFRklYfS9ldGMvcGdib3VuY2VyLnVzZXJzLnNh
 bXBsZQorCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vZXRjL3BnYm91bmNlci5pbmkgJHtTVEFH
 RURJUn0ke1BSRUZJWH0vZXRjL3BnYm91bmNlci5pbmkuc2FtcGxlCisJJHtJTlNUQUxMX0RBVEF9
 ICR7V1JLU1JDfS9ldGMvdXNlcmxpc3QudHh0ICR7U1RBR0VESVJ9JHtQUkVGSVh9L2V0Yy9wZ2Jv
 dW5jZXIudXNlcnMuc2FtcGxlCiAKLXBvc3QtaW5zdGFsbDoKLQlAaWYgWyAhIC1mICR7UFJFRklY
 fS9ldGMvcGdib3VuY2VyLmluaSBdOyB0aGVuIFwKLQkJJHtDUH0gLXAgJHtQUkVGSVh9L2V0Yy9w
 Z2JvdW5jZXIuaW5pLnNhbXBsZSAke1BSRUZJWH0vZXRjL3BnYm91bmNlci5pbmkgOyBcCi0JZmkK
 LQlAJHtTSH0gJHtQS0dJTlNUQUxMfSAke1BLR05BTUV9IFBPU1QtSU5TVEFMTAotCUAke0NBVH0g
 JHtQS0dNRVNTQUdFfQotCiAuaW5jbHVkZSA8YnNkLnBvcnQucG9zdC5taz4KSW5kZXg6IGZpbGVz
 L3BrZy1kZWluc3RhbGwuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZmlsZXMvcGtnLWRlaW5zdGFsbC5pbgko
 cmV2aXNpb24gMzU0ODk1KQorKysgZmlsZXMvcGtnLWRlaW5zdGFsbC5pbgkod29ya2luZyBjb3B5
 KQpAQCAtMSwyMSArMCwwIEBACi0jISAvYmluL3NoCi0jICRGcmVlQlNEJAotCi1pZiBbICIkMiIg
 IT0gIlBPU1QtREVJTlNUQUxMIiBdOyB0aGVuCi0JZXhpdCAwCi1maQotCi1wZ2JvdW5jZXJfdXNl
 cj0lJVBHQk9VTkNFUl9VU0VSJSUKLXBnYm91bmNlcl9ncm91cD0lJVBHQk9VTkNFUl9HUk9VUCUl
 Ci0KLVBHQk9VTkNFUl9SVU5ESVI9JSVQR0JPVU5DRVJfUlVORElSJSUKLVBHQk9VTkNFUl9MT0dE
 SVI9JSVQR0JPVU5DRVJfTE9HRElSJSUKLQotUFc9IiUlUFclJSIKLQotZm9yIERJUiBpbiAke1BH
 Qk9VTkNFUl9SVU5ESVJ9ICR7UEdCT1VOQ0VSX0xPR0RJUn07IGRvCi0JaWYgdGVzdCAtZCAiJHtE
 SVJ9IjsgdGhlbgotCQllY2hvICI9PT4gWW91IHNob3VsZCBtYW51YWxseSByZW1vdmUgdGhlIGRp
 cmVjdG9yeTogJHtESVJ9IgotCWZpCi1kb25lCi1leGl0IDAKSW5kZXg6IGZpbGVzL3BrZy1pbnN0
 YWxsLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT0KLS0tIGZpbGVzL3BrZy1pbnN0YWxsLmluCShyZXZpc2lvbiAzNTQ4
 OTUpCisrKyBmaWxlcy9wa2ctaW5zdGFsbC5pbgkod29ya2luZyBjb3B5KQpAQCAtMSwyNiArMCww
 IEBACi0jISAvYmluL3NoCi0jICRGcmVlQlNEJAotCi1pZiBbICIkMiIgIT0gIlBPU1QtSU5TVEFM
 TCIgXTsgdGhlbgotICAgICAgICBleGl0IDAKLWZpCi0KLXBnYm91bmNlcl91c2VyPSIlJVBHQk9V
 TkNFUl9VU0VSJSUiCi1wZ2JvdW5jZXJfZ3JvdXA9IiUlUEdCT1VOQ0VSX0dST1VQJSUiCi0KLVBH
 Qk9VTkNFUl9SVU5ESVI9IiUlUEdCT1VOQ0VSX1JVTkRJUiUlIgotUEdCT1VOQ0VSX0xPR0RJUj0i
 JSVQR0JPVU5DRVJfTE9HRElSJSUiCi0KLUNITU9EPSIlJUNITU9EJSUiCi1DSE9XTj0iJSVDSE9X
 TiUlIgotTUtESVI9IiUlTUtESVIlJSIKLVBXPSUlUFclJQotCi1mb3IgRElSIGluICR7UEdCT1VO
 Q0VSX1JVTkRJUn0gJHtQR0JPVU5DRVJfTE9HRElSfTsgZG8KLQkJZWNobyAiPT0+IENyZWF0aW5n
 IGRpcmVjdG9yeSAke0RJUn0iCi0gCQkke01LRElSfSAke0RJUn0KLQkJZWNobyAiPT0+IENoYW5n
 aW5nIG93bmVyc2hpcCBvZiAke0RJUn0iCi0JCSR7Q0hPV059IC1SICR7cGdib3VuY2VyX3VzZXJ9
 OiR7cGdib3VuY2VyX2dyb3VwfSAke0RJUn0KLQkJZWNobyAiPT0+IENoYW5naW5nIHBlcm1pc3Np
 b25zIG9mICR7RElSfSIKLQkJJHtDSE1PRH0gLVIgNzcwICR7RElSfQotZG9uZQpJbmRleDogcGtn
 LXBsaXN0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT0KLS0tIHBrZy1wbGlzdAkocmV2aXNpb24gMzU0ODk1KQorKysgcGtn
 LXBsaXN0CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsMTEgQEAKIGJpbi9wZ2JvdW5jZXIKLUB1
 bmV4ZWMgaWYgY21wIC1zICVEL2V0Yy9wZ2JvdW5jZXIuaW5pICVEL2V0Yy9wZ2JvdW5jZXIuaW5p
 LnNhbXBsZTsgdGhlbiBybSAtZiAlRC9ldGMvcGdib3VuY2VyLmluaTsgZmkKLWV0Yy9wZ2JvdW5j
 ZXIuaW5pLnNhbXBsZQotQGV4ZWMgWyAtZiAlQi9wZ2JvdW5jZXIuaW5pIF0gfHwgY3AgJUIvJWYg
 JUIvcGdib3VuY2VyLmluaQotZXRjL3BnYm91bmNlci51c2Vycy5zYW1wbGUKK21hbi9tYW4xL3Bn
 Ym91bmNlci4xLmd6CittYW4vbWFuNS9wZ2JvdW5jZXIuNS5negorQHNhbXBsZSBldGMvcGdib3Vu
 Y2VyLmluaS5zYW1wbGUKK0BzYW1wbGUgZXRjL3BnYm91bmNlci51c2Vycy5zYW1wbGUKK0BleGVj
 IFsgLWQgJSVQR0JPVU5DRVJfTE9HRElSJSUgXSB8fCBta2RpciAtcCAlJVBHQk9VTkNFUl9MT0dE
 SVIlJQorQGV4ZWMgY2hvd24gJSVQR0JPVU5DRVJfVVNFUiUlOiUlUEdCT1VOQ0VSX0dST1VQJSUg
 JSVQR0JPVU5DRVJfTE9HRElSJSUKK0B1bmV4ZWMgaWYgWyAteiAke1VQR1JBREVfUE9SVH0gXSA7
 IHRoZW4gcm1kaXIgJSVQR0JPVU5DRVJfTE9HRElSJSUgMj4vZGV2L251bGw7IGZpCitAZXhlYyBb
 IC1kICUlUEdCT1VOQ0VSX1JVTkRJUiUlIF0gfHwgbWtkaXIgLXAgJSVQR0JPVU5DRVJfUlVORElS
 JSUKK0BleGVjIGNob3duICUlUEdCT1VOQ0VSX1VTRVIlJTolJVBHQk9VTkNFUl9HUk9VUCUlICUl
 UEdCT1VOQ0VSX1JVTkRJUiUlCitAdW5leGVjIGlmIFsgLXogJHtVUEdSQURFX1BPUlR9IF0gOyB0
 aGVuIHJtZGlyICUlUEdCT1VOQ0VSX1JVTkRJUiUlIDI+L2Rldi9udWxsOyBmaQo=
 
 
 --------cb4ed1a3e4d23ee764eeb9143db409f9--
 

From: Mikhail Tsatsenko <m.tsatsenko@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189787: [maintainer] [patch] databases/pgbouncer: support stage
Date: Sat, 24 May 2014 23:26:32 +0400

 Approved!
 Thanks for your work!
 
 -- 
 Mikhail
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Sun May 25 12:24:41 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189787: commit references a PR
Date: Sun, 25 May 2014 12:23:04 +0000 (UTC)

 Author: swills
 Date: Sun May 25 12:23:00 2014
 New Revision: 355161
 URL: http://svnweb.freebsd.org/changeset/ports/355161
 QAT: https://qat.redports.org/buildarchive/r355161/
 
 Log:
   - Add STAGE support
   - Depend on xmlto to generate man pages. Add DOCS option
   
   PR:		ports/189787
   Submitted by:	"Mikhail T." <m.tsatsenko@gmail.com> (maintainer)
 
 Deleted:
   head/databases/pgbouncer/files/pkg-deinstall.in
   head/databases/pgbouncer/files/pkg-install.in
 Modified:
   head/databases/pgbouncer/Makefile
   head/databases/pgbouncer/pkg-plist
 
 Modified: head/databases/pgbouncer/Makefile
 ==============================================================================
 --- head/databases/pgbouncer/Makefile	Sun May 25 12:20:49 2014	(r355160)
 +++ head/databases/pgbouncer/Makefile	Sun May 25 12:23:00 2014	(r355161)
 @@ -10,34 +10,32 @@ MASTER_SITES=	http://pgfoundry.org/frs/d
  MAINTAINER=	m.tsatsenko@gmail.com
  COMMENT=	Lightweight connection pooler for PostgreSQL
  
 -LICENSE=	BSD
 +LICENSE=	BSD2CLAUSE
  
  LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
  
 +OPTIONS_DEFINE=	DOCS
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MDOCS}
 +BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
 +.endif
 +
  PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000258
  
  USERS=		pgbouncer
  GROUPS=		pgbouncer
  
  USE_RC_SUBR=	pgbouncer
 -SUB_FILES=	pkg-message pkg-install pkg-deinstall
  
  GNU_CONFIGURE=	yes
 -USE_GMAKE=	yes
 -
 -.if ! defined(NO_INSTALL_MANPAGES)
 -MAN1=		pgbouncer.1
 -MAN5=		pgbouncer.5
 -.endif
 +USES=		gmake
  
  CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --enable-evdns
  CONFIGURE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
  		PTHREAD_LIBS=${PTHREAD_LIBS}
  
 -PKGINSTALL=	${WRKDIR}/pkg-install
 -PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 -PKGMESSAGE=	${WRKDIR}/pkg-message
 -
  PGBOUNCER_USER?=	pgbouncer
  PGBOUNCER_GROUP?=	pgbouncer
  
 @@ -46,14 +44,12 @@ PGBOUNCER_LOGDIR?=	/var/log/pgbouncer
  
  BUILD_DEPENDS+=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
  
 -NO_STAGE=	yes
  .include <bsd.port.pre.mk>
  
  SUB_LIST+=	PGBOUNCER_USER="${USERS}" \
  		PGBOUNCER_GROUP="${GROUPS}" \
  		PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \
 -		PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" \
 -		CHMOD="${CHMOD}" CHOWN="${CHOWN}" MKDIR="${MKDIR}" PW="${PW}"
 +		PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
  
  post-patch:
  	@${REINPLACE_CMD} -e "s|= pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \
 @@ -62,20 +58,17 @@ post-patch:
  	@${REINPLACE_CMD} -e "s|sed -n|${LOCALBASE}/bin/gsed -n|g" \
  		${WRKSRC}/lib/find_modules.sh
  
 -do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${PREFIX}/bin/
 -.if ! defined(NO_INSTALL_MANPAGES)
 -	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${PREFIX}/man/man1/
 -	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${PREFIX}/man/man5/
 +.if empty(PORT_OPTIONS:MDOCS)
 +	${REINPLACE_CMD} -e "s| = doc| = |g" ${WRKSRC}/Makefile
  .endif
 -	${INSTALL_DATA} ${WRKSRC}/etc/pgbouncer.ini ${PREFIX}/etc/pgbouncer.ini.sample
 -	${INSTALL_DATA} ${WRKSRC}/etc/userlist.txt ${PREFIX}/etc/pgbouncer.users.sample
  
 -post-install:
 -	@if [ ! -f ${PREFIX}/etc/pgbouncer.ini ]; then \
 -		${CP} -p ${PREFIX}/etc/pgbouncer.ini.sample ${PREFIX}/etc/pgbouncer.ini ; \
 -	fi
 -	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 -	@${CAT} ${PKGMESSAGE}
 +do-install:
 +	${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${STAGEDIR}${PREFIX}/bin/
 +.if ${PORT_OPTIONS:MDOCS}
 +	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${STAGEDIR}${PREFIX}/man/man1/
 +	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${STAGEDIR}${PREFIX}/man/man5/
 +.endif
 +	${INSTALL_DATA} ${WRKSRC}/etc/pgbouncer.ini ${STAGEDIR}${PREFIX}/etc/pgbouncer.ini.sample
 +	${INSTALL_DATA} ${WRKSRC}/etc/userlist.txt ${STAGEDIR}${PREFIX}/etc/pgbouncer.users.sample
  
  .include <bsd.port.post.mk>
 
 Modified: head/databases/pgbouncer/pkg-plist
 ==============================================================================
 --- head/databases/pgbouncer/pkg-plist	Sun May 25 12:20:49 2014	(r355160)
 +++ head/databases/pgbouncer/pkg-plist	Sun May 25 12:23:00 2014	(r355161)
 @@ -1,5 +1,11 @@
  bin/pgbouncer
 -@unexec if cmp -s %D/etc/pgbouncer.ini %D/etc/pgbouncer.ini.sample; then rm -f %D/etc/pgbouncer.ini; fi
 -etc/pgbouncer.ini.sample
 -@exec [ -f %B/pgbouncer.ini ] || cp %B/%f %B/pgbouncer.ini
 -etc/pgbouncer.users.sample
 +man/man1/pgbouncer.1.gz
 +man/man5/pgbouncer.5.gz
 +@sample etc/pgbouncer.ini.sample
 +@sample etc/pgbouncer.users.sample
 +@exec [ -d %%PGBOUNCER_LOGDIR%% ] || mkdir -p %%PGBOUNCER_LOGDIR%%
 +@exec chown %%PGBOUNCER_USER%%:%%PGBOUNCER_GROUP%% %%PGBOUNCER_LOGDIR%%
 +@unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%PGBOUNCER_LOGDIR%% 2>/dev/null; fi
 +@exec [ -d %%PGBOUNCER_RUNDIR%% ] || mkdir -p %%PGBOUNCER_RUNDIR%%
 +@exec chown %%PGBOUNCER_USER%%:%%PGBOUNCER_GROUP%% %%PGBOUNCER_RUNDIR%%
 +@unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%PGBOUNCER_RUNDIR%% 2>/dev/null; fi
 _______________________________________________
 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:
