Date: Sun, 27 Jul 2014 12:52:22 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363059 - in head/japanese/marumoji-fonts: . files Message-ID: <201407271252.s6RCqMSQ091861@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Jul 27 12:52:21 2014 New Revision: 363059 URL: http://svnweb.freebsd.org/changeset/ports/363059 QAT: https://qat.redports.org/buildarchive/r363059/ Log: Stage japanese/marumoji-fonts * Use pkg-install / pkg-deinstall instead of pkg-req * Adjust pkg-plist accordingly * Adjust RUN_DEPENDS accordingly PR: 190072 Submitted by: COG00620 (nifty.ne.jp) Added: head/japanese/marumoji-fonts/pkg-deinstall (contents, props changed) head/japanese/marumoji-fonts/pkg-install (contents, props changed) Deleted: head/japanese/marumoji-fonts/pkg-req Modified: head/japanese/marumoji-fonts/Makefile head/japanese/marumoji-fonts/files/Makefile.in head/japanese/marumoji-fonts/pkg-plist Modified: head/japanese/marumoji-fonts/Makefile ============================================================================== --- head/japanese/marumoji-fonts/Makefile Sun Jul 27 12:50:26 2014 (r363058) +++ head/japanese/marumoji-fonts/Makefile Sun Jul 27 12:52:21 2014 (r363059) @@ -3,7 +3,7 @@ PORTNAME= marumoji-fonts PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= yoichi @@ -19,15 +19,11 @@ COMMENT= Japanese marumoji fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir NO_WRKSUBDIR= yes FONTSDIR= lib/X11/fonts/local -NO_STAGE= yes -.include <bsd.port.pre.mk> - EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= ${WRKDIR} @@ -43,13 +39,9 @@ post-extract: pre-build: @(cd ${WRKDIR}; ${SED} -f m18to16.sed < maru18.bdf > maru16.bdf) -pre-su-install: - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: - @(cd ${PREFIX}/${FONTSDIR}; mkfontdir) - ${MKDIR} ${PREFIX}/share/doc/marumoji-fonts - ${INSTALL_DATA} ${FILESDIR}/LICENSE ${PREFIX}/share/doc/marumoji-fonts + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/LICENSE ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/japanese/marumoji-fonts/files/Makefile.in ============================================================================== --- head/japanese/marumoji-fonts/files/Makefile.in Sun Jul 27 12:50:26 2014 (r363058) +++ head/japanese/marumoji-fonts/files/Makefile.in Sun Jul 27 12:52:21 2014 (r363059) @@ -29,8 +29,8 @@ ${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/} bdftopcf $> | ${GZIP_CMD} -c > $@ install: - mkdir -p ${PREFIX}/${FONTSDIR} - ${BSD_INSTALL_DATA} ${PCF_ALL} ${PREFIX}/${FONTSDIR} + mkdir -p ${DESTDIR}${PREFIX}/${FONTSDIR} + ${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}${PREFIX}/${FONTSDIR} clean:: rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL} Added: head/japanese/marumoji-fonts/pkg-deinstall ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/marumoji-fonts/pkg-deinstall Sun Jul 27 12:52:21 2014 (r363059) @@ -0,0 +1,49 @@ +#!/bin/sh + +if [ "$2" != "DEINSTALL" ]; then + exit 0 +fi + +FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local + +grepv() { + awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 +} + +# font alias entry here! +TMPFILE=/tmp/install-fonts-alias-$$ +cat << EOF > ${TMPFILE} +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 +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 +-misc-marumoji-medium-r-normal--14-100-100-100-c-70-iso8859-1 -misc-marumoji-medium-r-normal--14-130-75-75-c-70-iso8859-1 +-misc-marumoji-medium-r-normal--14-100-100-100-c-70-jisx0201.1976-0 -misc-marumoji-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 +-misc-marumoji-medium-r-normal--14-100-100-100-c-140-jisx0208.1983-0 -misc-marumoji-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 +-misc-marumoji-medium-r-normal--16-120-100-100-c-80-iso8859-1 -misc-marumoji-medium-r-normal--16-150-75-75-c-80-iso8859-1 +-misc-marumoji-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 -misc-marumoji-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 +-misc-marumoji-medium-r-normal--16-120-100-100-c-160-jisx0208.1983-0 -misc-marumoji-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 +-misc-marumoji-medium-r-normal--18-130-100-100-c-90-iso8859-1 -misc-marumoji-medium-r-normal--18-170-75-75-c-90-iso8859-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 > fonts.alias +if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi +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 "**********************************************************" + +exit 0 Added: head/japanese/marumoji-fonts/pkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/marumoji-fonts/pkg-install Sun Jul 27 12:52:21 2014 (r363059) @@ -0,0 +1,48 @@ +#!/bin/sh + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local + +grepv() { + awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 +} + +# font alias entry here! +TMPFILE=/tmp/install-fonts-alias-$$ +cat << EOF > ${TMPFILE} +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 +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 +-misc-marumoji-medium-r-normal--14-100-100-100-c-70-iso8859-1 -misc-marumoji-medium-r-normal--14-130-75-75-c-70-iso8859-1 +-misc-marumoji-medium-r-normal--14-100-100-100-c-70-jisx0201.1976-0 -misc-marumoji-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 +-misc-marumoji-medium-r-normal--14-100-100-100-c-140-jisx0208.1983-0 -misc-marumoji-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 +-misc-marumoji-medium-r-normal--16-120-100-100-c-80-iso8859-1 -misc-marumoji-medium-r-normal--16-150-75-75-c-80-iso8859-1 +-misc-marumoji-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 -misc-marumoji-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 +-misc-marumoji-medium-r-normal--16-120-100-100-c-160-jisx0208.1983-0 -misc-marumoji-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 +-misc-marumoji-medium-r-normal--18-130-100-100-c-90-iso8859-1 -misc-marumoji-medium-r-normal--18-170-75-75-c-90-iso8859-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 "**********************************************************" + +exit 0 Modified: head/japanese/marumoji-fonts/pkg-plist ============================================================================== --- head/japanese/marumoji-fonts/pkg-plist Sun Jul 27 12:50:26 2014 (r363058) +++ head/japanese/marumoji-fonts/pkg-plist Sun Jul 27 12:52:21 2014 (r363059) @@ -1,4 +1,3 @@ -%%FONTSDIR%%/fonts.alias %%FONTSDIR%%/7x14maru.pcf.gz %%FONTSDIR%%/7x14marub.pcf.gz %%FONTSDIR%%/7x14marubi.pcf.gz @@ -35,9 +34,8 @@ %%FONTSDIR%%/maru18b.pcf.gz %%FONTSDIR%%/maru18bi.pcf.gz %%FONTSDIR%%/maru18i.pcf.gz -share/doc/marumoji-fonts/LICENSE -@dirrm share/doc/marumoji-fonts -@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir -@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir +%%DOCSDIR%%/LICENSE +@exec cd %D/%%FONTSDIR%% ; mkfontdir +@unexec cd %D/%%FONTSDIR%% ; mkfontdir @unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi -@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi +@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407271252.s6RCqMSQ091861>