Date: Wed, 16 Oct 2013 04:56:32 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330478 - in head/japanese: font-ipa font-ipa-uigothic font-ipaex font-jisx0213 font-jisx0213/files font-kochi font-migmix font-migu font-mona-ipa font-motoya-al font-mplus font-mplus-i... Message-ID: <201310160456.r9G4uW6v061771@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Wed Oct 16 04:56:32 2013 New Revision: 330478 URL: http://svnweb.freebsd.org/changeset/ports/330478 Log: - Add STAGEDIR support. - Update to 20130617 (japanese/font-migmix) - Update to 456 (japanese/font-ume) Modified: head/japanese/font-ipa-uigothic/Makefile head/japanese/font-ipa/Makefile head/japanese/font-ipaex/Makefile head/japanese/font-jisx0213/Makefile head/japanese/font-jisx0213/files/Makefile.in head/japanese/font-jisx0213/pkg-plist head/japanese/font-kochi/Makefile head/japanese/font-migmix/Makefile head/japanese/font-migmix/distinfo head/japanese/font-migu/Makefile head/japanese/font-mona-ipa/Makefile head/japanese/font-motoya-al/Makefile head/japanese/font-mplus-ipa/Makefile head/japanese/font-mplus/Makefile head/japanese/font-sazanami/Makefile head/japanese/font-shinonome/Makefile head/japanese/font-std/Makefile head/japanese/font-takao/Makefile head/japanese/font-ume/Makefile head/japanese/font-ume/distinfo head/japanese/font-vlgothic/Makefile Modified: head/japanese/font-ipa-uigothic/Makefile ============================================================================== --- head/japanese/font-ipa-uigothic/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-ipa-uigothic/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -33,34 +33,32 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/ipagui.ttf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/ipagui.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/ipagui.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/ipagui.ttf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipagui.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipagui.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -post-install: - ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> Modified: head/japanese/font-ipa/Makefile ============================================================================== --- head/japanese/font-ipa/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-ipa/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -32,37 +32,35 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-extract: cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.otf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF - ${LN} -s -f \ - ${DATADIR}/ipa*.otf \ - ${PREFIX}/${LOCAL_FONTSDIR}/OTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/OTF - ${LN} -s -f \ - ${DATADIR}/ipa*.otf \ - ${PREFIX}/${X_FONTSDIR}/OTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipa*.otf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF/ && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipa*.otf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -post-install: - ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/OTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> Modified: head/japanese/font-ipaex/Makefile ============================================================================== --- head/japanese/font-ipaex/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-ipaex/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -30,37 +30,35 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-extract: cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.otf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF - ${LN} -s -f \ - ${DATADIR}/ipaex*.otf \ - ${PREFIX}/${LOCAL_FONTSDIR}/OTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/OTF - ${LN} -s -f \ - ${DATADIR}/ipaex*.otf \ - ${PREFIX}/${X_FONTSDIR}/OTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF/ && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipaex*.otf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF/ && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/ipaex*.otf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -post-install: - ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/OTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> Modified: head/japanese/font-jisx0213/Makefile ============================================================================== --- head/japanese/font-jisx0213/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-jisx0213/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -26,7 +26,7 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= > ${WRKDIR}/$${file%.gz} -MAKE_ENV= FONTDIR=${LOCALFONTDIR} +MAKE_ENV= STAGEDIR=${STAGEDIR} FONTDIR=${LOCALFONTDIR} PLIST_SUB= FONTDIR=${LOCALFONTDIR} XFONTDIR=lib/X11/fonts/${FONTDIR} SUB_FILES= Makefile @@ -34,16 +34,15 @@ LOCALFONTDIR= share/font-${PORTNAME} pre-build: apply-slist -NO_STAGE= yes do-configure: @${DO_NADA} post-install-fontdir: - ${MKDIR} ${PREFIX}/lib/X11/fonts/${FONTDIR} - cd ${PREFIX}/lib/X11/fonts/${FONTDIR} && \ - ${LN} -s -f ${PREFIX}/${LOCALFONTDIR}/*.pcf.gz . - ${LOCALBASE}/bin/mkfontscale ${PREFIX}/lib/X11/fonts/${FONTDIR} - ${LOCALBASE}/bin/mkfontdir ${PREFIX}/lib/X11/fonts/${FONTDIR} + ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/X11/fonts/${FONTDIR} + cd ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR} && ${LN} -s -f \ + ${FONTDIR:C,[^/]+,..,g}/../../../${LOCALFONTDIR}/*.pcf.gz . + ${LOCALBASE}/bin/mkfontscale ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR} + ${LOCALBASE}/bin/mkfontdir ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR} post-install: post-install-fontdir Modified: head/japanese/font-jisx0213/files/Makefile.in ============================================================================== --- head/japanese/font-jisx0213/files/Makefile.in Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-jisx0213/files/Makefile.in Wed Oct 16 04:56:32 2013 (r330478) @@ -2,6 +2,9 @@ .SUFFIXES: .SUFFIXES: .bdf .pcf +.if defined(STAGEDIR) && !empty(STAGEDIR) +PREFIX:= ${STAGEDIR}${PREFIX} +.endif LOCALBASE?= /usr/local GZIP_CMD?= /usr/bin/gzip MKBOLD_CMD?= ${LOCALBASE}/bin/mkbold Modified: head/japanese/font-jisx0213/pkg-plist ============================================================================== --- head/japanese/font-jisx0213/pkg-plist Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-jisx0213/pkg-plist Wed Oct 16 04:56:32 2013 (r330478) @@ -80,3 +80,5 @@ %%XFONTDIR%%/jiskan24-2000-2b.pcf.gz %%XFONTDIR%%/jiskan24-2000-2bi.pcf.gz %%XFONTDIR%%/jiskan24-2000-2i.pcf.gz +%%XFONTDIR%%/fonts.dir +%%XFONTDIR%%/fonts.scale Modified: head/japanese/font-kochi/Makefile ============================================================================== --- head/japanese/font-kochi/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-kochi/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -33,32 +33,32 @@ PORTDOCS= README.ja COPYING docs OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${LN} -s -f \ - ${DATADIR}/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -post-install: - ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> Modified: head/japanese/font-migmix/Makefile ============================================================================== --- head/japanese/font-migmix/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-migmix/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= migmix -PORTVERSION= 1.0.20130430 -PORTREVISION= 1 +PORTVERSION= 1.0.20130617 CATEGORIES= japanese x11-fonts -MASTER_SITES= SFJP/mix-mplus-ipa/58721 +MASTER_SITES= SFJP/mix-mplus-ipa/59021 PKGNAMEPREFIX= ja-font- DISTFILES= ${PORTNAME}-1m-${PORTVERSION:E}${EXTRACT_SUFX} \ ${PORTNAME}-2m-${PORTVERSION:E}${EXTRACT_SUFX} \ @@ -32,41 +31,41 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: cd ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/ && \ - ${INSTALL_DATA} ipag00303/*.txt \ - migmix-README.txt \ - ${WRKDIR} - ${MKDIR} ${DATADIR} + ${INSTALL_DATA} ipag00303/*.txt \ + migmix-README.txt \ + ${WRKDIR} + ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} \ - ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \ - ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \ - ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \ - ${WRKDIR}/${PORTNAME}-2p-${PORTVERSION:E}/*.ttf \ - ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/migmix*.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/migmix*.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ + ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \ + ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \ + ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \ + ${WRKDIR}/${PORTNAME}-2p-${PORTVERSION:E}/*.ttf \ + ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migmix*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migmix*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -post-install: - ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> Modified: head/japanese/font-migmix/distinfo ============================================================================== --- head/japanese/font-migmix/distinfo Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-migmix/distinfo Wed Oct 16 04:56:32 2013 (r330478) @@ -1,8 +1,8 @@ -SHA256 (migmix-1m-20130430.zip) = 8371ad7d2c4cd4af2fe7df30645c06dc073a5d31cfd730777fdb45f26272b594 -SIZE (migmix-1m-20130430.zip) = 4269390 -SHA256 (migmix-2m-20130430.zip) = fcee3ef2781e82637fc412a7c1678140f4cd30401a0ebf7eb71e0903af2c9d38 -SIZE (migmix-2m-20130430.zip) = 4267709 -SHA256 (migmix-1p-20130430.zip) = a9913aebad7f7ed6326749cefa5f73a26c59fc3ecd7b744eef15e1ce3d35a5c7 -SIZE (migmix-1p-20130430.zip) = 4372856 -SHA256 (migmix-2p-20130430.zip) = 3aadef411cb9d993b294907b671806fb567a8a6d278a9fb5735295e30d3fae3f -SIZE (migmix-2p-20130430.zip) = 4373751 +SHA256 (migmix-1m-20130617.zip) = c136e13059aa5ad071c1f88033b45bf86c8f1dda003ac7b6077b4c17c6d9532b +SIZE (migmix-1m-20130617.zip) = 4259978 +SHA256 (migmix-2m-20130617.zip) = 0a28eb6ec58e35399332b7b8d0b1f6298e36ec1830d65fb4ab83a036e7e13b08 +SIZE (migmix-2m-20130617.zip) = 4258188 +SHA256 (migmix-1p-20130617.zip) = 13d131ecc295823bace9e4d53a689ae26f21f18335a004c1a3d987a273467833 +SIZE (migmix-1p-20130617.zip) = 4363373 +SHA256 (migmix-2p-20130617.zip) = 639bf85bca573d6d3be5487c8612dac88586d37c823ddb002584f59dcf7f3aa8 +SIZE (migmix-2p-20130617.zip) = 4363986 Modified: head/japanese/font-migu/Makefile ============================================================================== --- head/japanese/font-migu/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-migu/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -33,41 +33,41 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: cd ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/ && \ - ${INSTALL_DATA} ipag00303/*.txt \ - ${PORTNAME}-README.txt \ - ${WRKDIR} - ${MKDIR} ${DATADIR} + ${INSTALL_DATA} ipag00303/*.txt \ + ${PORTNAME}-README.txt \ + ${WRKDIR} + ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} \ - ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \ - ${WRKDIR}/${PORTNAME}-1c-${PORTVERSION:E}/*.ttf \ - ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \ - ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \ - ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/migu*.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/migu*.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ + ${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \ + ${WRKDIR}/${PORTNAME}-1c-${PORTVERSION:E}/*.ttf \ + ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \ + ${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \ + ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migu*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/migu*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -post-install: - ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> Modified: head/japanese/font-mona-ipa/Makefile ============================================================================== --- head/japanese/font-mona-ipa/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-mona-ipa/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -28,37 +28,34 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC} - ${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 0555 - ${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 0444 - ${CP} -R ${WRKSRC}/* ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${LN} -s -f \ - ${DATADIR}/fonts/ipa*-mona.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/fonts/ipa*-mona.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/ipa*-mona.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF/ && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/ipa*-mona.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -post-install: - ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if ${PORT_OPTIONS:MDOCS} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif + .include <bsd.port.mk> Modified: head/japanese/font-motoya-al/Makefile ============================================================================== --- head/japanese/font-motoya-al/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-motoya-al/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -28,34 +28,34 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/MTL*.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/MTL*.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/MTL*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/MTL*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-motoya-al.conf \ - ${FILESDIR}/62-fonts-motoya-al.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-motoya-al.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-motoya-al.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-motoya-al.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-motoya-al.conf ${LN} -s -f ../conf.avail/62-fonts-motoya-al.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-motoya-al.conf -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-motoya-al.conf -post-install: - ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if ${PORT_OPTIONS:MDOCS} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif + .include <bsd.port.mk> Modified: head/japanese/font-mplus-ipa/Makefile ============================================================================== --- head/japanese/font-mplus-ipa/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-mplus-ipa/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -33,34 +33,35 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC} - ${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \ - ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/fonts/M+*.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/fonts/M+*.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus && \ + ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/M+*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/fonts/M+*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -post-install: - ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if ${PORT_OPTIONS:MDOCS} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif + .include <bsd.port.mk> Modified: head/japanese/font-mplus/Makefile ============================================================================== --- head/japanese/font-mplus/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-mplus/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -40,52 +40,60 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-extract: cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \ - ${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \ - fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias + ${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \ + fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias -pre-su-install: - ${MKDIR} ${DATADIR}/TTF ${DATADIR}/bitmap +pre-install: + ${MKDIR} ${STAGEDIR}${DATADIR}/TTF ${STAGEDIR}${DATADIR}/bitmap do-install: do-install-bitmap do-install-outline do-install-bitmap: cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \ - ${SETENV} DESTDIR="${DATADIR}/bitmap" \ - ${SH} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/install_mplus_fonts - ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${DATADIR}/bitmap - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/mplus - ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME}/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc - ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${X_FONTSDIR}/misc/ + ${SETENV} DESTDIR="${STAGEDIR}${DATADIR}/bitmap" \ + ${SH} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/install_mplus_fonts + ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR}/bitmap + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME} + cd ${STAGEDIR}/${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME} && \ + ${LN} -s -f ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/bitmap/*.pcf.gz . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc && \ + ${LN} -s -f ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/bitmap/*.pcf.gz . do-install-outline: - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/*.ttf ${DATADIR}/TTF - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/*.ttf \ + ${STAGEDIR}${DATADIR}/TTF + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/TTF/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/TTF/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -post-install: +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} for F in ${PORTDOCS:M*.bitmap:S,.bitmap$,,}; do \ - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/$${F} ${DOCSDIR}/$${F}.bitmap; \ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.bitmap; \ done for F in ${PORTDOCS:M*.outline:S,.outline$,,}; do \ - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/$${F} ${DOCSDIR}/$${F}.outline; \ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/$${F} ${STAGEDIR}${DOCSDIR}/$${F}.outline; \ done .endif Modified: head/japanese/font-sazanami/Makefile ============================================================================== --- head/japanese/font-sazanami/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-sazanami/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -28,32 +28,34 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -post-install: - ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if ${PORT_OPTIONS:MDOCS} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif + .include <bsd.port.mk> Modified: head/japanese/font-shinonome/Makefile ============================================================================== --- head/japanese/font-shinonome/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-shinonome/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -1,11 +1,12 @@ # Created by: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp> # $FreeBSD$ -PORTNAME= font-shinonome +PORTNAME= shinonome PORTVERSION= 0.9.11.p1 CATEGORIES= japanese x11-fonts MASTER_SITES= http://openlab.jp/efont/dist/shinonome/%SUBDIR%/ MASTER_SITE_SUBDIR= . old +PKGNAMEPREFIX= ja-font- DISTNAME= ${PORTNAME:C/^font-//}-${PORTVERSION:C/.p/p/} MAINTAINER= hrs@FreeBSD.org @@ -19,6 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME:C/^font-// USE_BZIP2= yes PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \ LOCAL_FONTSDIR=${LOCAL_FONTSDIR} +DATADIR= ${PREFIX}/share/font-${PORTNAME} SUB_FILES= pkg-install SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \ FONTSALIAS=${DATADIR}/fonts.alias @@ -51,7 +53,6 @@ FONTNAMES=\ OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-build: @@ -63,18 +64,23 @@ do-build: @${ECHO_CMD} "Done" do-install: - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/shinonome - ${LN} -s -f ${DATADIR}/*.pcf.gz ${PREFIX}/${LOCAL_FONTSDIR}/shinonome/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc - ${LN} -s -f ${DATADIR}/*.pcf.gz ${PREFIX}/${X_FONTSDIR}/misc/ + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${FONTNAMES:C/$/.pcf.gz/} fonts.alias \ + ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/shinonome + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/shinonome && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.pcf.gz . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/misc && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.pcf.gz . -post-install: +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/japanese/font-std/Makefile ============================================================================== --- head/japanese/font-std/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-std/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -31,14 +31,13 @@ STD_GothicBBB-Medium= ${LOCALBASE}/share STD_Ryumin-Light.gs7= ${LOCALBASE}/share/font-mplus-ipa/fonts/ipam.ttf STD_GothicBBB-Medium.gs7= ${LOCALBASE}/share/font-mplus-ipa/fonts/ipag.ttf -NO_STAGE= yes do-fetch: @${DO_NADA} do-install: - ${MKDIR} ${PREFIX}/${FONTSDIR}/std.ja_JP + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}/std.ja_JP .for F in ${STD} - ${LN} -s -f ${STD_${F}} ${PREFIX}/${FONTSDIR}/std.ja_JP/${F} + ${LN} -s -f ${STD_${F}} ${STAGEDIR}${PREFIX}/${FONTSDIR}/std.ja_JP/${F} .endfor .include <bsd.port.mk> Modified: head/japanese/font-takao/Makefile ============================================================================== --- head/japanese/font-takao/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-takao/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -31,37 +31,37 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-extract: cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.otf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/OTF - ${LN} -s -f \ - ${DATADIR}/Takao*.otf \ - ${PREFIX}/${LOCAL_FONTSDIR}/OTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/OTF - ${LN} -s -f \ - ${DATADIR}/Takao*.otf \ - ${PREFIX}/${X_FONTSDIR}/OTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Takao*.otf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Takao*.otf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -post-install: - ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/OTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if ${PORT_OPTIONS:MDOCS} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif + .include <bsd.port.mk> Modified: head/japanese/font-ume/Makefile ============================================================================== --- head/japanese/font-ume/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-ume/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ume -PORTVERSION= 0.0.455 +PORTVERSION= 0.0.456 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ${PORTNAME}-font/22212 @@ -29,32 +29,34 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/*.ttf . + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.avail + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf -post-install: - ${LOCALBASE}/bin/fc-cache -s -f -v ${PREFIX}/${X_FONTSDIR}/TTF +post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if ${PORT_OPTIONS:MDOCS} +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif + .include <bsd.port.mk> Modified: head/japanese/font-ume/distinfo ============================================================================== --- head/japanese/font-ume/distinfo Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-ume/distinfo Wed Oct 16 04:56:32 2013 (r330478) @@ -1,2 +1,2 @@ -SHA256 (umefont_455.tar.xz) = 73f9adb3c56188f28590f6f986c8ce2ad31d80dbe78ba8db2efe88cd7e7103ed -SIZE (umefont_455.tar.xz) = 5615972 +SHA256 (umefont_456.tar.xz) = 1c23c0a5f598ac914c1705bf2e169c44b3faf6899e6bf29e3b8a1d991fa4ab0c +SIZE (umefont_456.tar.xz) = 5560208 Modified: head/japanese/font-vlgothic/Makefile ============================================================================== --- head/japanese/font-vlgothic/Makefile Wed Oct 16 03:29:08 2013 (r330477) +++ head/japanese/font-vlgothic/Makefile Wed Oct 16 04:56:32 2013 (r330478) @@ -31,32 +31,34 @@ X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DATADIR} - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/*.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f ${DATADIR}/*.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310160456.r9G4uW6v061771>