Reduce difference with other docbook ports.

Sponsored by:	Absolight

2 files changed, 34 insertions, 34 deletions

diff --git a/textproc/docbook-430/Makefile b/textproc/docbook-430/Makefile
index 4810611fb697..a74d572c5ea7 100644
--- a/textproc/docbook-430/Makefile
+++ b/textproc/docbook-430/Makefile
@@ -6,35 +6,30 @@ PORTVERSION=	4.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/
 PKGNAMESUFFIX=	-430
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DocBook/SGML DTD V4.3, designed for technical documentation
 
-RUN_DEPENDS=	${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
+RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
 		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_ZIP=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-PLIST=		${WRKSRC}/pkg-plist
-
-SGMLCATBASE=	share/sgml
-DTD_NAME=	${PORTNAME}
-DTD_VERSION=	${PORTVERSION}
-ISOCAT=		${SGMLCATBASE}/iso8879/catalog
+EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
 
+DTDDIR=		${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION}
+SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
+ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/${SGMLCATBASE}/catalog.ports
-REGIST_CAT_FLAGS_SGML=	-sc ${CATALOG_PORTS_SGML} \
-			add CATALOG ${DTD_NAME}/${DTD_VERSION}/catalog
-UNREGIST_CAT_FLAGS_SGML=	-sc ${CATALOG_PORTS_SGML} \
-			remove CATALOG ${DTD_NAME}/${DTD_VERSION}/catalog
 
-DOC_FILES=	ChangeLog README
-DTDDIR=		${SGMLCATBASE}/${DTD_NAME}/${DTD_VERSION}
+PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
+		DTDDIR=${DTDDIR:S/${PREFIX}\///}
+
+PORTDOCS=	ChangeLog README
 DTD_FILES=	calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \
 		dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbook.dcl \
 		docbook.dtd docbookx.dtd htmltblx.mod soextblx.dtd catalog
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
 
 post-extract:
 	${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog
@@ -42,24 +37,10 @@ post-extract:
 post-patch:
 	${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog
 
-pre-install:
-	(for F in ${DTD_FILES}; do \
-			${ECHO_CMD} "${DTDDIR}/$${F}"; \
-		done;\
-	${ECHO_CMD} "@dirrm ${DTDDIR}";\
-	${ECHO_CMD} "@dirrmtry ${SGMLCATBASE}/${DTD_NAME}"; ) > ${PLIST}
-	(for F in ${DOC_FILES}; do \
-			${ECHO_CMD} "${DOCSDIR:S,^${PREFIX}/,,}/$${F}"; \
-		done;\
-	${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" ) >> ${PLIST}
-	${ECHO_CMD} "@exec ${XMLCATMGR} ${REGIST_CAT_FLAGS_SGML}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${XMLCATMGR} ${UNREGIST_CAT_FLAGS_SGML}" >> ${PLIST}
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
+	@${MKDIR} ${STAGEDIR}${DTDDIR}
+	${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-430/pkg-plist b/textproc/docbook-430/pkg-plist
new file mode 100644
index 000000000000..cb557fea6226
--- /dev/null
+++ b/textproc/docbook-430/pkg-plist
@@ -0,0 +1,19 @@
+@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
+%%DTDDIR%%/calstblx.dtd
+%%DTDDIR%%/catalog
+%%DTDDIR%%/catalog.xml
+%%DTDDIR%%/dbcentx.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhierx.mod
+%%DTDDIR%%/dbnotnx.mod
+%%DTDDIR%%/dbpoolx.mod
+%%DTDDIR%%/docbook.cat
+%%DTDDIR%%/docbook.dcl
+%%DTDDIR%%/docbook.dtd
+%%DTDDIR%%/docbookx.dtd
+%%DTDDIR%%/htmltblx.mod
+%%DTDDIR%%/soextblx.dtd
+@dirrmtry %%DTDDIR%%
+@dirrmtry share/sgml/docbook
+@dirrmtry share/doc/docbook
+@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog