Date: Sun, 13 Sep 2015 04:30:18 +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: r396798 - in head: . japanese japanese/font-marumoji japanese/font-marumoji/files japanese/marumoji-fonts Message-ID: <201509130430.t8D4UIOc030411@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Sep 13 04:30:17 2015 New Revision: 396798 URL: https://svnweb.freebsd.org/changeset/ports/396798 Log: - Rename japanese/marumoji-fonts with japanese/font-marumoji. - Add LICENSE. Added: head/japanese/font-marumoji/ - copied from r396796, head/japanese/marumoji-fonts/ head/japanese/font-marumoji/files/pkg-install.in - copied, changed from r396796, head/japanese/marumoji-fonts/pkg-install Deleted: head/japanese/font-marumoji/files/LICENSE head/japanese/font-marumoji/pkg-deinstall head/japanese/font-marumoji/pkg-install head/japanese/marumoji-fonts/ Modified: head/MOVED head/japanese/Makefile head/japanese/font-marumoji/Makefile head/japanese/font-marumoji/distinfo head/japanese/font-marumoji/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sun Sep 13 04:29:56 2015 (r396797) +++ head/MOVED Sun Sep 13 04:30:17 2015 (r396798) @@ -7865,3 +7865,4 @@ devel/cloudabi-compiler-rt||2015-09-12|M devel/cloudabi-libc++||2015-09-12|Moved to the CloudABI Ports Collection devel/cloudabi-libc++abi||2015-09-12|Moved to the CloudABI Ports Collection devel/cloudabi-libunwind||2015-09-12|Moved to the CloudABI Ports Collection +japanese/marumoji-fonts|japanese/font-marumoji|2015-09-13|Renamed Modified: head/japanese/Makefile ============================================================================== --- head/japanese/Makefile Sun Sep 13 04:29:56 2015 (r396797) +++ head/japanese/Makefile Sun Sep 13 04:30:17 2015 (r396798) @@ -68,6 +68,7 @@ SUBDIR += font-jisx0213 SUBDIR += font-kochi SUBDIR += font-koruri + SUBDIR += font-marumoji SUBDIR += font-migmix SUBDIR += font-migu SUBDIR += font-mona-ipa @@ -150,7 +151,6 @@ SUBDIR += mailman SUBDIR += man SUBDIR += man-doc - SUBDIR += marumoji-fonts SUBDIR += mecab SUBDIR += mecab-ipadic SUBDIR += mg Modified: head/japanese/font-marumoji/Makefile ============================================================================== --- head/japanese/marumoji-fonts/Makefile Sun Sep 13 04:13:26 2015 (r396796) +++ head/japanese/font-marumoji/Makefile Sun Sep 13 04:30:17 2015 (r396798) @@ -1,47 +1,33 @@ # Created by: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp> # $FreeBSD$ -PORTNAME= marumoji-fonts +PORTNAME= marumoji PORTVERSION= 1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese x11-fonts -MASTER_SITES= LOCAL/yoichi -DISTFILES= maru14.bdf.v13.gz maru18.bdf.v10.gz \ - m18to16.sed \ - 7x14maru.bdf.gz 7x14rkmr.bdf.gz \ - 8x16maru.bdf.gz 8x16rkmr.bdf.gz \ - 9x18maru.bdf.gz 9x18rkmr.bdf.gz -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= LOCAL/hrs/${PORTNAME} +PKGNAMEPREFIX= ja-font- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Japanese marumoji fonts +LICENSE= MIT +LICENSE_FILES= ${WRKSRC}/LICENSE + BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf USES= fonts -NO_WRKSUBDIR= yes FONTNAME= marumoji - -EXTRACT_CMD= ${CP} -EXTRACT_BEFORE_ARGS= -p -EXTRACT_AFTER_ARGS= ${WRKDIR} - MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,} +SUB_FILES= Makefile pkg-install +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install -OPTIONS_DEFINE= DOCS +${WRKSRC}/maru16.bdf: + cd ${WRKSRC} && ${SED} -f m18to16.sed < maru18.bdf > maru16.bdf -post-extract: - @${MV} ${WRKDIR}/maru14.bdf.v13.gz ${WRKDIR}/maru14.bdf.gz - @${MV} ${WRKDIR}/maru18.bdf.v10.gz ${WRKDIR}/maru18.bdf.gz - @${CP} ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile - @(cd ${WRKDIR}; ${GUNZIP_CMD} *.gz) - -pre-build: - @(cd ${WRKDIR}; ${SED} -f m18to16.sed < maru18.bdf > maru16.bdf) - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/LICENSE ${STAGEDIR}${DOCSDIR} +pre-build: ${WRKSRC}/maru16.bdf apply-slist + ${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC} .include <bsd.port.mk> Modified: head/japanese/font-marumoji/distinfo ============================================================================== --- head/japanese/marumoji-fonts/distinfo Sun Sep 13 04:13:26 2015 (r396796) +++ head/japanese/font-marumoji/distinfo Sun Sep 13 04:30:17 2015 (r396798) @@ -1,18 +1,2 @@ -SHA256 (marumoji-fonts/maru14.bdf.v13.gz) = 0895593347591ca5da1f2b9a88c7d65f828f7c6c4b6d58cedce204584bcad2ef -SIZE (marumoji-fonts/maru14.bdf.v13.gz) = 202507 -SHA256 (marumoji-fonts/maru18.bdf.v10.gz) = db0ae23d72da63ef8ac1d54af89d9b1b5ac3b20d39170440fb43df6587c12853 -SIZE (marumoji-fonts/maru18.bdf.v10.gz) = 239496 -SHA256 (marumoji-fonts/m18to16.sed) = e7c1550a0380db2c0330e3924e0916a0e3af790f2ba9986724d473a46b892d34 -SIZE (marumoji-fonts/m18to16.sed) = 678 -SHA256 (marumoji-fonts/7x14maru.bdf.gz) = 1da0e488c12bd02005b5a4a4e9b303add563f463d72a9519b81186ab74b3ca3f -SIZE (marumoji-fonts/7x14maru.bdf.gz) = 1987 -SHA256 (marumoji-fonts/7x14rkmr.bdf.gz) = d0a2fc67a1e9d333161b0c649b656406d032c1ceae678f9bae94318ec55e3633 -SIZE (marumoji-fonts/7x14rkmr.bdf.gz) = 3538 -SHA256 (marumoji-fonts/8x16maru.bdf.gz) = ad6bd8682062abf9b6bddf813657f65d34322c2fb17dfb5fa6e3767a59ac5885 -SIZE (marumoji-fonts/8x16maru.bdf.gz) = 3359 -SHA256 (marumoji-fonts/8x16rkmr.bdf.gz) = 4fa085ca4d1ba46a686d597bae122867b816213da34f3c0688615ea8e56e0432 -SIZE (marumoji-fonts/8x16rkmr.bdf.gz) = 3042 -SHA256 (marumoji-fonts/9x18maru.bdf.gz) = 3f9449c2083ada50c1f9557c3a2a094352bdd035e9343fa23056814fcd19bf23 -SIZE (marumoji-fonts/9x18maru.bdf.gz) = 3368 -SHA256 (marumoji-fonts/9x18rkmr.bdf.gz) = c20573e53336993052b2b3d9e290fb29385f8800f3a61b042a62d21cf6c8fa7b -SIZE (marumoji-fonts/9x18rkmr.bdf.gz) = 3049 +SHA256 (marumoji-1.0.tar.gz) = 458a5fb1a703a06b17e825ddd39b6d74d48fb6d718a8e228581d39751e84dd69 +SIZE (marumoji-1.0.tar.gz) = 455737 Copied and modified: head/japanese/font-marumoji/files/pkg-install.in (from r396796, head/japanese/marumoji-fonts/pkg-install) ============================================================================== --- head/japanese/marumoji-fonts/pkg-install Sun Sep 13 04:13:26 2015 (r396796, copy source) +++ head/japanese/font-marumoji/files/pkg-install.in Sun Sep 13 04:30:17 2015 (r396798) @@ -1,24 +1,25 @@ #!/bin/sh -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -FONTDIR=${PKG_PREFIX}/share/fonts/marumoji - -grepv() { - awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 +catfontsdir () +{ + while read _IN + do + case "${_IN}" in + [0-9]*|*-misc-marumoji-*) ;; + *) echo ${_IN} ;; + esac + done } +addentries() +{ # font alias entry here! -TMPFILE=/tmp/install-fonts-alias-$$ -cat << EOF > ${TMPFILE} +cat <<EOF maru14 -misc-marumoji-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 maru16 -misc-marumoji-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 maru18 -misc-marumoji-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0 7x14rkmaru -misc-marumoji-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 -7x14maru -misc-marumoji-medium-r-normal--14-130-75-75-c-70-iso8859-1 -8x16rkmr -misc-marumoji-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 +7x14maru -misc-marumoji-medium-r-normal--14-130-75-75-c-70-iso8859-1 8x16rkmr -misc-marumoji-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 8x16maru -misc-marumoji-medium-r-normal--16-150-75-75-c-80-iso8859-1 9x18rkmr -misc-marumoji-medium-r-normal--18-170-75-75-c-90-jisx0201.1976-0 9x18maru -misc-marumoji-medium-r-normal--18-170-75-75-c-90-iso8859-1 @@ -32,17 +33,30 @@ maru18 -misc-marumoji-medium-r-normal--1 -misc-marumoji-medium-r-normal--18-130-100-100-c-90-jisx0201.1976-0 -misc-marumoji-medium-r-normal--18-170-75-75-c-90-jisx0201.1976-0 -misc-marumoji-medium-r-normal--18-130-100-100-c-180-jisx0208.1983-0 -misc-marumoji-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0 EOF +} -echo "Updating ${FONTDIR}/fonts.alias" -cd ${FONTDIR} -touch fonts.alias -cp fonts.alias fonts.alias.orig -(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias -rm -f fonts.alias.orig ${TMPFILE} - -echo "**********************************************************" -echo "You should restart X server or do 'xset fp rehash' command" -echo "to enable this update." -echo "**********************************************************" +nfonts () +{ + _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L} +} -exit 0 +case $2 in +POST-INSTALL) + cd %%FONTSDIR%% + touch fonts.dir + (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp + nfonts < fonts.dir.tmp > fonts.dir + cat fonts.dir.tmp >> fonts.dir + rm -f fonts.dir.tmp +;; +DEINSTALL) + cd %%FONTSDIR%% + catfontsdir < fonts.dir > fonts.dir.tmp + nfonts < fonts.dir.tmp > fonts.dir + cat fonts.dir.tmp >> fonts.dir + rm -f fonts.dir.tmp + if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then + rm -f fonts.dir + fi +;; +esac Modified: head/japanese/font-marumoji/pkg-plist ============================================================================== --- head/japanese/marumoji-fonts/pkg-plist Sun Sep 13 04:13:26 2015 (r396796) +++ head/japanese/font-marumoji/pkg-plist Sun Sep 13 04:30:17 2015 (r396798) @@ -34,4 +34,3 @@ %%FONTSDIR%%/maru18b.pcf.gz %%FONTSDIR%%/maru18bi.pcf.gz %%FONTSDIR%%/maru18i.pcf.gz -%%PORTDOCS%%%%DOCSDIR%%/LICENSE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509130430.t8D4UIOc030411>