From 60fef323ed1fdb251e0d754439517ac890bcb8bc Mon Sep 17 00:00:00 2001
From: mandree <mandree@FreeBSD.org>
Date: Wed, 19 Feb 2014 21:47:01 +0000
Subject: Convert to staging. Fix @exec bug in pkg-plist.

Approved by: portmgr (blanket)
---
 textproc/linuxdoc/Makefile  | 13 +++----------
 textproc/linuxdoc/pkg-plist |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index 786abdc840b6..389c2101bef6 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -26,16 +26,9 @@ ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
-NO_STAGE=	yes
-pre-su-install:
-	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
-
 do-install:
-	@zcat ${DISTDIR}/${DISTFILES} |(cd ${INSTDIR}; ${PAX} -r)
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/*
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
-
-post-install:
-	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog
+	${MKDIR} ${STAGEDIR}${INSTDIR}
+	zcat ${DISTDIR}/${DISTFILES} |(cd ${STAGEDIR}${INSTDIR}; ${PAX} -r)
+	${CHMOD} ${SHAREMODE} ${STAGEDIR}${INSTDIR}/*
 
 .include <bsd.port.mk>
diff --git a/textproc/linuxdoc/pkg-plist b/textproc/linuxdoc/pkg-plist
index 725005c28a9b..95c2dc9026a6 100644
--- a/textproc/linuxdoc/pkg-plist
+++ b/textproc/linuxdoc/pkg-plist
@@ -1,7 +1,7 @@
 share/sgml/linuxdoc/README
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog
 share/sgml/linuxdoc/catalog
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/catalog
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/catalog
 share/sgml/linuxdoc/freebsd-1.0.dtd
 share/sgml/linuxdoc/freebsd-1.1.dtd
 share/sgml/linuxdoc/linuxdoc.dec
-- 
cgit