Index: head/japanese/font-mona/Makefile =================================================================== --- head/japanese/font-mona/Makefile (revision 464176) +++ head/japanese/font-mona/Makefile (revision 464177) @@ -1,34 +1,28 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ PORTNAME= mona PORTVERSION= 2.90 +PORTREVISION= 1 CATEGORIES= japanese x11-fonts MASTER_SITES= SF/monafont/monafont/monafont-${PORTVERSION} PKGNAMEPREFIX= ja-font- DISTNAME= monafont-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT= 12,14,16-dot Kanji fonts BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \ mkfontdir:x11-fonts/mkfontdir USES= fonts perl5 tar:bzip2 -FONTNAME= misc USE_PERL5= build NO_ARCH= yes -MAKE_ENV= DATADIR="${DATADIR}" -SUB_FILES= pkg-install -SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias" -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-install +MAKE_ENV= FONTSDIR="${FONTSDIR}" +SUB_FILES= pkg-message ALL_TARGET= bdf post-install: - @${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && \ - ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . - ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} .include Index: head/japanese/font-mona/files/pkg-install.in =================================================================== --- head/japanese/font-mona/files/pkg-install.in (revision 464176) +++ head/japanese/font-mona/files/pkg-install.in (nonexistent) @@ -1,23 +0,0 @@ -#!/bin/sh - -grepv() { - awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 -} - -case $2 in -POST-INSTALL) - cd %%FONTSDIR%% - touch fonts.alias - cp fonts.alias fonts.alias.orig - (grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \ - > fonts.alias - rm -f fonts.alias.orig -;; -DEINSTALL) - cd %%FONTSDIR%% - touch fonts.alias - cp fonts.alias fonts.alias.orig - grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias - rm -f fonts.alias.orig -;; -esac Property changes on: head/japanese/font-mona/files/pkg-install.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/japanese/font-mona/files/patch-Makefile =================================================================== --- head/japanese/font-mona/files/patch-Makefile (revision 464176) +++ head/japanese/font-mona/files/patch-Makefile (revision 464177) @@ -1,26 +1,26 @@ --- Makefile.orig 2003-09-10 02:54:10 UTC +++ Makefile @@ -18,11 +18,10 @@ GZIP_SUFFIX = gz #GZIP_SUFFIX = Z DESTDIR = -X11BINDIR = /usr/X11R6/bin -X11FONTDIR = $(DESTDIR)/usr/X11R6/lib/X11/fonts/local -BDFTOPCF = $(X11BINDIR)/bdftopcf -MKDIRHIER = $(X11BINDIR)/mkdirhier # 'mkdir -p' may also work. -MKFONTDIR = $(X11BINDIR)/mkfontdir -+X11FONTDIR = $(DESTDIR)$(DATADIR) ++X11FONTDIR = $(DESTDIR)$(FONTSDIR) +BDFTOPCF = bdftopcf +MKDIRHIER = mkdir -p # 'mkdir -p' may also work. +MKFONTDIR = mkfontdir MY_RPM_ROOT = /tmp/rpm-root @@ -258,7 +257,6 @@ install: bdf $(BDFTOPCF) dist/$$i.bdf | \ $(GZIP_CMD) -c > $(X11FONTDIR)/$$i.pcf.$(GZIP_SUFFIX); \ done - $(MKFONTDIR) $(X11FONTDIR) # append fonts.alias install-alias: Index: head/japanese/font-mona/files/pkg-message.in =================================================================== --- head/japanese/font-mona/files/pkg-message.in (nonexistent) +++ head/japanese/font-mona/files/pkg-message.in (revision 464177) @@ -0,0 +1,15 @@ +******************************************************************* +You can start using the font(s) by following these instructions: + +Either type the following in an X terminal: + + xset fp+ %%FONTSDIR%% + xset fp rehash + +Or, more permanently, add the following line to the "Files" section +of your X.Org configuration file (typically /etc/X11/xorg.conf): + + FontPath "%%FONTSDIR%%/" + +then restart X. +******************************************************************* Property changes on: head/japanese/font-mona/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/japanese/font-mona/pkg-plist =================================================================== --- head/japanese/font-mona/pkg-plist (revision 464176) +++ head/japanese/font-mona/pkg-plist (revision 464177) @@ -1,97 +1,49 @@ -%%DATADIR%%/fonts.alias -%%DATADIR%%/mona6x12a.pcf.gz -%%DATADIR%%/mona6x12aB.pcf.gz -%%DATADIR%%/mona6x12aBI.pcf.gz -%%DATADIR%%/mona6x12aI.pcf.gz -%%DATADIR%%/mona6x12r.pcf.gz -%%DATADIR%%/mona6x12rB.pcf.gz -%%DATADIR%%/mona6x12rBI.pcf.gz -%%DATADIR%%/mona6x12rI.pcf.gz -%%DATADIR%%/mona7x14a.pcf.gz -%%DATADIR%%/mona7x14aB.pcf.gz -%%DATADIR%%/mona7x14aBI.pcf.gz -%%DATADIR%%/mona7x14aI.pcf.gz -%%DATADIR%%/mona7x14r.pcf.gz -%%DATADIR%%/mona7x14rB.pcf.gz -%%DATADIR%%/mona7x14rBI.pcf.gz -%%DATADIR%%/mona7x14rI.pcf.gz -%%DATADIR%%/mona8x16a.pcf.gz -%%DATADIR%%/mona8x16aB.pcf.gz -%%DATADIR%%/mona8x16aBI.pcf.gz -%%DATADIR%%/mona8x16aI.pcf.gz -%%DATADIR%%/mona8x16r.pcf.gz -%%DATADIR%%/mona8x16rB.pcf.gz -%%DATADIR%%/mona8x16rBI.pcf.gz -%%DATADIR%%/mona8x16rI.pcf.gz -%%DATADIR%%/monak12.pcf.gz -%%DATADIR%%/monak12B.pcf.gz -%%DATADIR%%/monak12BI.pcf.gz -%%DATADIR%%/monak12I.pcf.gz -%%DATADIR%%/monak14.pcf.gz -%%DATADIR%%/monak14B.pcf.gz -%%DATADIR%%/monak14BI.pcf.gz -%%DATADIR%%/monak14I.pcf.gz -%%DATADIR%%/monak16.pcf.gz -%%DATADIR%%/monak16B.pcf.gz -%%DATADIR%%/monak16BI.pcf.gz -%%DATADIR%%/monak16I.pcf.gz -%%DATADIR%%/monau12.pcf.gz -%%DATADIR%%/monau12B.pcf.gz -%%DATADIR%%/monau12BI.pcf.gz -%%DATADIR%%/monau12I.pcf.gz -%%DATADIR%%/monau14.pcf.gz -%%DATADIR%%/monau14B.pcf.gz -%%DATADIR%%/monau14BI.pcf.gz -%%DATADIR%%/monau14I.pcf.gz -%%DATADIR%%/monau16.pcf.gz -%%DATADIR%%/monau16B.pcf.gz -%%DATADIR%%/monau16BI.pcf.gz -%%DATADIR%%/monau16I.pcf.gz +%%FONTSDIR%%/fonts.alias %%FONTSDIR%%/mona6x12a.pcf.gz %%FONTSDIR%%/mona6x12aB.pcf.gz %%FONTSDIR%%/mona6x12aBI.pcf.gz %%FONTSDIR%%/mona6x12aI.pcf.gz %%FONTSDIR%%/mona6x12r.pcf.gz %%FONTSDIR%%/mona6x12rB.pcf.gz %%FONTSDIR%%/mona6x12rBI.pcf.gz %%FONTSDIR%%/mona6x12rI.pcf.gz %%FONTSDIR%%/mona7x14a.pcf.gz %%FONTSDIR%%/mona7x14aB.pcf.gz %%FONTSDIR%%/mona7x14aBI.pcf.gz %%FONTSDIR%%/mona7x14aI.pcf.gz %%FONTSDIR%%/mona7x14r.pcf.gz %%FONTSDIR%%/mona7x14rB.pcf.gz %%FONTSDIR%%/mona7x14rBI.pcf.gz %%FONTSDIR%%/mona7x14rI.pcf.gz %%FONTSDIR%%/mona8x16a.pcf.gz %%FONTSDIR%%/mona8x16aB.pcf.gz %%FONTSDIR%%/mona8x16aBI.pcf.gz %%FONTSDIR%%/mona8x16aI.pcf.gz %%FONTSDIR%%/mona8x16r.pcf.gz %%FONTSDIR%%/mona8x16rB.pcf.gz %%FONTSDIR%%/mona8x16rBI.pcf.gz %%FONTSDIR%%/mona8x16rI.pcf.gz %%FONTSDIR%%/monak12.pcf.gz %%FONTSDIR%%/monak12B.pcf.gz %%FONTSDIR%%/monak12BI.pcf.gz %%FONTSDIR%%/monak12I.pcf.gz %%FONTSDIR%%/monak14.pcf.gz %%FONTSDIR%%/monak14B.pcf.gz %%FONTSDIR%%/monak14BI.pcf.gz %%FONTSDIR%%/monak14I.pcf.gz %%FONTSDIR%%/monak16.pcf.gz %%FONTSDIR%%/monak16B.pcf.gz %%FONTSDIR%%/monak16BI.pcf.gz %%FONTSDIR%%/monak16I.pcf.gz %%FONTSDIR%%/monau12.pcf.gz %%FONTSDIR%%/monau12B.pcf.gz %%FONTSDIR%%/monau12BI.pcf.gz %%FONTSDIR%%/monau12I.pcf.gz %%FONTSDIR%%/monau14.pcf.gz %%FONTSDIR%%/monau14B.pcf.gz %%FONTSDIR%%/monau14BI.pcf.gz %%FONTSDIR%%/monau14I.pcf.gz %%FONTSDIR%%/monau16.pcf.gz %%FONTSDIR%%/monau16B.pcf.gz %%FONTSDIR%%/monau16BI.pcf.gz %%FONTSDIR%%/monau16I.pcf.gz