From owner-svn-ports-all@FreeBSD.ORG Tue Feb 25 18:31:16 2014 Return-Path: Delivered-To: svn-ports-all@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 50DED399; Tue, 25 Feb 2014 18:31:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3C950192F; Tue, 25 Feb 2014 18:31:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PIVGP4050569; Tue, 25 Feb 2014 18:31:16 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PIVFZ9050566; Tue, 25 Feb 2014 18:31:15 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402251831.s1PIVFZ9050566@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 25 Feb 2014 18:31:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346058 - head/textproc/ecromedos X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 18:31:16 -0000 Author: mat Date: Tue Feb 25 18:31:15 2014 New Revision: 346058 URL: http://svnweb.freebsd.org/changeset/ports/346058 QAT: https://qat.redports.org/buildarchive/r346058/ Log: Staging. Sponsored by: Absolight Modified: head/textproc/ecromedos/Makefile head/textproc/ecromedos/pkg-plist Modified: head/textproc/ecromedos/Makefile ============================================================================== --- head/textproc/ecromedos/Makefile Tue Feb 25 18:31:09 2014 (r346057) +++ head/textproc/ecromedos/Makefile Tue Feb 25 18:31:15 2014 (r346058) @@ -13,40 +13,35 @@ COMMENT= A document preparation system t RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \ ${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ - xslt.2:${PORTSDIR}/textproc/libxslt +LIB_DEPENDS= libxml2.so.5:${PORTSDIR}/textproc/libxml2 \ + libxslt.so.2:${PORTSDIR}/textproc/libxslt NO_BUILD= yes USE_PYTHON= yes USE_TEX= latex -FIND_DIRS= -type d -FIND_DATA= -type f -not \( -name "*.orig" -or -name "*.bak" \) +OPTIONS_DEFINE= DOCS -LN_OPTS= -sf -RM_OPTS= -r +PORTDOCS= * ECMDS_CONF= ${WRKSRC}/etc/ecmds.conf ECROMEDOC= ${DATADIR}/doc ECROMEBIN= ${DATADIR}/bin/${PORTNAME} -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%DATADIR%%|${DATADIR}|g' ${ECMDS_CONF} do-install: - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${FIND} . ${FIND_DIRS} -exec ${MKDIR} ${DATADIR}/{} \; - cd ${WRKSRC} && ${FIND} . ${FIND_DATA} -exec ${INSTALL_DATA} {} ${DATADIR}/{} \; - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${ECROMEBIN} - ${LN} ${LN_OPTS} ${ECROMEBIN} ${PREFIX}/bin/${PORTNAME} - ${LN} ${LN_OPTS} ${ECROMEBIN} ${PREFIX}/bin/ecmds -.if !defined(NOPORTDOCS) - ${MV} ${ECROMEDOC} ${DOCSDIR} - ${LN} ${LN_OPTS} ${DOCSDIR} ${ECROMEDOC} -.else - ${RM} ${RM_OPTS} ${ECROMEDOC} -.endif + @${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-not ( -name "*.orig" -or -name "*.bak" )" + ${RM} -f ${STAGEDIR}${ECROMEBIN} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${ECROMEBIN} + ${LN} -s ${ECROMEBIN} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${LN} -s ${ECROMEBIN} ${STAGEDIR}${PREFIX}/bin/ecmds + ${MV} ${STAGEDIR}${DATADIR}/etc/ecmds.conf ${STAGEDIR}${DATADIR}/etc/ecmds.conf.sample + ${MV} ${STAGEDIR}${DATADIR}/etc/plugins.conf ${STAGEDIR}${DATADIR}/etc/plugins.conf.sample + ${MV} ${STAGEDIR}${ECROMEDOC} ${STAGEDIR}${DOCSDIR} + ${LN} -s ${DOCSDIR} ${STAGEDIR}${ECROMEDOC} .include Modified: head/textproc/ecromedos/pkg-plist ============================================================================== --- head/textproc/ecromedos/pkg-plist Tue Feb 25 18:31:09 2014 (r346057) +++ head/textproc/ecromedos/pkg-plist Tue Feb 25 18:31:15 2014 (r346058) @@ -1,42 +1,5 @@ bin/ecmds bin/ecromedos -%%PORTDOCS%%%%DOCSDIR%%/langdef.txt -%%PORTDOCS%%%%DOCSDIR%%/manual/html/biblio.html -%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/html/chapter5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/manual/html/m000001.gif -%%PORTDOCS%%%%DOCSDIR%%/manual/html/next.gif -%%PORTDOCS%%%%DOCSDIR%%/manual/html/prev.gif -%%PORTDOCS%%%%DOCSDIR%%/manual/html/style.css -%%PORTDOCS%%%%DOCSDIR%%/manual/html/toc.gif -%%PORTDOCS%%%%DOCSDIR%%/manual/pdf/manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/manual/src/advanced.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/src/compiling.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/src/installation.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/src/introduction.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/src/manual.xml -%%PORTDOCS%%%%DOCSDIR%%/manual/src/writing.xml -%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter1.html -%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter2.html -%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter3.html -%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter4.html -%%PORTDOCS%%%%DOCSDIR%%/reference/html/chapter5.html -%%PORTDOCS%%%%DOCSDIR%%/reference/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/reference/html/next.gif -%%PORTDOCS%%%%DOCSDIR%%/reference/html/prev.gif -%%PORTDOCS%%%%DOCSDIR%%/reference/html/style.css -%%PORTDOCS%%%%DOCSDIR%%/reference/html/toc.gif -%%PORTDOCS%%%%DOCSDIR%%/reference/pdf/reference.pdf -%%PORTDOCS%%%%DOCSDIR%%/reference/src/AtoC.xml -%%PORTDOCS%%%%DOCSDIR%%/reference/src/DtoL.xml -%%PORTDOCS%%%%DOCSDIR%%/reference/src/MtoS.xml -%%PORTDOCS%%%%DOCSDIR%%/reference/src/TtoZ.xml -%%PORTDOCS%%%%DOCSDIR%%/reference/src/defs.xml -%%PORTDOCS%%%%DOCSDIR%%/reference/src/reference.xml %%DATADIR%%/bin/configreader.py %%DATADIR%%/bin/configreader.pyc %%DATADIR%%/bin/ecmdsproc.py @@ -58,8 +21,12 @@ bin/ecromedos %%DATADIR%%/data/toc.gif %%DATADIR%%/data/toc.png %%PORTDOCS%%%%DATADIR%%/doc -%%DATADIR%%/etc/ecmds.conf -%%DATADIR%%/etc/plugins.conf +@unexec if cmp -s %D/%%DATADIR%%/etc/ecmds.conf.sample %D/%%DATADIR%%/etc/ecmds.conf; then rm -f %D/%%DATADIR%%/etc/ecmds.conf; fi +%%DATADIR%%/etc/ecmds.conf.sample +@exec if [ ! -f %D/%%DATADIR%%/etc/ecmds.conf ] ; then cp -p %D/%F %B/ecmds.conf; fi +@unexec if cmp -s %D/%%DATADIR%%/etc/plugins.conf.sample %D/%%DATADIR%%/etc/plugins.conf; then rm -f %D/%%DATADIR%%/etc/plugins.conf; fi +%%DATADIR%%/etc/plugins.conf.sample +@exec if [ ! -f %D/%%DATADIR%%/etc/plugins.conf ] ; then cp -p %D/%F %B/plugins.conf; fi %%DATADIR%%/lib/__init__.py %%DATADIR%%/lib/hylight/__init__.py %%DATADIR%%/lib/hylight/__init__.pyc @@ -249,15 +216,6 @@ bin/ecromedos %%DATADIR%%/transform/xhtml/toc.xsl %%DATADIR%%/transform/xhtml/utility.xsl %%DATADIR%%/transform/xhtml/xhtml.xsl -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/html -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/src -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/html -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/src -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/bin @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/etc