3 files changed, 207 insertions, 6 deletions

diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index 726c0206e293..a92a0cbe41d5 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	slony1
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.5
 CATEGORIES=	databases
 MASTER_SITES=	http://developer.postgresql.org/~wieck/slony1/download/
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-${PORTVERSION}-docs${EXTRACT_SUFX}
 
 MAINTAINER=	vivek@khera.org
 COMMENT=	PostgreSQL master to multiple replicas replication system
@@ -64,12 +66,12 @@ PGSQL_VER=	${DEFAULT_PGSQL_VER}
 post-install:
 .if ! defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-#	${MKDIR} ${DOCSDIR}/adminguide
+	${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/*/*.pdf ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/howto/*.txt ${WRKSRC}/doc/howto/*.html ${DOCSDIR}/howto/
-#	${INSTALL_DATA} ${WRKSRC}/doc/adminguide/prebuilt/*.html ${DOCSDIR}/adminguide/
+	${INSTALL_DATA} ${WRKDIR}/*.html ${WRKDIR}/*.png ${DOCSDIR}/adminguide/
 .endif
 	@${INSTALL_SCRIPT} ${WRKDIR}/slon-mkservice.sh ${PREFIX}/sbin/slon-mkservice
 	@${INSTALL_DATA} ${FILESDIR}/slon.conf-sample ${PREFIX}/etc/
diff --git a/databases/slony1/distinfo b/databases/slony1/distinfo
index 357e264fd56a..608da0216221 100644
--- a/databases/slony1/distinfo
+++ b/databases/slony1/distinfo
@@ -1,3 +1,4 @@
-MD5 (slony1-1.1.2.tar.bz2) = 753d116f30983c31b1090df1144ea063
-SHA256 (slony1-1.1.2.tar.bz2) = e0dcfaa29122681650acdee31362b861c60230c692eaa3632c4444d4de8bbf7c
-SIZE (slony1-1.1.2.tar.bz2) = 497795
+MD5 (slony1-1.1.5.tar.bz2) = d3ffff50323f1413b9b81084f906f9f8
+SIZE (slony1-1.1.5.tar.bz2) = 610569
+MD5 (slony1-1.1.5-docs.tar.bz2) = c0d775ab74ed54703843f05391c17636
+SIZE (slony1-1.1.5-docs.tar.bz2) = 148800
diff --git a/databases/slony1/pkg-plist b/databases/slony1/pkg-plist
index f8ba0e8482bb..bcdb7c79addc 100644
--- a/databases/slony1/pkg-plist
+++ b/databases/slony1/pkg-plist
@@ -49,4 +49,202 @@ share/postgresql/xxid.v74.sql
 %%PORTDOCS%%%%DOCSDIR%%/howto/slony-I-overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/howto/slony-I-basic-mstr-slv.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/howto
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/LEGALNOTICE.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/addthings.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/admconninfo.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/altperl.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/bestpractices.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/bookindex.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/cluster.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/clustername.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/cmds.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/commandreference.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/complexenv.png
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/concepts.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/ddlchanges.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/definingsets.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/dropthings.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/failover.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.add-missing-table-field-text-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.altertableforreplication-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.altertablerestore-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.cleanupevent.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.cleanuplistener.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text-text-text-text-text-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text-text-text-text-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text-text-text-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text-text-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.createevent-name-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.ddlscript-int-integer-text-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.ddlscript-integer-text-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.denyaccess.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.determineattkindserial-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.determineattkindunique-text-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.determineidxnameserial-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.determineidxnameunique-text-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.disablenode-int-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.disablenode-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.droplisten-int-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.droplisten-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.dropnode-int-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.dropnode-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.droppath-int-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.droppath-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.dropset-int-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.dropset-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.droptrigger-int-integer-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.droptrigger-integer-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.enablenode-int-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.enablenode-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.enablesubscription-int-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.enablesubscription-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.failednode-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.failednode2-integer-integer-integer-bigint-bigint.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.failoverset-int-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.forwardconfirm-integer-integer-bigint-timestamp-without-time-zone.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.generate-sync-event-interval.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.getlocalnodeid-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.getmoduleversion.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.getsessionrole-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.initializelocalnode-integer-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.lockedset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.lockset-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.logtrigger.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.mergeset-int-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.mergeset-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.moveset-int-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.moveset-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.rebuildlistenentries.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.rebuildlistenentriesone-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.sequencelastvalue-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.sequencesetvalue-integer-integer-bigint-bigint.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setaddsequence-int-integer-integer-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setaddsequence-integer-integer-text-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setaddtable-int-integer-integer-text-name-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setaddtable-integer-integer-text-name-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setdropsequence-int-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setdropsequence-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setdroptable-int-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setdroptable-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setmovesequence-int-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setmovesequence-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setmovetable-int-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setmovetable-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.setsessionrole-name-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.slon-quote-brute-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.slon-quote-input-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.slonyversion.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.slonyversionmajor.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.slonyversionminor.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.slonyversionpatchlevel.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storelisten-int-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storelisten-integer-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storenode-int-integer-text-boolean.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storenode-integer-text-boolean.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storepath-int-integer-integer-text-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storepath-integer-integer-text-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storeset-int-integer-integer-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storeset-integer-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storetrigger-int-integer-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.storetrigger-integer-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.subscribeset-int-integer-integer-integer-boolean.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.subscribeset-integer-integer-integer-boolean.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.tableaddkey-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.tabledropkey-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.tablehasserialkey-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.terminatenodeconnections-name.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.uninstallnode.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.unlockset-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.unsubscribeset-int-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.unsubscribeset-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.updaterelname-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.updatereloid-integer-integer.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/function.upgradeschema-text.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/hdrcmds.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/help.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/listenpaths.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/locking.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/logshipping.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/maintenance.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/metacmds.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/monitoring.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/noslonik.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/plainpaths.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/requirements.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/reshape.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/runtime-config.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/schema.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slon-config-connection.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slon-config-interval.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slon.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slonik.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slonikref.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slonikshell.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slonstart.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slonyadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slonyintro.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/slonylistenercosts.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtcreateset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtddlscript.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtdefine.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtdroplisten.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtdropnode.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtdroppath.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtdropset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtdroptrigger.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtecho.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtexit.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtfailover.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtinclude.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtinitcluster.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtlockset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtmergeset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtmoveset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtrestartnode.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtsetaddsequence.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtsetaddtable.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtsetdropsequence.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtsetdroptable.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtsetmovesequence.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtsetmovetable.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtstorelisten.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtstorenode.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtstorepath.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtstoretrigger.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtsubscribeset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmttableaddkey.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtuninstallnode.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtunlockset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtunsubscribeset.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtupdatefunctions.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/stmtwaitevent.html
+@comment %%PORTDOCS%%%%DOCSDIR%%/adminguide/stylesheet.css
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/subscribenodes.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/supportedplatforms.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-confirm.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-event.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-listen.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-log-1.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-log-2.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-node.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-path.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-seqlog.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-sequence.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-set.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-setsync.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-subscribe.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-table.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/table.sl-trigger.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/testbed.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/usingslonik.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/versionupgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/adminguide/view.sl-seqlastvalue.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/adminguide
 %%PORTDOCS%%@dirrm %%DOCSDIR%%