From owner-svn-ports-head@FreeBSD.ORG  Thu Aug  7 14:30:19 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 040E1405
 for <svn-ports-head@freebsd.org>; Thu,  7 Aug 2014 14:30:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CECFA20F1
 for <svn-ports-head@freebsd.org>; Thu,  7 Aug 2014 14:30:18 +0000 (UTC)
Received: from pawel (uid 1252) (envelope-from pawel@FreeBSD.org) id 52bc
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Thu, 07 Aug 2014 14:30:18 +0000
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 7 Aug 2014 14:30:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364275 - head/textproc/xhtml-basic
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e38d7a.52bc.40ef466b@svn.freebsd.org>
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Aug 2014 14:30:19 -0000

Author: pawel
Date: Thu Aug  7 14:30:18 2014
New Revision: 364275
URL: http://svnweb.freebsd.org/changeset/ports/364275
QAT: https://qat.redports.org/buildarchive/r364275/

Log:
  Add staging support

Modified:
  head/textproc/xhtml-basic/Makefile

Modified: head/textproc/xhtml-basic/Makefile
==============================================================================
--- head/textproc/xhtml-basic/Makefile	Thu Aug  7 14:26:37 2014	(r364274)
+++ head/textproc/xhtml-basic/Makefile	Thu Aug  7 14:30:18 2014	(r364275)
@@ -41,7 +41,6 @@ SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} 
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
 
-NO_STAGE=	yes
 .include "${.CURDIR}/contents.inc"
 
 # I'd much rather do this stuff in line with the actual installation
@@ -60,25 +59,20 @@ pre-install:
 	${ECHO} "@unexec ${SGMLCAT_RM}" >> ${PLIST}
 	${ECHO} "@exec ${SGMLCAT_ADD}" >> ${PLIST}
 	${ECHO} "@dirrm ${dir_DTD}" >> ${PLIST}
-	${ECHO} '@unexec rmdir %D share/xml/dtd 2>/dev/null || true' >> \
+	${ECHO} '@unexec rmdir %D/share/xml/dtd 2>/dev/null || true' >> \
 	    ${PLIST}
 	${ECHO} "@dirrm ${dir_DOC}" >> ${PLIST}
 
 do-install:
-	@[ -d ${PREFIX}/${dir_DTD} ] || \
-	    ${MKDIR} ${PREFIX}/${dir_DTD}
-	@[ -d ${PREFIX}/${dir_DOC} ] || \
-	    ${MKDIR} ${PREFIX}/${dir_DOC}
-.for f in ${contents_DTD}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DTD}/${f}
-.endfor
-.for f in ${contents_DOC}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DOC}/${f}
-.endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DTD}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DOC}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${contents_DTD} \
+		${STAGEDIR}${PREFIX}/${dir_DTD})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${contents_DOC} \
+		${STAGEDIR}${PREFIX}/${dir_DOC})
 	${SED} -e "s;@@PREFIX@@;${PREFIX};g" ${FILESDIR}/catalog.xml > \
 	    ${WRKDIR}/catalog.xml
-	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/${dir_DTD}/catalog.xml
-	${XMLCAT_ADD}
-	${SGMLCAT_ADD}
+	${INSTALL_DATA} ${WRKDIR}/catalog.xml \
+		${STAGEDIR}${PREFIX}/${dir_DTD}/catalog.xml
 
 .include <bsd.port.mk>