From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 21 14:20:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 AE034519 for ; Wed, 21 May 2014 14:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 6E9CA2B84 for ; Wed, 21 May 2014 14:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LEK0xD067000 for ; Wed, 21 May 2014 14:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4LEK0wZ066998; Wed, 21 May 2014 14:20:00 GMT (envelope-from gnats) Resent-Date: Wed, 21 May 2014 14:20:00 GMT Resent-Message-Id: <201405211420.s4LEK0wZ066998@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, WATANABE Kazuhiro 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 B75E5363 for ; Wed, 21 May 2014 14:10:47 +0000 (UTC) Received: from condef010-v.nifty.com (condef010-v.nifty.com [210.131.4.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4387C2B19 for ; Wed, 21 May 2014 14:10:47 +0000 (UTC) Received: from mxg307.nifty.com ([10.22.240.251])by condef010-v.nifty.com with ESMTP id s4LE4aMe019244 for ; Wed, 21 May 2014 23:04:36 +0900 Received: from nifty.com (localhost [127.0.0.1]) (authenticated) by mxg307.nifty.com with ESMTP id s4LE4BlR020352 for ; Wed, 21 May 2014 23:04:11 +0900 Message-Id: <201405211404.s4LE4BlR020352@mxg307.nifty.com> Date: Wed, 21 May 2014 23:00:01 +0900 From: WATANABE Kazuhiro Reply-To: WATANABE Kazuhiro To: FreeBSD-gnats-submit@freebsd.org Subject: ports/190072: [patch] japanese/marumoji-fonts: Remove use of pkg-req and add staging support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 14:20:00 -0000 >Number: 190072 >Category: ports >Synopsis: [patch] japanese/marumoji-fonts: Remove use of pkg-req and add staging support >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 21 14:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Watanabe Kazuhiro >Release: FreeBSD 9.1-RELEASE-p13 amd64 >Organization: >Environment: System: FreeBSD aquarius-vm.sign.local 9.1-RELEASE-p13 FreeBSD 9.1-RELEASE-p13 #11 r266219M: Fri May 16 23:32:02 JST 2014 root@aquarius-vm:/FreeBSD/obj/amd64/releng_9.1/FreeBSD/releng_9.1/src/sys/GENERIC amd64 I've tested the patch with pkg-1.2.7_2. >Description: * Use pkg-install/pkg-deinstall scripts instead of pkg-req. * Add staging support. * Remove an verbose dependency from RUN_DEPENDS. * Remove fonts.alias update command (@unexec) from pkg-plist. It's done by pkg-deinstall. * Remove fonts.alias from pkg-plist. It's handled by pkg-install/pkg-deinstall. These modification are derived from japanese/elisa8x8. Thanks! >How-To-Repeat: >Fix: diff -urN marumoji-fonts.orig/Makefile marumoji-fonts/Makefile --- marumoji-fonts.orig/Makefile 2013-09-21 03:47:54.000000000 +0900 +++ marumoji-fonts/Makefile 2014-05-21 21:45:24.000000000 +0900 @@ -19,15 +19,11 @@ 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 - EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= ${WRKDIR} @@ -43,13 +39,9 @@ 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 +.include diff -urN marumoji-fonts.orig/files/Makefile.in marumoji-fonts/files/Makefile.in --- marumoji-fonts.orig/files/Makefile.in 2014-01-23 02:00:46.000000000 +0900 +++ marumoji-fonts/files/Makefile.in 2014-05-21 20:58:52.000000000 +0900 @@ -29,8 +29,8 @@ 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} diff -urN marumoji-fonts.orig/pkg-deinstall marumoji-fonts/pkg-deinstall --- marumoji-fonts.orig/pkg-deinstall 1970-01-01 09:00:00.000000000 +0900 +++ marumoji-fonts/pkg-deinstall 2014-05-21 20:58:52.000000000 +0900 @@ -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 diff -urN marumoji-fonts.orig/pkg-install marumoji-fonts/pkg-install --- marumoji-fonts.orig/pkg-install 1970-01-01 09:00:00.000000000 +0900 +++ marumoji-fonts/pkg-install 2014-05-21 20:58:52.000000000 +0900 @@ -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 diff -urN marumoji-fonts.orig/pkg-plist marumoji-fonts/pkg-plist --- marumoji-fonts.orig/pkg-plist 2013-06-14 12:22:02.000000000 +0900 +++ marumoji-fonts/pkg-plist 2014-05-21 21:45:54.000000000 +0900 @@ -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%% diff -urN marumoji-fonts.orig/pkg-req marumoji-fonts/pkg-req --- marumoji-fonts.orig/pkg-req 2014-01-23 00:52:06.000000000 +0900 +++ marumoji-fonts/pkg-req 1970-01-01 09:00:00.000000000 +0900 @@ -1,66 +0,0 @@ -#!/bin/sh - -if [ "x$1" = "x" ]; then - exit 1; -fi -if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then - exit 1; -fi - -export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local - -if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then - echo '**********************************************************************' - echo "****** ${FONTDIR}/ doesn't exist." - echo "****** Creating ${FONTDIR}/" - echo '****** Please upgrade your XFree86 to 3.3.3 or upper,' - echo "****** or add this directory to your /etc/XF86Config's FontPath entry." - echo '**********************************************************************' - mkdir ${FONTDIR} -fi - -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 -if [ "$2" = "INSTALL" ] ; then - (grepv ${TMPFILE} fonts.alias.orig ; \ - cat ${TMPFILE}) > fonts.alias -elif [ "$2" = "DEINSTALL" ] ; then - grepv ${TMPFILE} fonts.alias.orig > 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; >Release-Note: >Audit-Trail: >Unformatted: