svn commit: r358781 - in head/japanese/monafonts: . files
MANTANI Nobutaka
nobutaka at FreeBSD.org
Sun Jun 22 10:11:40 UTC 2014
Author: nobutaka
Date: Sun Jun 22 10:11:38 2014
New Revision: 358781
URL: http://svnweb.freebsd.org/changeset/ports/358781
QAT: https://qat.redports.org/buildarchive/r358781/
Log:
* Use pkg-install/pkg-deinstall scripts instead of pkg-req.
* Add staging support.
* Remove an verbose dependency from RUN_DEPENDS and fix typo.
* Remove "MAKE_ARGS= PREFIX=${PREFIX}" from Makefile.
It's done by bsd.port.mk.
* Remove mkfontdir command from original Makefile.
It's done by pkg-plist.
* 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.
* Add a "@mode 444/@mode" pair to pkg-plist for appropriate file permission.
PR: 190073
Submitted by: CQG00620 at nifty.ne.jp
Added:
head/japanese/monafonts/pkg-deinstall (contents, props changed)
head/japanese/monafonts/pkg-install (contents, props changed)
Deleted:
head/japanese/monafonts/pkg-req
Modified:
head/japanese/monafonts/Makefile
head/japanese/monafonts/files/patch-aa
head/japanese/monafonts/pkg-plist
Modified: head/japanese/monafonts/Makefile
==============================================================================
--- head/japanese/monafonts/Makefile Sun Jun 22 09:52:35 2014 (r358780)
+++ head/japanese/monafonts/Makefile Sun Jun 22 10:11:38 2014 (r358781)
@@ -14,8 +14,7 @@ COMMENT= X11 12,14,16-dot Kanji fonts
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
USES= perl5
USE_PERL5= build
@@ -23,13 +22,7 @@ USE_PERL5= build
FONTSDIR= lib/X11/fonts/local
USE_BZIP2= yes
ALL_TARGET= bdf
-MAKE_ARGS= PREFIX=${PREFIX}
PLIST_SUB= FONTSDIR=${FONTSDIR}
-NO_STAGE= yes
-pre-install:
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
.include <bsd.port.mk>
Modified: head/japanese/monafonts/files/patch-aa
==============================================================================
--- head/japanese/monafonts/files/patch-aa Sun Jun 22 09:52:35 2014 (r358780)
+++ head/japanese/monafonts/files/patch-aa Sun Jun 22 10:11:38 2014 (r358781)
@@ -1,13 +1,26 @@
---- Makefile.orig Wed May 15 08:24:28 2002
-+++ Makefile Wed May 15 22:54:08 2002
-@@ -17,8 +17,8 @@
+--- Makefile.orig 2003-09-10 11:54:10.000000000 +0900
++++ Makefile 2014-05-08 22:35:25.000000000 +0900
+@@ -18,11 +18,10 @@
#GZIP_SUFFIX = Z
DESTDIR =
-X11BINDIR = /usr/X11R6/bin
-X11FONTDIR = $(DESTDIR)/usr/X11R6/lib/X11/fonts/local
-+X11BINDIR = $(PREFIX)/bin
-+X11FONTDIR = $(PREFIX)/lib/X11/fonts/local
- BDFTOPCF = $(X11BINDIR)/bdftopcf
- MKDIRHIER = $(X11BINDIR)/mkdirhier # 'mkdir -p' may also work.
- MKFONTDIR = $(X11BINDIR)/mkfontdir
+-BDFTOPCF = $(X11BINDIR)/bdftopcf
+-MKDIRHIER = $(X11BINDIR)/mkdirhier # 'mkdir -p' may also work.
+-MKFONTDIR = $(X11BINDIR)/mkfontdir
++X11FONTDIR = $(DESTDIR)$(PREFIX)/lib/X11/fonts/local
++BDFTOPCF = bdftopcf
++MKDIRHIER = mkdir -p # 'mkdir -p' may also work.
++MKFONTDIR = mkfontdir
+
+ MY_RPM_ROOT = /tmp/rpm-root
+
+@@ -258,7 +257,6 @@
+ $(BDFTOPCF) dist/$$i.bdf | \
+ $(GZIP_CMD) -c > $(X11FONTDIR)/$$i.pcf.$(GZIP_SUFFIX); \
+ done
+- $(MKFONTDIR) $(X11FONTDIR)
+
+ # append fonts.alias
+ install-alias:
Added: head/japanese/monafonts/pkg-deinstall
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/monafonts/pkg-deinstall Sun Jun 22 10:11:38 2014 (r358781)
@@ -0,0 +1,87 @@
+#!/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}
+mona6x12a -mona-gothic-medium-r-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aB -mona-gothic-bold-r-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aI -mona-gothic-medium-i-normal--12-110-75-75-p-60-iso8859-1
+mona6x12r -mona-gothic-medium-r-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rB -mona-gothic-bold-r-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rI -mona-gothic-medium-i-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona7x14a -mona-gothic-medium-r-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aB -mona-gothic-bold-r-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aI -mona-gothic-medium-i-normal--14-130-75-75-p-70-iso8859-1
+mona7x14r -mona-gothic-medium-r-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rB -mona-gothic-bold-r-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rI -mona-gothic-medium-i-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona8x16a -mona-gothic-medium-r-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aB -mona-gothic-bold-r-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aI -mona-gothic-medium-i-normal--16-150-75-75-p-80-iso8859-1
+mona8x16r -mona-gothic-medium-r-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rB -mona-gothic-bold-r-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rI -mona-gothic-medium-i-normal--16-150-75-75-p-80-jisx0201.1976-0
+monak12 -mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12B -mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12BI -mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12I -mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak14 -mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14B -mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14BI -mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14I -mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak16 -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16B -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16BI -mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+monau16 -mona-gothic-medium-r-normal--16-150-75-75-p-160-iso10646-1
+monau16B -mona-gothic-bold-r-normal--16-150-75-75-p-160-iso10646-1
+monau16BI -mona-gothic-bold-i-normal--16-150-75-75-p-160-iso10646-1
+monau16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-iso10646-1
+-mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-medium-r-normal--24-230-75-75-p-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
+-mona-gothic-medium-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-mona-gothic-medium-r-normal--10-70-75-75-p-100-jisx0208.1983-0 -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0
+-mona-gothic-bold-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-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/monafonts/pkg-install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/monafonts/pkg-install Sun Jun 22 10:11:38 2014 (r358781)
@@ -0,0 +1,86 @@
+#!/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}
+mona6x12a -mona-gothic-medium-r-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aB -mona-gothic-bold-r-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aI -mona-gothic-medium-i-normal--12-110-75-75-p-60-iso8859-1
+mona6x12r -mona-gothic-medium-r-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rB -mona-gothic-bold-r-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rI -mona-gothic-medium-i-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona7x14a -mona-gothic-medium-r-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aB -mona-gothic-bold-r-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aI -mona-gothic-medium-i-normal--14-130-75-75-p-70-iso8859-1
+mona7x14r -mona-gothic-medium-r-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rB -mona-gothic-bold-r-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rI -mona-gothic-medium-i-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona8x16a -mona-gothic-medium-r-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aB -mona-gothic-bold-r-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aI -mona-gothic-medium-i-normal--16-150-75-75-p-80-iso8859-1
+mona8x16r -mona-gothic-medium-r-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rB -mona-gothic-bold-r-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rI -mona-gothic-medium-i-normal--16-150-75-75-p-80-jisx0201.1976-0
+monak12 -mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12B -mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12BI -mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12I -mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak14 -mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14B -mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14BI -mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14I -mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak16 -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16B -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16BI -mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+monau16 -mona-gothic-medium-r-normal--16-150-75-75-p-160-iso10646-1
+monau16B -mona-gothic-bold-r-normal--16-150-75-75-p-160-iso10646-1
+monau16BI -mona-gothic-bold-i-normal--16-150-75-75-p-160-iso10646-1
+monau16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-iso10646-1
+-mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1983-0 -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+-mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1983-0 -mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+-mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1983-0 -mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+-mona-gothic-medium-r-normal--24-230-75-75-p-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
+-mona-gothic-medium-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-mona-gothic-medium-r-normal--10-70-75-75-p-100-jisx0208.1983-0 -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0
+-mona-gothic-bold-r-normal--20-190-75-75-p-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-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/monafonts/pkg-plist
==============================================================================
--- head/japanese/monafonts/pkg-plist Sun Jun 22 09:52:35 2014 (r358780)
+++ head/japanese/monafonts/pkg-plist Sun Jun 22 10:11:38 2014 (r358781)
@@ -1,4 +1,4 @@
-%%FONTSDIR%%/fonts.alias
+ at mode 444
%%FONTSDIR%%/mona6x12a.pcf.gz
%%FONTSDIR%%/mona6x12aB.pcf.gz
%%FONTSDIR%%/mona6x12aBI.pcf.gz
@@ -47,7 +47,7 @@
%%FONTSDIR%%/monau16B.pcf.gz
%%FONTSDIR%%/monau16BI.pcf.gz
%%FONTSDIR%%/monau16I.pcf.gz
- at exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
- at unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+ at mode
+ at exec cd %D/%%FONTSDIR%% ; mkfontdir
+ at 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
- at unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
More information about the svn-ports-head
mailing list