Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Feb 2014 21:47:01 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345155 - head/textproc/linuxdoc
Message-ID:  <201402192147.s1JLl19a081957@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Wed Feb 19 21:47:01 2014
New Revision: 345155
URL: http://svnweb.freebsd.org/changeset/ports/345155
QAT: https://qat.redports.org/buildarchive/r345155/

Log:
  Convert to staging. Fix @exec bug in pkg-plist.
  
  Approved by: portmgr (blanket)

Modified:
  head/textproc/linuxdoc/Makefile
  head/textproc/linuxdoc/pkg-plist

Modified: head/textproc/linuxdoc/Makefile
==============================================================================
--- head/textproc/linuxdoc/Makefile	Wed Feb 19 21:45:51 2014	(r345154)
+++ head/textproc/linuxdoc/Makefile	Wed Feb 19 21:47:01 2014	(r345155)
@@ -26,16 +26,9 @@ ISOCAT=		${PREFIX}/share/sgml/iso8879/ca
 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>

Modified: head/textproc/linuxdoc/pkg-plist
==============================================================================
--- head/textproc/linuxdoc/pkg-plist	Wed Feb 19 21:45:51 2014	(r345154)
+++ head/textproc/linuxdoc/pkg-plist	Wed Feb 19 21:47:01 2014	(r345155)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402192147.s1JLl19a081957>