Take over maintainership and update.

Approved by:	maintainer timeout.

5 files changed, 36 insertions, 63 deletions

diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index 8ea459561098..a01e3478c3e4 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -6,35 +6,31 @@
 #
 
 PORTNAME=	sdocbook-xml
-PORTVERSION= 	4.1.2.4
+PORTVERSION= 	4.1.2.5
 CATEGORIES=	textproc
-MASTER_SITES=	http://nwalsh.com/docbook/simple/4.1.2.4/
-DISTNAME=	sdb${PORTVERSION:S/.//g}
+MASTER_SITES=	http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/
+DISTNAME=	simple${PORTVERSION:S/.//g}
+EXTRACT_ONLY=	# empty
 
-MAINTAINER=	kiri@FreeBSD.org
+MAINTAINER=	des@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/share/xml/docbook/readme.txt:${PORTSDIR}/textproc/docbook-xml
+RUN_DEPENDS=    ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
 
 USE_ZIP=	yes
-NO_MTREE=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
+PLIST_SUB=	MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
 
-INSTDIR=	${PREFIX}/share/xml/docbook
-DTDDIR=		${INSTDIR}/sdocbook
-ENTDIR=		${INSTDIR}/sdocbook/ent
+SDOCBOOKDIR=	${PREFIX}/share/xml/sdocbook
+MKCATALOG=      ${LOCALBASE}/sbin/mkcatalog
+CATALOG=        ${PREFIX}/share/xml/catalog
 
 do-install:
-	${MKDIR} ${ENTDIR}
-	${INSTALL_DATA} ${FILESDIR}/catalog ${DTDDIR}
-	cd ${WRKSRC}; \
-		${INSTALL_DATA} COPYRIGHT ChangeLog LostLog README VERSION \
-			*.dtd *.mod *.css *.xml ${DTDDIR}; \
-		${INSTALL_DATA} ent/* ${ENTDIR}
-	if [ ! -f ${INSTDIR}/catalog ]; then \
-		${ECHO_CMD} "CATALOG \"sdocbook/catalog\"" > ${INSTDIR}/catalog; \
-	else \
-		${SETENV} LANG=C ${PERL} -ni -e 'print if !m|sdocbook/catalog|;print "CATALOG \"sdocbook/catalog\"\n" if eof;' ${INSTDIR}/catalog; \
-	fi
+	${MKDIR} ${SDOCBOOKDIR}
+	(cd ${SDOCBOOKDIR} && unzip -oq ${DISTDIR}/${DISTFILES})
+	${INSTALL_DATA} ${FILESDIR}/catalog ${SDOCBOOKDIR}
+
+post-install:
+	${MKCATALOG} -q -c ${CATALOG} install sdocbook catalog
 
 .include <bsd.port.mk>
diff --git a/textproc/sdocbook-xml/distinfo b/textproc/sdocbook-xml/distinfo
index 9c8e0849949c..ef08d9cfb912 100644
--- a/textproc/sdocbook-xml/distinfo
+++ b/textproc/sdocbook-xml/distinfo
@@ -1 +1 @@
-MD5 (sdb4124.zip) = 64e9d808dfa2aee7315136dbe5ee6fdd
+MD5 (simple4125.zip) = 001fe86011b81c9f7aa863c385b98fcd
diff --git a/textproc/sdocbook-xml/files/catalog b/textproc/sdocbook-xml/files/catalog
index fa0d34cfb9ee..2fffe74485da 100644
--- a/textproc/sdocbook-xml/files/catalog
+++ b/textproc/sdocbook-xml/files/catalog
@@ -1,11 +1,3 @@
-PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Character Entity Sets V4.1.2.4//EN" "sdbcent.mod"
-PUBLIC "-//Norman Walsh//ELEMENTS Simplified DocBook XML Document Hierarchy V4.1.2.4//EN" "sdbhier.mod"
-PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Information Pool V4.1.2.4//EN" "sdbpool.mod"
-PUBLIC "-//Norman Walsh//DTD Simplified Custom DocBook XML V4.1.2.4//EN" "sdocbook-custom.dtd"
-PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML V4.1.2.4//EN" "sdocbook.dtd"
-PUBLIC "-//Norman Walsh//DTD Simplified Custom DocBook XML RefEntry V4.1.2.4//EN" "sdocbookref-custom.dtd"
-PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML RefEntry V4.1.2.4//EN" "sdocbookref.dtd"
-PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Inclusions V4.1.2.4//EN" "sinclist.mod"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+OVERRIDE YES
+PUBLIC "-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN" "sdocbook.dtd"
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V4.1.2.5//EN" "sdocbookref.dtd"
diff --git a/textproc/sdocbook-xml/pkg-descr b/textproc/sdocbook-xml/pkg-descr
index 5347ccc20b35..0f932f1b46fd 100644
--- a/textproc/sdocbook-xml/pkg-descr
+++ b/textproc/sdocbook-xml/pkg-descr
@@ -1,4 +1,3 @@
 The "Simplified" DocBook XML DTD is a small subset of the DocBook XML DTD. 
-For more information, see below:
 
-WWW: http://nwalsh.com/docbook/simple/
+WWW: http://www.oasis-open.org/docbook/xml/simple/
diff --git a/textproc/sdocbook-xml/pkg-plist b/textproc/sdocbook-xml/pkg-plist
index bb9f09505662..14f0f1781954 100644
--- a/textproc/sdocbook-xml/pkg-plist
+++ b/textproc/sdocbook-xml/pkg-plist
@@ -1,28 +1,14 @@
-@unexec env LANG=C perl -ni -e 'print if !m|sdocbook/catalog|;' %D/share/xml/docbook/catalog;if [ ! -s %D/share/xml/docbook/catalog ]; then rm -f %D/share/xml/docbook/catalog; fi
-@exec if [ ! -f %D/share/xml/docbook/catalog ]; then echo "CATALOG \"sdocbook/catalog\"" > %D/share/xml/docbook/catalog; else env LANG=C perl -ni -e 'print if !m|sdocbook/catalog|;print "CATALOG \"sdocbook/catalog\"\n" if eof;' %D/share/xml/docbook/catalog; fi
-share/xml/docbook/sdocbook/COPYRIGHT
-share/xml/docbook/sdocbook/ChangeLog
-share/xml/docbook/sdocbook/LostLog
-share/xml/docbook/sdocbook/README
-share/xml/docbook/sdocbook/VERSION
-share/xml/docbook/sdocbook/catalog
-share/xml/docbook/sdocbook/ent/iso-lat1.ent
-share/xml/docbook/sdocbook/ent/iso-num.ent
-share/xml/docbook/sdocbook/ent/iso-pub.ent
-share/xml/docbook/sdocbook/sdbcent.mod
-share/xml/docbook/sdocbook/sdbhier.mod
-share/xml/docbook/sdocbook/sdbpool.mod
-share/xml/docbook/sdocbook/sdocbook-custom.dtd
-share/xml/docbook/sdocbook/sdocbook.css
-share/xml/docbook/sdocbook/sdocbook.dtd
-share/xml/docbook/sdocbook/sdocbookref-custom.dtd
-share/xml/docbook/sdocbook/sdocbookref.dtd
-share/xml/docbook/sdocbook/sinclist.mod
-share/xml/docbook/sdocbook/test.xml
-share/xml/docbook/sdocbook/testcss.xml
-share/xml/docbook/sdocbook/testcust.xml
-share/xml/docbook/sdocbook/testrefcust.xml
-@dirrm share/xml/docbook/sdocbook/ent
-@dirrm share/xml/docbook/sdocbook
-@unexec rmdir %D/share/xml/docbook 2>/dev/null || true
-@unexec rmdir %D/share/xml 2>/dev/null || true
+share/xml/catalog
+@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall sdocbook catalog
+share/xml/sdocbook/catalog
+@exec %%MKCATALOG%% -q -c%%CATALOG%% install sdocbook catalog
+share/xml/sdocbook/sdbcent.mod
+share/xml/sdocbook/sdbhier.mod
+share/xml/sdocbook/sdbpool.mod
+share/xml/sdocbook/sdocbook-custom.dtd
+share/xml/sdocbook/sdocbook.css
+share/xml/sdocbook/sdocbook.dtd
+share/xml/sdocbook/sdocbookref-custom.dtd
+share/xml/sdocbook/sdocbookref.dtd
+share/xml/sdocbook/sinclist.mod
+@dirrm share/xml/sdocbook