From owner-svn-ports-head@FreeBSD.ORG  Wed Apr 24 18:50:57 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id A9ABFF5B;
 Wed, 24 Apr 2013 18:50:57 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9B386166A;
 Wed, 24 Apr 2013 18:50:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OIovKk080001;
 Wed, 24 Apr 2013 18:50:57 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OIovPc079999;
 Wed, 24 Apr 2013 18:50:57 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201304241850.r3OIovPc079999@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Wed, 24 Apr 2013 18:50:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316469 - head/databases/slony1v2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Wed, 24 Apr 2013 18:50:57 -0000

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>