From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 00:13:49 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 781078BF; Sat, 5 Jul 2014 00:13:49 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 64AE82187; Sat, 5 Jul 2014 00:13:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s650DngB077028; Sat, 5 Jul 2014 00:13:49 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s650DnaG077026; Sat, 5 Jul 2014 00:13:49 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407050013.s650DnaG077026@svn.freebsd.org> From: Adam Weinberger Date: Sat, 5 Jul 2014 00:13:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360704 - head/x11-fonts/wqy 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.18 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: Sat, 05 Jul 2014 00:13:49 -0000 Author: adamw Date: Sat Jul 5 00:13:48 2014 New Revision: 360704 URL: http://svnweb.freebsd.org/changeset/ports/360704 QAT: https://qat.redports.org/buildarchive/r360704/ Log: Remove NOPORTDOCS and NOPORTEXAMPLES from unstaged ports. Stage a couple while we're here. Remove any other references to NOPORT*. Approved by: portmgr (blanket for modernization) Modified: head/x11-fonts/wqy/Makefile head/x11-fonts/wqy/pkg-plist Modified: head/x11-fonts/wqy/Makefile ============================================================================== --- head/x11-fonts/wqy/Makefile Sat Jul 5 00:13:33 2014 (r360703) +++ head/x11-fonts/wqy/Makefile Sat Jul 5 00:13:48 2014 (r360704) @@ -39,17 +39,14 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} \ SUB_FILES= pkg-message SUB_LIST= FONTSDIR=${PREFIX}/${FONTSDIR} -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS -.if !defined(NOPORTDOCS) PORTDOCS= AUTHORS.bitmap ChangeLog.bitmap README.bitmap COPYING.bitmap \ LOGO.png \ AUTHORS.zenhei ChangeLog.zenhei README.zenhei \ AUTHORS.microheilite README.microheilite ChangeLog.microheilite \ AUTHORS.microhei README.microhei ChangeLog.microhei \ LICENSE_Apache2.txt LICENSE_GPLv3.txt -.endif do-build: ${PERL} ${WRKDIR}/wqy-unibit/bdfmerge.pl 0x0--0xFFFF ${WRKDIR}/wqy-unibit/wqy-unibit.bdf > ${WRKDIR}/wqy-unibit/wqy-unibit_cjk.bdf @@ -69,23 +66,22 @@ do-build: ${CP} ${WRKDIR}/wqy-microhei/README.txt ${WRKDIR}/wqy-microhei/README.microhei do-install: - ${MKDIR} ${PREFIX}/${FONTSDIR} ${PREFIX}/${CONFDDIR} ${PREFIX}/${CONFAVAILDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR} ${STAGEDIR}${PREFIX}/${CONFDDIR} ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} # WQY Bitmap Song - ${INSTALL_DATA} ${WRKDIR}/wqy-bitmapsong/*.pcf ${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${WRKDIR}/wqy-bitmapsong/*.pcf ${STAGEDIR}${PREFIX}/${FONTSDIR} # WQY Bitmap Song - ${INSTALL_DATA} ${WRKDIR}/wqy-unibit/wqy-unibit.pcf ${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${WRKDIR}/wqy-unibit/wqy-unibit.pcf ${STAGEDIR}${PREFIX}/${FONTSDIR} # WQY TrueType Zenhei - ${INSTALL_DATA} ${WRKDIR}/wqy-zenhei/wqy-zenhei.ttc ${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${WRKDIR}/wqy-zenhei/wqy-zenhei.ttc ${STAGEDIR}${PREFIX}/${FONTSDIR} # WQY TrueType MicroHei Lite - ${INSTALL_DATA} ${WRKDIR}/wqy-microhei-lite/wqy-microhei-lite.ttc ${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${WRKDIR}/wqy-microhei-lite/wqy-microhei-lite.ttc ${STAGEDIR}${PREFIX}/${FONTSDIR} # WQY TrueType MicroHei - ${INSTALL_DATA} ${WRKDIR}/wqy-microhei/wqy-microhei.ttc ${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${WRKDIR}/wqy-microhei/wqy-microhei.ttc ${STAGEDIR}${PREFIX}/${FONTSDIR} - ${INSTALL_DATA} ${FILESDIR}/85-wqy.conf ${PREFIX}/${CONFAVAILDIR} - ${LN} -sf ${PREFIX}/${CONFAVAILDIR}/85-wqy.conf ${PREFIX}/${CONFDDIR}/85-wqy.conf + ${INSTALL_DATA} ${FILESDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} + ${LN} -sf ${PREFIX}/${CONFAVAILDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFDDIR}/85-wqy.conf -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ ${WRKDIR}/wqy-bitmapsong/AUTHORS.bitmap \ ${WRKDIR}/wqy-bitmapsong/ChangeLog.bitmap \ @@ -103,15 +99,10 @@ do-install: ${WRKDIR}/wqy-microhei/README.microhei \ ${WRKDIR}/wqy-microhei/LICENSE_Apache2.txt \ ${WRKDIR}/wqy-microhei/LICENSE_GPLv3.txt \ - ${DOCSDIR} -.endif + ${STAGEDIR}${DOCSDIR} post-install: - @${RM} -f ${PREFIX}/${FONTSDIR}/fonts.dir - @${RM} -f ${PREFIX}/${FONTSDIR}/fonts.scale - @command mkfontscale -b ${PREFIX}/${FONTSDIR} - @command fc-cache -fv + @${RM} -f ${STAGEDIR}${PREFIX}/${FONTSDIR}/fonts.dir + @${RM} -f ${STAGEDIR}${PREFIX}/${FONTSDIR}/fonts.scale - ${CAT} ${PKGMESSAGE} - -.include +.include Modified: head/x11-fonts/wqy/pkg-plist ============================================================================== --- head/x11-fonts/wqy/pkg-plist Sat Jul 5 00:13:33 2014 (r360703) +++ head/x11-fonts/wqy/pkg-plist Sat Jul 5 00:13:48 2014 (r360704) @@ -10,4 +10,5 @@ %%FONTSDIR%%/wqy-zenhei.ttc %%FONTSDIR%%/wqy-microhei-lite.ttc %%FONTSDIR%%/wqy-microhei.ttc +@fcfontsdir %%FONTSDIR%% @dirrm %%FONTSDIR%%