Upgrade to 1.0.

PR:		ports/68639
Submitted by:	maintainer

8 files changed, 36 insertions, 16 deletions

diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index db420628c2ac..328ea27c4df6 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	slony1
-PORTVERSION=	1.0.0.r1
+PORTVERSION=	1.0.0
 CATEGORIES=	databases
 MASTER_SITES=	http://developer.postgresql.org/~wieck/slony1/download/
-DISTNAME=	slony1-1.0.0.rc1
 
 MAINTAINER=	hsn@netmag.cz
 COMMENT=	PostgreSQL master to multiple slaves replication system
@@ -57,7 +56,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/implementation/Slony-I-implementation.pdf ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/howto
 	${INSTALL_DATA} ${WRKSRC}/doc/howto/*.txt ${DOCSDIR}/howto
-	${INSTALL_DATA} ${WRKSRC}/src/slonik/slonik_commands.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/howto/slonik_commands.html ${DOCSDIR}
 .endif
 	${CAT} ${PKGMESSAGE}
 
diff --git a/databases/slony1/distinfo b/databases/slony1/distinfo
index f0ea85fd2b98..39969cd9ec33 100644
--- a/databases/slony1/distinfo
+++ b/databases/slony1/distinfo
@@ -1,2 +1,2 @@
-MD5 (slony1-1.0.0.rc1.tar.gz) = 210ee4c6786ec71de105e33f60408a68
-SIZE (slony1-1.0.0.rc1.tar.gz) = 318280
+MD5 (slony1-1.0.0.tar.gz) = c62a059ae80f01a4193a0ed5e382f388
+SIZE (slony1-1.0.0.tar.gz) = 321761
diff --git a/databases/slony1/files/patch-installxxid b/databases/slony1/files/patch-installxxid
new file mode 100644
index 000000000000..af2301f62b14
--- /dev/null
+++ b/databases/slony1/files/patch-installxxid
@@ -0,0 +1,11 @@
+--- src/xxid/Makefile.orig	Thu Jul  1 04:24:35 2004
++++ src/xxid/Makefile	Sat Jul  3 19:38:55 2004
+@@ -38,7 +38,7 @@
+ 	rm -f $(SO_NAME) $(SO_OBJS)
+ 	rm -f $(SQL_NAME74)
+ 
+-
++install:
+ 	$(INSTALL_SCRIPT) $(SO_NAME) $(DESTDIR)$(pkglibdir)
+ 	for file in $(SQL_NAMES); do \
+ 	  $(INSTALL_SCRIPT) $$file $(DESTDIR)$(datadir) || exit ; \
diff --git a/databases/slony1/pkg-descr b/databases/slony1/pkg-descr
index cf3c4368fdee..02da2ac276d6 100644
--- a/databases/slony1/pkg-descr
+++ b/databases/slony1/pkg-descr
@@ -1,12 +1,12 @@
-Slony-I will be a "master to multiple slaves" replication
-system with cascading and failover.
+Slony-I is enterprise-level "master to multiple slaves"
+replication system with cascading and failover.
 
 The big picture for the development of Slony-I is to build 
 a master-slave system that includes all features and
 capabilities needed to replicate large databases to a
 reasonably limited number of slave systems.
 
-Slony-I is planned as a system for data centers and backup
+Slony-I is developed as a system for data centers and backup
 sites, where the normal mode of operation is that all nodes
 are available.
 
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index db420628c2ac..328ea27c4df6 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	slony1
-PORTVERSION=	1.0.0.r1
+PORTVERSION=	1.0.0
 CATEGORIES=	databases
 MASTER_SITES=	http://developer.postgresql.org/~wieck/slony1/download/
-DISTNAME=	slony1-1.0.0.rc1
 
 MAINTAINER=	hsn@netmag.cz
 COMMENT=	PostgreSQL master to multiple slaves replication system
@@ -57,7 +56,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/implementation/Slony-I-implementation.pdf ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/howto
 	${INSTALL_DATA} ${WRKSRC}/doc/howto/*.txt ${DOCSDIR}/howto
-	${INSTALL_DATA} ${WRKSRC}/src/slonik/slonik_commands.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/howto/slonik_commands.html ${DOCSDIR}
 .endif
 	${CAT} ${PKGMESSAGE}
 
diff --git a/databases/slony1v2/distinfo b/databases/slony1v2/distinfo
index f0ea85fd2b98..39969cd9ec33 100644
--- a/databases/slony1v2/distinfo
+++ b/databases/slony1v2/distinfo
@@ -1,2 +1,2 @@
-MD5 (slony1-1.0.0.rc1.tar.gz) = 210ee4c6786ec71de105e33f60408a68
-SIZE (slony1-1.0.0.rc1.tar.gz) = 318280
+MD5 (slony1-1.0.0.tar.gz) = c62a059ae80f01a4193a0ed5e382f388
+SIZE (slony1-1.0.0.tar.gz) = 321761
diff --git a/databases/slony1v2/files/patch-installxxid b/databases/slony1v2/files/patch-installxxid
new file mode 100644
index 000000000000..af2301f62b14
--- /dev/null
+++ b/databases/slony1v2/files/patch-installxxid
@@ -0,0 +1,11 @@
+--- src/xxid/Makefile.orig	Thu Jul  1 04:24:35 2004
++++ src/xxid/Makefile	Sat Jul  3 19:38:55 2004
+@@ -38,7 +38,7 @@
+ 	rm -f $(SO_NAME) $(SO_OBJS)
+ 	rm -f $(SQL_NAME74)
+ 
+-
++install:
+ 	$(INSTALL_SCRIPT) $(SO_NAME) $(DESTDIR)$(pkglibdir)
+ 	for file in $(SQL_NAMES); do \
+ 	  $(INSTALL_SCRIPT) $$file $(DESTDIR)$(datadir) || exit ; \
diff --git a/databases/slony1v2/pkg-descr b/databases/slony1v2/pkg-descr
index cf3c4368fdee..02da2ac276d6 100644
--- a/databases/slony1v2/pkg-descr
+++ b/databases/slony1v2/pkg-descr
@@ -1,12 +1,12 @@
-Slony-I will be a "master to multiple slaves" replication
-system with cascading and failover.
+Slony-I is enterprise-level "master to multiple slaves"
+replication system with cascading and failover.
 
 The big picture for the development of Slony-I is to build 
 a master-slave system that includes all features and
 capabilities needed to replicate large databases to a
 reasonably limited number of slave systems.
 
-Slony-I is planned as a system for data centers and backup
+Slony-I is developed as a system for data centers and backup
 sites, where the normal mode of operation is that all nodes
 are available.