Date: Wed, 21 May 2014 23:01:09 +0900 From: WATANABE Kazuhiro <CQG00620@nifty.ne.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/190073: [patch] japanese/monafonts: Remove use of pkg-req and add staging support Message-ID: <201405211404.s4LE4CYE018417@mxg305.nifty.com> Resent-Message-ID: <201405211420.s4LEK15G067070@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190073
>Category: ports
>Synopsis: [patch] japanese/monafonts: 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:01 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 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.
These modification are derived from japanese/elisa8x8. Thanks!
>How-To-Repeat:
>Fix:
diff -urN monafonts.orig/Makefile monafonts/Makefile
--- monafonts.orig/Makefile 2013-09-21 03:47:54.000000000 +0900
+++ monafonts/Makefile 2014-05-21 20:59:14.000000000 +0900
@@ -14,8 +14,7 @@
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 @@
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>
diff -urN monafonts.orig/files/patch-aa monafonts/files/patch-aa
--- monafonts.orig/files/patch-aa 2014-01-23 02:40:44.000000000 +0900
+++ monafonts/files/patch-aa 2014-05-21 20:59:14.000000000 +0900
@@ -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:
diff -urN monafonts.orig/pkg-deinstall monafonts/pkg-deinstall
--- monafonts.orig/pkg-deinstall 1970-01-01 09:00:00.000000000 +0900
+++ monafonts/pkg-deinstall 2014-05-21 20:59:14.000000000 +0900
@@ -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
diff -urN monafonts.orig/pkg-install monafonts/pkg-install
--- monafonts.orig/pkg-install 1970-01-01 09:00:00.000000000 +0900
+++ monafonts/pkg-install 2014-05-21 20:59:14.000000000 +0900
@@ -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
diff -urN monafonts.orig/pkg-plist monafonts/pkg-plist
--- monafonts.orig/pkg-plist 2013-06-19 23:58:42.000000000 +0900
+++ monafonts/pkg-plist 2014-05-21 21:14:44.000000000 +0900
@@ -1,4 +1,4 @@
-%%FONTSDIR%%/fonts.alias
+@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
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@mode
+@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
diff -urN monafonts.orig/pkg-req monafonts/pkg-req
--- monafonts.orig/pkg-req 2014-01-23 00:52:06.000000000 +0900
+++ monafonts/pkg-req 1970-01-01 09:00:00.000000000 +0900
@@ -1,104 +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}
-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
-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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405211404.s4LE4CYE018417>