Cleanup and reduce diff with upcoming upgrade.

2 files changed, 18 insertions, 21 deletions

diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index 29561c5d840b..95c37c07ddce 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -31,7 +31,7 @@ SUB_LIST+=	NAME=slon
 
 OPTIONS=	PERLTOOLS "Install perl configuration tools" Off
 
-CONFLICTS?=     slony1-1*
+CONFLICTS?=	slony1-1*
 
 .include <bsd.port.pre.mk>
 
@@ -39,7 +39,7 @@ IGNORE_WITH_PGSQL=	73 74 80 81 82
 
 .if defined(WITH_PERLTOOLS)
 USE_PERL5=	yes
-CONFIGURE_ARGS+=	--with-perltools=${LOCALBASE}/sbin
+CONFIGURE_ARGS+=--with-perltools=${LOCALBASE}/sbin
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 PLIST_SUB+=	PERLTOOLS=""
@@ -51,12 +51,12 @@ SUB_LIST+=	PERLTOOLS="@comment "
 
 # let configure find postgres stuff in non-standard places
 CONFIGURE_ARGS+=--with-pgconfigdir=${LOCALBASE}/bin \
-  --with-pgbindir=${LOCALBASE}/bin \
-  --with-pgincludedir=${LOCALBASE}/include \
-  --with-pgincludeserverdir=${LOCALBASE}/include/postgresql/server \
-  --with-pglibdir=${LOCALBASE}/lib \
-  --with-pgpkglibdir=${LOCALBASE}/lib/postgresql \
-  --with-pgsharedir=${LOCALBASE}/share/postgresql
+		--with-pgbindir=${LOCALBASE}/bin \
+		--with-pgincludedir=${LOCALBASE}/include \
+		--with-pgincludeserverdir=${LOCALBASE}/include/postgresql/server \
+		--with-pglibdir=${LOCALBASE}/lib \
+		--with-pgpkglibdir=${LOCALBASE}/lib/postgresql \
+		--with-pgsharedir=${LOCALBASE}/share/postgresql
 
 DEFAULT_PGSQL_VER?=83
 
@@ -76,13 +76,13 @@ MAN1=	slon.1 slonik.1
 .endif
 
 post-install:
-.if ! defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${MKDIR} ${DOCSDIR}/adminguide
-	${MKDIR} ${DOCSDIR}/howto
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${WRKSRC}/INSTALL ${WRKSRC}/SAMPLE ${WRKSRC}/README ${WRKSRC}/HISTORY-1.1 ${WRKSRC}/UPGRADING ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/howto/*.txt ${WRKSRC}/doc/howto/*.html ${DOCSDIR}/howto/
-	${INSTALL_DATA} ${WRKSRC}/doc/adminguide/*.html ${WRKSRC}/doc/adminguide/*.png ${DOCSDIR}/adminguide/
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/adminguide
+	@${MKDIR} ${DOCSDIR}/howto
+	@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${WRKSRC}/INSTALL ${WRKSRC}/SAMPLE ${WRKSRC}/README ${WRKSRC}/HISTORY-1.1 ${WRKSRC}/UPGRADING ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/howto/*.txt ${WRKSRC}/doc/howto/*.html ${DOCSDIR}/howto/
+	@${INSTALL_DATA} ${WRKSRC}/doc/adminguide/*.html ${WRKSRC}/doc/adminguide/*.png ${DOCSDIR}/adminguide/
 .endif
 .if ! defined(NO_INSTALL_MANPAGES)
 	${INSTALL_MAN} ${WRKSRC}/doc/adminguide/man1/*.1 ${MAN1PREFIX}/man/man1
diff --git a/databases/slony1v2/files/pkg-message.in b/databases/slony1v2/files/pkg-message.in
index d63faf0d7d1b..95536a320297 100644
--- a/databases/slony1v2/files/pkg-message.in
+++ b/databases/slony1v2/files/pkg-message.in
@@ -1,5 +1,4 @@
-**********************************************************************
-
+*******************************************************************************
 
 Please read the docs on configuring and runing slony-1.  Unless you specified
 NOPORTDOCS, they are in the %%LOCALBASE%%/share/doc/slony1 directory.
@@ -15,12 +14,10 @@ If you prefer to use the standard startup script in %%LOCALBASE%%/etc/rc.d then
 set slon_enable="YES" in /etc/rc.conf to enable the slon.sh script.
 
 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
+%%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%%To use the perl slony configuration and monitoring tools, you must
 %%PERLTOOLS%%create %%LOCALBASE%%/etc/slon_tools.conf based on the sample file.
 
-
-
-**********************************************************************
+*******************************************************************************