svn commit: r383543 - head/databases/slony1v2

[Bartek Rutkowski]

Author: robak
Date: Tue Apr  7 21:58:56 2015
New Revision: 383543
URL: https://svnweb.freebsd.org/changeset/ports/383543

Log:
  databases/slony1v2: port cleanup
  
  - Use OPTIONS helpers for the PERLTOOLS option
  - Remove a redundant block of code for setting PGSQL_VER: this
    functionality is already supplied via 'USES+= pgsql'
  - Maintainer's timeout (olgeni at FreeBSD.org)
  
  PR:		185906
  Submitted by:	Matthew Seaman <matthew at FreeBSD.org>

Modified:
  head/databases/slony1v2/Makefile

Modified: head/databases/slony1v2/Makefile
==============================================================================
--- head/databases/slony1v2/Makefile	Tue Apr  7 21:20:24 2015	(r383542)
+++ head/databases/slony1v2/Makefile	Tue Apr  7 21:58:56 2015	(r383543)
@@ -24,25 +24,21 @@ SUB_FILES=	pkg-message slon-mkservice.sh
 SUB_LIST+=	NAME=slon
 
 OPTIONS_DEFINE=	DOCS PERLTOOLS
+OPTIONS_SUB=	yes
 PERLTOOLS_DESC=	Install perl configuration tools
 
 CONFLICTS?=	slony1-1*
 
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 
-.include <bsd.port.options.mk>
+PERLTOOLS_DESC=	Install perl configuration tools
+PERLTOOLS_USES=	perl5
+PERLTOOLS_CONFIGURE_ENV=	PERL=${PERL}
+PERLTOOLS_CONFIGURE_ON=		--with-perltools=${LOCALBASE}/sbin
+PERLTOOLS_BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+PERLTOOLS_RUN_DEPENDS=		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 
-.if ${PORT_OPTIONS:MPERLTOOLS}
-USES+=		perl5
-CONFIGURE_ARGS+=--with-perltools=${LOCALBASE}/sbin
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-BUILD_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-PLIST_SUB+=	PERLTOOLS=""
-SUB_LIST+=	PERLTOOLS=""
-.else
-PLIST_SUB+=	PERLTOOLS="@comment "
-SUB_LIST+=	PERLTOOLS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 # let configure find postgres stuff in non-standard places
 CONFIGURE_ARGS+=--with-pgconfigdir=${LOCALBASE}/bin \
@@ -53,17 +49,6 @@ CONFIGURE_ARGS+=--with-pgconfigdir=${LOC
 		--with-pgpkglibdir=${LOCALBASE}/lib/postgresql \
 		--with-pgsharedir=${LOCALBASE}/share/postgresql
 
-# Setting/finding PostgreSQL version we want.
-.if exists(${LOCALBASE}/bin/postmaster)
-PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
-		${SED} -En 's/.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p'
-.elif exists(${LOCALBASE}/bin/pg_config)
-PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | \
-		${SED} -En 's/PostgreSQL[^0-9]*([0-9]*)\.([0-9]+)\..*/\1\2/p'
-.else
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
-.endif
-
 PORTDOCS=	*
 
 DOCS=		COPYRIGHT INSTALL README README.Unicode RELEASE \
@@ -71,7 +56,7 @@ DOCS=		COPYRIGHT INSTALL README README.U
 
 post-patch:
 	@for _file in ${WRKSRC}/doc/adminguide/man7/*.7; do \
-		mv "$${_file}" $$(echo $${_file} | sed -e 's/ [ ]*/_/g'); \
+		${MV} "$${_file}" $$(echo $${_file} | ${SED} -e 's/ [ ]*/_/g'); \
 	done
 	@for _file in ${WRKSRC}/doc/adminguide/man7/*.7; do \
 		${REINPLACE_CMD} -e '/^.TH/s/  [ ]*/ /g' $${_file}; \