From owner-svn-ports-head@FreeBSD.ORG  Sun Aug 10 21:42:51 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 28E6CC2C
 for <svn-ports-head@freebsd.org>; Sun, 10 Aug 2014 21:42:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F082B22C7
 for <svn-ports-head@freebsd.org>; Sun, 10 Aug 2014 21:42:50 +0000 (UTC)
Received: from marino (uid 1323) (envelope-from marino@FreeBSD.org) id 2229
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sun, 10 Aug 2014 21:42:50 +0000
From: John Marino <marino@FreeBSD.org>
Date: Sun, 10 Aug 2014 21:42:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364574 - head/databases/pgbouncer
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e7e75a.2229.62dfff6f@svn.freebsd.org>
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Aug 2014 21:42:51 -0000

Author: marino
Date: Sun Aug 10 21:42:50 2014
New Revision: 364574
URL: http://svnweb.freebsd.org/changeset/ports/364574
QAT: https://qat.redports.org/buildarchive/r364574/

Log:
  databases/pgbouncer: Unconditionally install man pages
  
  This port had a couple of issues besided installing man pages as a
  function of the DOCS option selection.  It also was using <pre> and <post>
  inclusions with <options>, _DEPENDS were in multiple places.
  
  I regrouped the *_DEPENDS, I moved the options to just above the make
  targets (their conventional location) and I utilized <option>_*_DEPENDS
  as well after fixing the man pages.
  
  PR:		192507
  Reported by:	dmitry2004 (yandex.ru)
  Approved by:	Just Fix It (maintainer in copy)

Modified:
  head/databases/pgbouncer/Makefile

Modified: head/databases/pgbouncer/Makefile
==============================================================================
--- head/databases/pgbouncer/Makefile	Sun Aug 10 21:29:18 2014	(r364573)
+++ head/databases/pgbouncer/Makefile	Sun Aug 10 21:42:50 2014	(r364574)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgbouncer
 PORTVERSION=	1.5.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/3393/
 
@@ -13,14 +13,8 @@ COMMENT=	Lightweight connection pooler f
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
-.endif
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed \
+		xmlto:${PORTSDIR}/textproc/xmlto
 
 PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000258
 
@@ -42,15 +36,10 @@ PGBOUNCER_GROUP?=	pgbouncer
 PGBOUNCER_RUNDIR?=	/var/run/pgbouncer
 PGBOUNCER_LOGDIR?=	/var/log/pgbouncer
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
-
-.include <bsd.port.pre.mk>
-
 PLIST_SUB+=	PGBOUNCER_USER="${USERS}" \
 		PGBOUNCER_GROUP="${GROUPS}" \
 		PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \
 		PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
-
 SUB_LIST+=	PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
 
 post-patch:
@@ -60,17 +49,13 @@ post-patch:
 	@${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 ${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
+	${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>
+.include <bsd.port.mk>