From owner-svn-ports-head@FreeBSD.ORG Wed Jan 8 00:06:51 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38071A46; Wed, 8 Jan 2014 00:06:51 +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 184611E8B; Wed, 8 Jan 2014 00:06:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0806ohO072706; Wed, 8 Jan 2014 00:06:50 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0806n4g072700; Wed, 8 Jan 2014 00:06:49 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201401080006.s0806n4g072700@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 8 Jan 2014 00:06:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339059 - in head/korean: aleefonts-ttf nanumcoding-ttf nanumfonts-otf nanumfonts-ttf unfonts-core unfonts-extra X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 00:06:51 -0000 Author: jkim Date: Wed Jan 8 00:06:49 2014 New Revision: 339059 URL: http://svnweb.freebsd.org/changeset/ports/339059 Log: Simplify and support staging. Modified: head/korean/aleefonts-ttf/Makefile head/korean/nanumcoding-ttf/Makefile head/korean/nanumfonts-otf/Makefile head/korean/nanumfonts-ttf/Makefile head/korean/unfonts-core/Makefile head/korean/unfonts-extra/Makefile Modified: head/korean/aleefonts-ttf/Makefile ============================================================================== --- head/korean/aleefonts-ttf/Makefile Wed Jan 8 00:06:46 2014 (r339058) +++ head/korean/aleefonts-ttf/Makefile Wed Jan 8 00:06:49 2014 (r339059) @@ -15,36 +15,27 @@ COMMENT= A-Lee's Hangul truetype fonts # LICENSE= ART10 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ +BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} FONTSDIR= lib/X11/fonts/alee${PKGNAMESUFFIX} FONTLIST= Bandal Bangwool Eunjin EunjinNakseo Guseul +FONTFILES= ${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale PLIST_DIRS= ${FONTSDIR} -.for f in ${FONTLIST} -PLIST_FILES+= ${FONTSDIR}/${f}.ttf -.endfor -PLIST_FILES+= ${FONTSDIR}/fonts.dir \ - ${FONTSDIR}/fonts.scale +PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|} -NO_STAGE= yes do-build: ${LOCALBASE}/bin/mkfontscale ${WRKSRC} ${LOCALBASE}/bin/mkfontdir ${WRKSRC} do-install: - ${MKDIR} ${PREFIX}/${FONTSDIR} -.for f in ${FONTLIST} - ${INSTALL_DATA} ${WRKSRC}/${f}.ttf ${PREFIX}/${FONTSDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR} post-install: @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} - @-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null .include Modified: head/korean/nanumcoding-ttf/Makefile ============================================================================== --- head/korean/nanumcoding-ttf/Makefile Wed Jan 8 00:06:46 2014 (r339058) +++ head/korean/nanumcoding-ttf/Makefile Wed Jan 8 00:06:49 2014 (r339059) @@ -14,7 +14,7 @@ COMMENT= NanumGothic Coding Hangul font LICENSE= OFL11 -BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ +BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes @@ -22,15 +22,11 @@ USE_ZIP= yes FONTSDIR= lib/X11/fonts/nanum-coding${PKGNAMESUFFIX} FONTLIST= NanumGothicCoding \ NanumGothicCoding-Bold +FONTFILES= ${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale PLIST_DIRS= ${FONTSDIR} -.for f in ${FONTLIST} -PLIST_FILES+= ${FONTSDIR}/${f}.ttf -.endfor -PLIST_FILES+= ${FONTSDIR}/fonts.dir \ - ${FONTSDIR}/fonts.scale +PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|} -NO_STAGE= yes post-extract: @# XXX File names are encoded in EUC-KR. ${MV} ${WRKSRC}/*-Bold.ttf ${WRKSRC}/NanumGothicCoding-Bold.tmp @@ -42,16 +38,11 @@ do-build: ${LOCALBASE}/bin/mkfontdir ${WRKSRC} do-install: - ${MKDIR} ${PREFIX}/${FONTSDIR} -.for f in ${FONTLIST} - ${INSTALL_DATA} ${WRKSRC}/${f}.ttf ${PREFIX}/${FONTSDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR} post-install: @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} - @-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null .include Modified: head/korean/nanumfonts-otf/Makefile ============================================================================== --- head/korean/nanumfonts-otf/Makefile Wed Jan 8 00:06:46 2014 (r339058) +++ head/korean/nanumfonts-otf/Makefile Wed Jan 8 00:06:49 2014 (r339059) @@ -17,7 +17,7 @@ COMMENT= Nanum family Hangul fonts (${FO LICENSE= OFL11 -BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ +BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale DISTINFO_FILE= ${PKGDIR}/distinfo.${FONTTYPE} @@ -44,30 +44,21 @@ FONTLIST= NanumBrush \ NanumMyeongjoEcoExtraBold \ NanumMyeongjoExtraBold \ NanumPen +FONTFILES= ${FONTLIST:S/$/.${FONTTYPE}/} fonts.dir fonts.scale PLIST_DIRS= ${FONTSDIR} -.for f in ${FONTLIST} -PLIST_FILES+= ${FONTSDIR}/${f}.${FONTTYPE} -.endfor -PLIST_FILES+= ${FONTSDIR}/fonts.dir \ - ${FONTSDIR}/fonts.scale +PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|} -NO_STAGE= yes do-build: ${LOCALBASE}/bin/mkfontscale ${WRKSRC} ${LOCALBASE}/bin/mkfontdir ${WRKSRC} do-install: - ${MKDIR} ${PREFIX}/${FONTSDIR} -.for f in ${FONTLIST} - ${INSTALL_DATA} ${WRKSRC}/${f}.${FONTTYPE} ${PREFIX}/${FONTSDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR} post-install: @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} - @-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null .include Modified: head/korean/nanumfonts-ttf/Makefile ============================================================================== --- head/korean/nanumfonts-ttf/Makefile Wed Jan 8 00:06:46 2014 (r339058) +++ head/korean/nanumfonts-ttf/Makefile Wed Jan 8 00:06:49 2014 (r339059) @@ -5,5 +5,4 @@ MASTERDIR= ${.CURDIR}/../nanumfonts-otf FONTTYPE= ttf FONTFORMAT= TrueType -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/korean/unfonts-core/Makefile ============================================================================== --- head/korean/unfonts-core/Makefile Wed Jan 8 00:06:46 2014 (r339058) +++ head/korean/unfonts-core/Makefile Wed Jan 8 00:06:49 2014 (r339059) @@ -14,7 +14,7 @@ COMMENT= GPL'd Korean TrueType Fonts by LICENSE= GPLv2 LICENSE_FILE= ${FILESDIR}/COPYING -BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ +BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale DISTINFO_FILE= ${PKGDIR}/distinfo.${FONTCAT}-ttf @@ -34,30 +34,18 @@ FONTLIST?= UnBatang \ UnGungseo \ UnPilgi \ UnPilgiBold +FONTFILES= ${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale -PLIST_DIRS= ${FONTSDIR} -.for f in ${FONTLIST} -PLIST_FILES+= ${FONTSDIR}/${f}.ttf -.endfor -PLIST_FILES+= ${FONTSDIR}/fonts.dir \ - ${FONTSDIR}/fonts.scale - -NO_STAGE= yes do-build: ${LOCALBASE}/bin/mkfontscale ${WRKSRC} ${LOCALBASE}/bin/mkfontdir ${WRKSRC} do-install: - ${MKDIR} ${PREFIX}/${FONTSDIR} -.for f in ${FONTLIST} - ${INSTALL_DATA} ${WRKSRC}/${f}.ttf ${PREFIX}/${FONTSDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR} + ${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR} post-install: @${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} - @-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null .include Modified: head/korean/unfonts-extra/Makefile ============================================================================== --- head/korean/unfonts-extra/Makefile Wed Jan 8 00:06:46 2014 (r339058) +++ head/korean/unfonts-extra/Makefile Wed Jan 8 00:06:49 2014 (r339059) @@ -18,5 +18,4 @@ FONTLIST= UnJamoBatang \ MASTERDIR= ${.CURDIR}/../unfonts-core -NO_STAGE= yes .include "${MASTERDIR}/Makefile"