Index: head/textproc/docbook/files/catalog
===================================================================
--- head/textproc/docbook/files/catalog	(revision 175953)
+++ head/textproc/docbook/files/catalog	(nonexistent)
@@ -1,7 +0,0 @@
--- $FreeBSD$ --
-
-CATALOG	"2.4.1/catalog"
-CATALOG	"3.0/catalog"
-CATALOG	"3.1/catalog"
-CATALOG	"4.0/catalog"
-CATALOG	"4.1/catalog"

Property changes on: head/textproc/docbook/files/catalog
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/textproc/docbook/Makefile
===================================================================
--- head/textproc/docbook/Makefile	(revision 175953)
+++ head/textproc/docbook/Makefile	(revision 175954)
@@ -1,34 +1,89 @@
 # New ports collection makefile for:   docbook
 # Date created:        7 April 1999
 # Whom:                Nik Clayton <nik@freebsd.org>
 #
 # Based heavily on work by jfieber
 #
 # $FreeBSD$
 #
 
 PORTNAME=	docbook
 PORTVERSION=	1.3
 CATEGORIES=	textproc
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+MASTER_SITES=	#
+DISTFILES=	#
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Meta-port for the different versions of the DocBook DTD
 
-RUN_DEPENDS=	${PREFIX}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
-		${PREFIX}/share/sgml/docbook/2.4.1:${PORTSDIR}/textproc/docbook-241 \
-		${PREFIX}/share/sgml/docbook/3.0:${PORTSDIR}/textproc/docbook-300 \
-		${PREFIX}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
-		${PREFIX}/share/sgml/docbook/4.0:${PORTSDIR}/textproc/docbook-400 \
-		${PREFIX}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 \
-		${PREFIX}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
-
-EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
-PLIST_FILES=	share/sgml/docbook/catalog
 
-do-install:
-	@${INSTALL_DATA} ${FILESDIR}/catalog ${PREFIX}/share/sgml/docbook/catalog
+OPTIONS=	DB241 "DocBook SGML DTD 2.4.1" on \
+		DB30 "DocBook SGML DTD 3.0" on \
+		DB31 "DocBook SGML DTD 3.1" on \
+		DB40 "DocBook SGML DTD 4.0" on \
+		DB41 "DocBook SGML DTD 4.1" on \
+		DB41_XML "DocBook XML DTD 4.1" off \
+		DB42 "DocBook SGML DTD 4.2" off \
+		DB42_XML "DocBook XML DTD 4.2" on \
+		DB43_XML "DocBook XML DTD 4.3" off \
+		DB44_XML "DocBook XML DTD 4.4" off \
+		DB45_XML "DocBook XML DTD 4.5" off \
+		ISO8879 "ISO 8879:1986 character entity sets (SGML)" on \
+		SDB_XML "Simplified DocBook XML DTD" off
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DB241)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/2.4.1:${PORTSDIR}/textproc/docbook-241
+.endif
+
+.if defined(WITH_DB30)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/3.0:${PORTSDIR}/textproc/docbook-300
+.endif
+
+.if defined(WITH_DB31)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310
+.endif
+
+.if defined(WITH_DB40)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.0:${PORTSDIR}/textproc/docbook-400
+.endif
+
+.if defined(WITH_DB41)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
+.endif
+
+.if defined(WITH_DB41_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+.endif
+
+.if defined(WITH_DB42)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-420
+.endif
+
+.if defined(WITH_DB42_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
+.endif
+
+.if defined(WITH_DB43_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-ml-430
+.endif
+
+.if defined(WITH_DB44_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-ml-440
+.endif
+
+.if defined(WITH_DB45_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-ml-450
+.endif
+
+.if defined(WITH_ISO8879)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879
+.endif
+
+.if defined(WITH_SDB_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/sdocbook/4.1.2.5:${PORTSDIR}/textproc/sdocbook-xml
+.endif
+
+.include <bsd.port.post.mk>

Property changes on: head/textproc/docbook/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property