svn commit: r333243 - head/databases/slony1v2

Jimmy Olgeni olgeni at FreeBSD.org
Fri Nov 8 16:09:35 UTC 2013 

Author: olgeni
Date: Fri Nov  8 16:09:34 2013
New Revision: 333243
URL: http://svnweb.freebsd.org/changeset/ports/333243

Log:
  - Upgrade to version 2.2.1.
  - Add staging support.
  - Do not mute install commands.
  - Cleanup pkg-plist.

Modified:
  head/databases/slony1v2/Makefile
  head/databases/slony1v2/distinfo
  head/databases/slony1v2/pkg-plist   (contents, props changed)

Modified: head/databases/slony1v2/Makefile
==============================================================================
--- head/databases/slony1v2/Makefile	Fri Nov  8 15:51:47 2013	(r333242)
+++ head/databases/slony1v2/Makefile	Fri Nov  8 16:09:34 2013	(r333243)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	slony1v2
-PORTVERSION=	2.1.3
+PORTVERSION=	2.2.1
 CATEGORIES=	databases
-MASTER_SITES=	http://main.slony.info/downloads/2.1/source/
+MASTER_SITES=	http://main.slony.info/downloads/2.2/source/
 DISTNAME=	slony1-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME}-docs${EXTRACT_SUFX}
@@ -31,7 +31,6 @@ CONFLICTS?=	slony1-1*
 
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPERLTOOLS}
@@ -55,10 +54,6 @@ CONFIGURE_ARGS+=--with-pgconfigdir=${LOC
 		--with-pgpkglibdir=${LOCALBASE}/lib/postgresql \
 		--with-pgsharedir=${LOCALBASE}/share/postgresql
 
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=		slon.1 slonik.1
-.endif
-
 # Setting/finding PostgreSQL version we want.
 .if exists(${LOCALBASE}/bin/postmaster)
 PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
@@ -72,25 +67,27 @@ PGSQL_VER=	${DEFAULT_PGSQL_VER}
 
 PORTDOCS=	*
 
-DOCS=		COPYRIGHT HISTORY-1.1 INSTALL README README.Unicode RELEASE \
-		RELEASE-2.0 SAMPLE TODO UPGRADING
+DOCS=		COPYRIGHT INSTALL README README.Unicode RELEASE \
+		SAMPLE TODO UPGRADING
+
+post-patch:
+	@for _file in ${WRKSRC}/doc/adminguide/man7/*.7; do \
+		mv "$${_file}" $$(echo $${_file} | sed -e 's/ [ ]*/_/g'); \
+	done
+	@for _file in ${WRKSRC}/doc/adminguide/man7/*.7; do \
+		${REINPLACE_CMD} -e '/^.TH/s/  [ ]*/ /g' $${_file}; \
+	done
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/adminguide
-	@${MKDIR} ${DOCSDIR}/howto
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/adminguide
+.for _file in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${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
-.endif
-	@${INSTALL_SCRIPT} ${WRKDIR}/slon-mkservice.sh ${PREFIX}/sbin/slon-mkservice
-	@${INSTALL_DATA} ${FILESDIR}/slon.conf-sample ${PREFIX}/etc/
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKSRC}/doc/adminguide/*.html ${WRKSRC}/doc/adminguide/*.png ${STAGEDIR}${DOCSDIR}/adminguide/
+	${INSTALL_MAN} ${WRKSRC}/doc/adminguide/man1/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/adminguide/man7/*.7 ${STAGEDIR}${MAN1PREFIX}/man/man7
+	${INSTALL_SCRIPT} ${WRKDIR}/slon-mkservice.sh ${STAGEDIR}${PREFIX}/sbin/slon-mkservice
+	${INSTALL_DATA} ${FILESDIR}/slon.conf-sample ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>

Modified: head/databases/slony1v2/distinfo
==============================================================================
--- head/databases/slony1v2/distinfo	Fri Nov  8 15:51:47 2013	(r333242)
+++ head/databases/slony1v2/distinfo	Fri Nov  8 16:09:34 2013	(r333243)
@@ -1,4 +1,4 @@
-SHA256 (slony1-2.1.3.tar.bz2) = 048b94c990afceb892f8f6631268bb66e93a3c630afc694b3a09f051c338790b
-SIZE (slony1-2.1.3.tar.bz2) = 1512693
-SHA256 (slony1-2.1.3-docs.tar.bz2) = 8588df1b06086809ce0fef7e1348405bf701c959e2b0affda9d6305f201d6fb4
-SIZE (slony1-2.1.3-docs.tar.bz2) = 1314210
+SHA256 (slony1-2.2.1.tar.bz2) = 8606c2be3ad219fb8d482e5a0f836e37d26df3b49d5bce099fc71fd95961e960
+SIZE (slony1-2.2.1.tar.bz2) = 1466866
+SHA256 (slony1-2.2.1-docs.tar.bz2) = 7c8fdbe35a5738f38dd4a7774e3e5b3413916da6e3c7fba3bd5554b61e003d30
+SIZE (slony1-2.2.1-docs.tar.bz2) = 1445906

Modified: head/databases/slony1v2/pkg-plist
==============================================================================
--- head/databases/slony1v2/pkg-plist	Fri Nov  8 15:51:47 2013	(r333242)
+++ head/databases/slony1v2/pkg-plist	Fri Nov  8 16:09:34 2013	(r333243)
@@ -3,15 +3,61 @@ bin/slonik
 bin/slony_logshipper
 etc/slon.conf-sample
 %%PERLTOOLS%%etc/slon_tools.conf-sample
-%%LIB32DIR%%/postgresql/slony1_funcs.so
-%%PERLTOOLS%%%%LIB32DIR%%/slon-tools.pm
+lib/postgresql/slony1_funcs.2.2.1.so
+%%PERLTOOLS%%lib/slon-tools.pm
+man/man1/slon.1.gz
+man/man1/slonik.1.gz
+man/man7/SLONIK_ADMIN_CONNINFO.7.gz
+man/man7/SLONIK_CLONE_FINISH.7.gz
+man/man7/SLONIK_CLONE_PREPARE.7.gz
+man/man7/SLONIK_CLUSTER_NAME.7.gz
+man/man7/SLONIK_CREATE_SET.7.gz
+man/man7/SLONIK_DATE.7.gz
+man/man7/SLONIK_DEFINE.7.gz
+man/man7/SLONIK_DROP_LISTEN.7.gz
+man/man7/SLONIK_DROP_NODE.7.gz
+man/man7/SLONIK_DROP_PATH.7.gz
+man/man7/SLONIK_DROP_SET.7.gz
+man/man7/SLONIK_DROP_TRIGGER.7.gz
+man/man7/SLONIK_ECHO.7.gz
+man/man7/SLONIK_EXECUTE_SCRIPT.7.gz
+man/man7/SLONIK_EXIT.7.gz
+man/man7/SLONIK_FAILOVER.7.gz
+man/man7/SLONIK_INCLUDE.7.gz
+man/man7/SLONIK_INIT_CLUSTER.7.gz
+man/man7/SLONIK_LOCK_SET.7.gz
+man/man7/SLONIK_MERGE_SET.7.gz
+man/man7/SLONIK_MOVE_SET.7.gz
+man/man7/SLONIK_REPAIR_CONFIG.7.gz
+man/man7/SLONIK_RESTART_NODE.7.gz
+man/man7/SLONIK_RESUBSCRIBE_NODE.7.gz
+man/man7/SLONIK_SET_ADD_SEQUENCE.7.gz
+man/man7/SLONIK_SET_ADD_TABLE.7.gz
+man/man7/SLONIK_SET_DROP_SEQUENCE.7.gz
+man/man7/SLONIK_SET_DROP_TABLE.7.gz
+man/man7/SLONIK_SET_MOVE_SEQUENCE.7.gz
+man/man7/SLONIK_SET_MOVE_TABLE.7.gz
+man/man7/SLONIK_SLEEP.7.gz
+man/man7/SLONIK_STORE_LISTEN.7.gz
+man/man7/SLONIK_STORE_NODE.7.gz
+man/man7/SLONIK_STORE_PATH.7.gz
+man/man7/SLONIK_STORE_TRIGGER.7.gz
+man/man7/SLONIK_SUBSCRIBE_SET.7.gz
+man/man7/SLONIK_SYNC.7.gz
+man/man7/SLONIK_TABLE_ADD_KEY.7.gz
+man/man7/SLONIK_TABLE_DROP_KEY.7.gz
+man/man7/SLONIK_UNINSTALL_NODE.7.gz
+man/man7/SLONIK_UNLOCK_SET.7.gz
+man/man7/SLONIK_UNSUBSCRIBE_SET.7.gz
+man/man7/SLONIK_UPDATE_FUNCTIONS.7.gz
+man/man7/SLONIK_WAIT_FOR_EVENT.7.gz
 sbin/slon-mkservice
-share/postgresql/slony1_base.sql
-share/postgresql/slony1_base.v83.sql
-share/postgresql/slony1_base.v84.sql
-share/postgresql/slony1_funcs.sql
-share/postgresql/slony1_funcs.v83.sql
-share/postgresql/slony1_funcs.v84.sql
+share/postgresql/slony1_base.2.2.1.sql
+share/postgresql/slony1_base.v83.2.2.1.sql
+share/postgresql/slony1_base.v84.2.2.1.sql
+share/postgresql/slony1_funcs.2.2.1.sql
+share/postgresql/slony1_funcs.v83.2.2.1.sql
+share/postgresql/slony1_funcs.v84.2.2.1.sql
 %%PERLTOOLS%%sbin/slon_kill
 %%PERLTOOLS%%sbin/slon_start
 %%PERLTOOLS%%sbin/slon_status
@@ -37,3 +83,5 @@ share/postgresql/slony1_funcs.v84.sql
 %%PERLTOOLS%%sbin/slonik_unsubscribe_set
 %%PERLTOOLS%%sbin/slonik_update_nodes
 %%PERLTOOLS%%sbin/slony_show_configuration
+ at dirrmtry share/postgresql
+ at dirrmtry lib/postgresql

More information about the svn-ports-all mailing list