From owner-svn-ports-head@FreeBSD.ORG Tue Feb 19 21:22:29 2013 Return-Path: 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 B2A6CC24; Tue, 19 Feb 2013 21:22:29 +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 8CA4285F; Tue, 19 Feb 2013 21:22:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1JLMTsP093575; Tue, 19 Feb 2013 21:22:29 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1JLMT0r093573; Tue, 19 Feb 2013 21:22:29 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201302192122.r1JLMT0r093573@svn.freebsd.org> From: Jimmy Olgeni Date: Tue, 19 Feb 2013 21:22:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312604 - in head/databases/slony1v2: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 21:22:29 -0000 Author: olgeni Date: Tue Feb 19 21:22:28 2013 New Revision: 312604 URL: http://svnweb.freebsd.org/changeset/ports/312604 Log: Use DOCS option. Modified: head/databases/slony1v2/Makefile head/databases/slony1v2/files/pkg-message.in Modified: head/databases/slony1v2/Makefile ============================================================================== --- head/databases/slony1v2/Makefile Tue Feb 19 20:56:04 2013 (r312603) +++ head/databases/slony1v2/Makefile Tue Feb 19 21:22:28 2013 (r312604) @@ -25,7 +25,7 @@ USE_RC_SUBR= slon SUB_FILES= pkg-message slon-mkservice.sh SUB_LIST+= NAME=slon -OPTIONS_DEFINE= PERLTOOLS +OPTIONS_DEFINE= DOCS PERLTOOLS PERLTOOLS_DESC= Install perl configuration tools CONFLICTS?= slony1-1* @@ -70,7 +70,7 @@ PGSQL_VER!= ${LOCALBASE}/bin/pg_config - PGSQL_VER= ${DEFAULT_PGSQL_VER} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .endif @@ -78,7 +78,7 @@ DOCS= COPYRIGHT HISTORY-1.1 INSTALL REA RELEASE-2.0 SAMPLE TODO UPGRADING post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/adminguide @${MKDIR} ${DOCSDIR}/howto Modified: head/databases/slony1v2/files/pkg-message.in ============================================================================== --- head/databases/slony1v2/files/pkg-message.in Tue Feb 19 20:56:04 2013 (r312603) +++ head/databases/slony1v2/files/pkg-message.in Tue Feb 19 21:22:28 2013 (r312604) @@ -1,7 +1,9 @@ ******************************************************************************* -Please read the docs on configuring and running slony-1. Unless you specified -NOPORTDOCS, they are in the %%LOCALBASE%%/share/doc/slony1v2 directory. +Please read the docs on configuring and running slony-1. + +Unless you did not specify the DOCS options, they are in the +%%LOCALBASE%%/share/doc/slony1v2 directory. If you are upgrading from a prior version of slony, please read the UPGRADING file in the above docs directory. @@ -16,7 +18,7 @@ set slon_enable="YES" in /etc/rc.conf to To use either of the above startup configurations, you will need to set up a %%LOCALBASE%%/etc/slon.conf file to tell slon what to replicate. This file is documented in %%LOCALBASE%%/share/doc/slony1/adminguide/runtime-config.html - +%%PERLTOOLS%% %%PERLTOOLS%%To use the perl slony configuration and monitoring tools, you must %%PERLTOOLS%%create %%LOCALBASE%%/etc/slon_tools.conf based on the sample file.