Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Apr 2013 18:50:57 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r316469 - head/databases/slony1v2
Message-ID:  <201304241850.r3OIovPc079999@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Wed Apr 24 18:50:57 2013
New Revision: 316469
URL: http://svnweb.freebsd.org/changeset/ports/316469

Log:
  - Use bsd.port.options.mk.
  - PORTDOCS should not be conditional.
  - Whitespace fix.

Modified:
  head/databases/slony1v2/Makefile

Modified: head/databases/slony1v2/Makefile
==============================================================================
--- head/databases/slony1v2/Makefile	Wed Apr 24 18:38:35 2013	(r316468)
+++ head/databases/slony1v2/Makefile	Wed Apr 24 18:50:57 2013	(r316469)
@@ -30,10 +30,10 @@ PERLTOOLS_DESC=	Install perl configurati
 
 CONFLICTS?=	slony1-1*
 
-.include <bsd.port.pre.mk>
-
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MPERLTOOLS}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=--with-perltools=${LOCALBASE}/sbin
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--with-pgconfigdir=${LOC
 		--with-pgsharedir=${LOCALBASE}/share/postgresql
 
 .if !defined(NO_INSTALL_MANPAGES)
-MAN1=	slon.1 slonik.1
+MAN1=		slon.1 slonik.1
 .endif
 
 # Setting/finding PostgreSQL version we want.
@@ -70,9 +70,7 @@ PGSQL_VER!=	${LOCALBASE}/bin/pg_config -
 PGSQL_VER=	${DEFAULT_PGSQL_VER}
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
 
 DOCS=		COPYRIGHT HISTORY-1.1 INSTALL README README.Unicode RELEASE \
 		RELEASE-2.0 SAMPLE TODO UPGRADING
@@ -95,4 +93,4 @@ post-install:
 	@${INSTALL_DATA} ${FILESDIR}/slon.conf-sample ${PREFIX}/etc/
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304241850.r3OIovPc079999>