8 files changed, 77 insertions, 25 deletions

diff --git a/MOVED b/MOVED
index e07811decd22..49ced279b1bb 100644
--- a/MOVED
+++ b/MOVED
@@ -3243,3 +3243,4 @@ devel/dklibs||2012-03-03|Has expired: not needed for graphics/bmeps anymore, no
 security/blocksshd||2012-03-03|Removed: security/sshguard is more active and a better tool.
 net/p5-Net-Subnets||2012-03-03|Has expired: Disappeared from CPAN
 www/mediawiki116||2012-03-04|Has expired: Unsupport Upstream
+databases/postgresql-docs|databases/postgresql84-docs|2012-03-04|Split into versioned ports
diff --git a/databases/Makefile b/databases/Makefile
index f68d6c87959e..5295f84db0e9 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -609,7 +609,6 @@
     SUBDIR += phppgadmin
     SUBDIR += postgis
     SUBDIR += postgis-jdbc
-    SUBDIR += postgresql-docs
     SUBDIR += postgresql-jdbc
     SUBDIR += postgresql-libpgeasy
     SUBDIR += postgresql-libpq++
@@ -629,18 +628,22 @@
     SUBDIR += postgresql82-server
     SUBDIR += postgresql83-client
     SUBDIR += postgresql83-contrib
+    SUBDIR += postgresql83-docs
     SUBDIR += postgresql83-plperl
     SUBDIR += postgresql83-server
     SUBDIR += postgresql84-client
     SUBDIR += postgresql84-contrib
+    SUBDIR += postgresql84-docs
     SUBDIR += postgresql84-plperl
     SUBDIR += postgresql84-server
     SUBDIR += postgresql90-client
     SUBDIR += postgresql90-contrib
+    SUBDIR += postgresql90-docs
     SUBDIR += postgresql90-plperl
     SUBDIR += postgresql90-server
     SUBDIR += postgresql91-client
     SUBDIR += postgresql91-contrib
+    SUBDIR += postgresql91-docs
     SUBDIR += postgresql91-plperl
     SUBDIR += postgresql91-server
     SUBDIR += postgresql_autodoc
diff --git a/databases/postgresql-docs/pkg-descr b/databases/postgresql-docs/pkg-descr
deleted file mode 100644
index 37331683ba41..000000000000
--- a/databases/postgresql-docs/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-This port installs all of PostgreSQL's documentation files into
-share/doc/postgresql/html
diff --git a/databases/postgresql-docs/pkg-plist b/databases/postgresql-docs/pkg-plist
deleted file mode 100644
index 435f005646ca..000000000000
--- a/databases/postgresql-docs/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@comment automatically generated plist
diff --git a/databases/postgresql83-docs/Makefile b/databases/postgresql83-docs/Makefile
new file mode 100644
index 000000000000..8e4970471e6e
--- /dev/null
+++ b/databases/postgresql83-docs/Makefile
@@ -0,0 +1,10 @@
+# New ports collection makefile for:	PostgreSQL docs
+# Date created:		August 26, 2002
+# Whom:			Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+WANT_PGSQL_VER=83
+
+.include "${.CURDIR}/../postgresql84-docs/Makefile"
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql84-docs/Makefile
index 0f61626be538..c1a5658d8c81 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql84-docs/Makefile
@@ -9,31 +9,14 @@ PORTNAME=	postgresql
 PORTREVISION=	0
 PKGNAMESUFFIX=	-docs
 
-MAINTAINER=	crees@FreeBSD.org
+MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
 
-MASTERDIR=	${.CURDIR}/../postgresql${PGSQL_VER}-server
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
-DEFAULT_PGSQL_VER?=84
+USE_PGSQL=	yes
+WANT_PGSQL_VER?=84
 
-# can't include <bsd.port.pre.mk> in a slave port
-# so set these instead:
-LOCALBASE?=	/usr/local
-SED?=		/usr/bin/sed
-
-CONFLICTS=	postgresql-docs
-
-# Setting/finding PostgreSQL version we want.
-.if exists(${LOCALBASE}/bin/pg_config)
-PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1\2/p'
-.else
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
-.endif
-
-.if (${PGSQL_VER} == 90) || (${PGSQL_VER} == 91)
-BROKEN=		"not implemented yet"
-.endif
- 
 NO_BUILD=	YES
 SLAVE_ONLY=	YES
 PATCHDIR=	mustnotexist
diff --git a/databases/postgresql90-docs/Makefile b/databases/postgresql90-docs/Makefile
new file mode 100644
index 000000000000..ed377d0e94b1
--- /dev/null
+++ b/databases/postgresql90-docs/Makefile
@@ -0,0 +1,10 @@
+# New ports collection makefile for:	PostgreSQL docs
+# Date created:		August 26, 2002
+# Whom:			Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+WANT_PGSQL_VER=90
+
+.include "${.CURDIR}/../postgresql91-docs/Makefile"
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
new file mode 100644
index 000000000000..295a10bbd542
--- /dev/null
+++ b/databases/postgresql91-docs/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	PostgreSQL docs
+# Date created:		August 26, 2002
+# Whom:			Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	postgresql
+PORTREVISION=	0
+PKGNAMESUFFIX=	-docs
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	The PostgreSQL documentation set
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
+
+USE_PGSQL=	YES
+WANT_PGSQL_VER?=91
+
+SLAVE_ONLY=	YES
+
+PGDOCSREL?=	${DOCSDIR_REL}/release-${PGSQL_VER}
+PGDOCSDIR?=	${PREFIX}/${PGDOCSREL}
+
+sgmldir=	${LOCALBASE}/share/sgml
+dbdir=		${sgmldir}/docbook
+
+BUILD_DEPENDS+=	onsgmls:${PORTSDIR}/textproc/opensp			\
+		openjade:${PORTSDIR}/textproc/openjade			\
+		${sgmldir}/iso8879/catalog:${PORTSDIR}/textproc/iso8879	\
+		${dbdir}/dsssl/modular/catalog:${PORTSDIR}/textproc/dsssl-docbook-modular \
+		${dbdir}/4.2/docbook.dtd:${PORTSDIR}/textproc/docbook-420
+
+do-build:
+	${GMAKE} -C ${WRKSRC} html
+
+do-install:
+	@ $(MKDIR) ${PGDOCSDIR}
+	( cd ${WRKSRC}/doc/src/sgml/html && \
+		${COPYTREE_SHARE} \* ${PGDOCSDIR} )
+
+post-install:
+	@(cd ${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST}
+	@(cd ${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \
+	     ${SED} 's,.*,@unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST}
+	
+
+.include "${MASTERDIR}/Makefile"