textproc/sdocbook-xml: Reintegrate docbook/bsd.docbook.mk

A few months ago, sdocbook-xml was split up along with many other
docbook ports to use a common makefile.  Since then, the other docbook
ports have been consolidated into two flavors (xml and sgml) and neither
use the textproc/docbook/bsd.docbook.mk makefile.

Moreover, it conditionally sets the EXTRACT_SUFX to .zip, but without
setting USES+= zip which is now required for all zip distfiles.

The cleanest fix is to move the needed bits from the common makefile
back into sdocbook-xml and delete the common makefile.  It passed 8x
on redport and DragonFly (w/ AK archiver patch in place)

Approved by:	portmgr (mat)

2 files changed, 28 insertions, 95 deletions

diff --git a/textproc/docbook/bsd.docbook.mk b/textproc/docbook/bsd.docbook.mk
deleted file mode 100644
index 35fee75cbe65..000000000000
--- a/textproc/docbook/bsd.docbook.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-# MAINTAINER: portmgr@FreeBSD.org
-#
-# $FreeBSD$
-
-.ifdef XML_DTD
-XML_SGML=	xml
-.else
-XML_SGML=	sgml
-.endif
-
-PORTNAME?=	docbook
-CATEGORIES=	textproc
-.ifndef MASTER_SITES
-.  ifdef HAS_OASIS_MASTER_SITE
-MASTER_SITES=	http://www.oasis-open.org/docbook/${XML_SGML}/${PORTVERSION}/
-.  else
-MASTER_SITES=	http://www.docbook.org/${XML_SGML}/${PORTVERSION}/
-.  endif
-.endif
-EXTRACT_SUFX?=	.zip
-
-.ifndef NO_ISOCAT
-RUN_DEPENDS+=	${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879
-.endif
-RUN_DEPENDS+=	${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_MTREE=	yes
-NO_BUILD=	yes
-.ifndef NO_DISTNAME_FIX
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-.endif
-
-CATALOG_FILES?=	catalog
-XMLCATMGR=	bin/xmlcatmgr
-SGMLCAT=	share/sgml/catalog.ports
-ISOCAT=		share/sgml/iso8879/catalog
-XMLCAT=		share/xml/catalog.ports
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
-DTD_NAME?=	${PORTNAME}
-DTD_VERSION?=	${PORTVERSION}
-.ifndef NO_DTD_SUBDIR
-DTD_SUBDIR?=	/dtd
-.endif
-DTDDIR?=	share/${XML_SGML}/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR}
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \
-		DTDDIR=${DTDDIR}
-SUB_LIST+=	DTDDIR=${PREFIX}/${DTDDIR}
-
-
-.if !defined(PORTDOCS) && !defined(MANUAL_DOCS)
-PORTDOCS=	*.txt
-.endif
-
-.if defined(PORTDOCS) && !defined(MANUAL_DOCS)
-OPTIONS_DEFINE+=	DOCS
-.endif
-
-.ifdef HAS_CATALOG_FILE
-post-extract:
-	@${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog
-
-post-patch:
-	@${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog
-	@${RM} ${WRKSRC}/catalog.orig
-.elifndef HAS_MANUAL_CATALOG_FILE
-SUB_FILES=	${CATALOG_FILES}
-.endif
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DTDDIR}
-.if !defined(HAS_CATALOG_FILE) && !defined(HAS_MANUAL_CATALOG_FILE)
-.  for f in ${CATALOG_FILES}
-	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${DTDDIR}
-.  endfor
-.endif
-.if defined(PORTDOCS) && !defined(MANUAL_DOCS)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR}
-.  endfor
-.endif
-.ifndef NO_DTD_SUBDIR
-	@${ECHO_CMD} "@dirrm share/${XML_SGML}/${DTD_NAME}/${DTD_VERSION}" >> ${TMPPLIST}
-.endif
-	@${ECHO_CMD} "@unexec rmdir %D/share/${XML_SGML}/${DTD_NAME} 2>/dev/null || :" >> ${TMPPLIST}
-.if defined(PORTDOCS)
-	@${ECHO_CMD} "@unexec rmdir %D/share/doc/${PORTNAME} 2>/dev/null || :" >> ${TMPPLIST}
-.endif
-
diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index 06f3a368fa0f..33a579e38d94 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -5,18 +5,41 @@ PORTNAME=	sdocbook-xml
 PORTVERSION=	1.1
 PORTREVISION=	1
 PORTEPOCH=	2
+CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/xml/simple/${PORTVERSION}/
 DISTNAME=	docbook-simple-${PORTVERSION}
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	"Simplified" DocBook XML DTD
 
-NO_ISOCAT=	yes
-XML_DTD=	yes
-MANUAL_DOCS=	yes
+RUN_DEPENDS+=	${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+
+USES=		zip
+NO_MTREE=	yes
+NO_BUILD=	yes
+
+XMLCATMGR=	bin/xmlcatmgr
+XMLCAT=		share/xml/catalog.ports
+SGMLCAT=	share/sgml/catalog.ports
 CATALOG_FILES=	catalog catalog.xml
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
+DTD_NAME=	sdocbook
+DTD_VERSION=	${PORTVERSION}
+DTD_SUBDIR=	/dtd
+DTDDIR=		share/xml/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR}
+PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \
+		DTDDIR=${DTDDIR}
+SUB_FILES=	${CATALOG_FILES}
+SUB_LIST+=	DTDDIR=${PREFIX}/${DTDDIR}
+WRKSRC=		${WRKDIR}
 
-DTD_NAME=	${PORTNAME:S/-xml//}
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DTDDIR}
+.for f in ${CATALOG_FILES}
+	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${DTDDIR}
+.endfor
+	@${ECHO_CMD} "@dirrm share/xml/${DTD_NAME}/${DTD_VERSION}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/xml/${DTD_NAME} 2>/dev/null || :" >> ${TMPPLIST}
 
-.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>