diff options
| author | John Marino <marino@FreeBSD.org> | 2014-08-10 21:42:50 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-08-10 21:42:50 +0000 |
| commit | 3ed94f64c3832a042bacc9453f92b9d890a6f4fb (patch) | |
| tree | 20bb252c847bbf8b5e7fb05d82b4a480f565da11 /databases/pgbouncer | |
| parent | de67e637952563712972fe1cb8426b82d150016c (diff) | |
| download | ports-3ed94f64c3832a042bacc9453f92b9d890a6f4fb.tar.gz ports-3ed94f64c3832a042bacc9453f92b9d890a6f4fb.zip | |
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)
Notes
Notes:
svn path=/head/; revision=364574
Diffstat (limited to 'databases/pgbouncer')
| -rw-r--r-- | databases/pgbouncer/Makefile | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index 0a68f2ffe449..dc64abd63aad 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -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 for PostgreSQL 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> |