svn commit: r337154 - in head/textproc/docbook-420: . files

[Chris Rees]

Author: crees
Date: Sat Dec 21 16:57:53 2013
New Revision: 337154
URL: http://svnweb.freebsd.org/changeset/ports/337154

Log:
  Stagify and correct extraction.
  
  PR:		ports/181624
  Submitted by:	crees
  Approved by:	maintainer timeout (kutulu at kutulu.org, 5 months)

Added:
  head/textproc/docbook-420/files/catalog.in
     - copied, changed from r337153, head/textproc/docbook-420/files/catalog
Deleted:
  head/textproc/docbook-420/files/catalog
Modified:
  head/textproc/docbook-420/Makefile

Modified: head/textproc/docbook-420/Makefile
==============================================================================
--- head/textproc/docbook-420/Makefile	Sat Dec 21 16:52:11 2013	(r337153)
+++ head/textproc/docbook-420/Makefile	Sat Dec 21 16:57:53 2013	(r337154)
@@ -5,43 +5,39 @@ PORTNAME=	docbook
 PORTVERSION=	4.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.docbook.org/sgml/4.2/
-EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kutulu at kutulu.org
 COMMENT=	V4.2 of the DocBook DTD, designed for technical documentation
 
+EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
 		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 USE_ZIP=	yes
 NO_MTREE=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 PLIST_SUB=	DTD_NAME=${PORTNAME}
 PLIST_SUB+=	DTD_VERSION=${PORTVERSION}
 PLIST_SUB+=	XMLCATMGR=${XMLCATMGR}
 PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+SUB_FILES+=	catalog
+SUB_LIST+=	ISOCAT=${ISOCAT}
 
-INSTDIR=	${PREFIX}/share/sgml/docbook
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
+INSTDIR=	${STAGEDIR}${PREFIX}/share/sgml/docbook
+ISOCAT=		${LOCALBASE}/share/sgml/iso8879/catalog
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+CATALOG_PORTS_SGML=	${LOCALBASE}/share/sgml/catalog.ports
 
 LATEST_LINK=	docbook-420
 
-NO_STAGE=	yes
-pre-su-install:
-	@[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION}
+do-extract:
+	${MKDIR} ${WRKSRC}
+	${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
+		-d ${WRKSRC}
 
 do-install:
-	@unzip ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION}
-	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog
-	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/*
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
-
-post-install:
-	@-${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog
+	@${MKDIR} ${INSTDIR}/${PORTVERSION}
+	${INSTALL_DATA} ${WRKSRC}/* ${WRKDIR}/catalog \
+		${INSTDIR}/${PORTVERSION}/
 
 .include <bsd.port.mk>

Copied and modified: head/textproc/docbook-420/files/catalog.in (from r337153, head/textproc/docbook-420/files/catalog)
==============================================================================
--- head/textproc/docbook-420/files/catalog	Sat Dec 21 16:52:11 2013	(r337153, copy source)
+++ head/textproc/docbook-420/files/catalog.in	Sat Dec 21 16:57:53 2013	(r337154)
@@ -83,3 +83,5 @@ PUBLIC "ISO 8879:1986//ENTITIES Non-Russ
 
   -- End of catalog data for DocBook V4.2 ................................. --
   -- ...................................................................... --
+
+CATALOG "%%ISOCAT%%"