svn commit: r312604 - in head/databases/slony1v2: . files

[Jimmy Olgeni]

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.