ports/50344: Update: japanese/mplusfonts
H.Miyamoto
Ys at PixyGarden.net
Thu Mar 27 13:00:37 UTC 2003
>Number: 50344
>Category: ports
>Synopsis: Update: japanese/mplusfonts
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 27 05:00:30 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: "H.Miyamoto"
>Release: FreeBSD 4.8-RC i386
>Organization:
PixyGarden Networks
>Environment:
System: FreeBSD requiem.pixygarden.net 4.8-RC FreeBSD 4.8-RC #0: Fri Mar 21 19:24:50 JST 2003 kazane at requiem.pixygarden.net:/usr/obj/usr/src/sys/REQUIEM i386
>Description:
Update for M+ Bitmap Fonts 1.2.0a.
This version includes latin fonts and install script that 1.0.4 don't includes.
This port build for nothing in 'do-build' target, and it run install script that
includes fonts build in 'do-install' target.
# The way is most simple, but may not good way for clean design of Ports.
New file: files/patch-aa
>How-To-Repeat:
>Fix:
Patch for Port
============ start
diff -u mplusfonts.orig/Makefile mplusfonts/Makefile
--- mplusfonts.orig/Makefile Tue Mar 25 22:08:56 2003
+++ mplusfonts/Makefile Tue Mar 25 22:29:44 2003
@@ -1,4 +1,4 @@
-# New ports collection makefile for: M+ Fonts_J
+# New ports collection makefile for: M+ Fonts
# Date created: July 17 2002
# Whom: The 244th namelessness at 2ch.net
#
@@ -6,12 +6,11 @@
#
PORTNAME= mplusfonts
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.2.0a
CATEGORIES= japanese x11-fonts
-MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/2050/ \
+MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/2464/ \
http://wids.net/archive/mplusfonts/distfiles/
-DISTNAME= mplus_fonts_J-${PORTVERSION}
+DISTNAME= mplus_bitmap_fonts-${PORTVERSION}
MAINTAINER= Ys at PixyGarden.net
COMMENT= 12x13 dots X11 kanji fonts with simple and readable design
@@ -25,34 +24,33 @@
RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
.endif
-FONTNAME= mplus_j12b mplus_j12b_iso8859 mplus_j12b_jisx0201 \
- mplus_j12r mplus_j12r_iso8859 mplus_j12r_jisx0201
-DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME}
-DOCS= LICENSE README_J
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
+DOCS= INSTALL_E LICENSE_E README_E \
+ INSTALL_J LICENSE_J README_J
FONTSDIR= ${PREFIX}/lib/X11/fonts/local
PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
do-build:
-.for file in ${FONTNAME}
- cd ${WRKSRC} && \
- bdftopcf ${file}.bdf | ${GZIP_CMD} > ${file}.pcf.gz
-.endfor
pre-install:
+ @${MKDIR} ${DOCSDIR}
+.for i in e j
+ @${INSTALL_DATA} ${WRKSRC}/fonts_${i}/fonts.alias \
+ ${DOCSDIR}/fonts.alias.${i}
+.endfor
+ @${INSTALL_DATA} ${WRKSRC}/fonts_e/euro/fonts.alias \
+ ${DOCSDIR}/fonts.alias.euro
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGREQ} ${PKGNAME} INSTALL
do-install:
- ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTSDIR}
+ cd ${WRKSRC} && \
+ ${WRKSRC}/install_mplus_fonts ${FONTSDIR}
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
.for i in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
-
-post-install:
- @(cd ${FONTSDIR} ; mkfontdir)
.include <bsd.port.post.mk>
diff -u mplusfonts.orig/distinfo mplusfonts/distinfo
--- mplusfonts.orig/distinfo Tue Mar 25 22:08:56 2003
+++ mplusfonts/distinfo Tue Mar 25 22:09:25 2003
@@ -1 +1 @@
-MD5 (mplus_fonts_J-1.0.4.tar.gz) = 2ae9c907ff8843f98b7d5346b7179959
+MD5 (mplus_bitmap_fonts-1.2.0a.tar.gz) = 17a191badeaa3e42f92592f9093fcf9a
Only in mplusfonts: files
diff -u mplusfonts.orig/pkg-descr mplusfonts/pkg-descr
--- mplusfonts.orig/pkg-descr Tue Mar 25 22:08:56 2003
+++ mplusfonts/pkg-descr Tue Mar 25 22:09:25 2003
@@ -1,11 +1,15 @@
M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
-- mplus_j12r.bdf: 12x13 dots Kanji (jisx0208)
-- mplus_j12b.bdf: 12x13 dots bold Kanji (jisx0208)
-- mplus_j12r_jisx0201.bdf: 6x13 dots ASCII + Half-wide Kana (jisx0201)
-- mplus_j12b_jisx0201.bdf: 6x13 dots bold ASCII + Half-wide Kana (jisx0201)
-- mplus_j12r_iso8859.bdf: 6x13 dots ASCII + European char (iso8859-1)
-- mplus_j12b_iso8859.bdf: 6x13 dots bold ASCII + European char (iso8859-1)
+Latin Fonts
+ + mplus-fxd (10, 12 dots) An alternative to the "fixed".
+ + mplus-hlv (10, 12 dots) An alternative to the "helvetica".
+ + mplus-hlvw (10, 12 dots) The space between character compared with "mplus-hlv"
+ + mplus-tms (10, 12 dots) An alternative to the "times".
+ + mplus-sys (10 dots) Prepared for display in window titles and menu.
+
+Japanese Fonts
+ + mplus-gothic (12 dots) Fixed width fonts.
+ + mplus-goth_p (12 dots) Roman characters set as proportional.
WWW: http://mplus-fonts.sourceforge.jp/
diff -u mplusfonts.orig/pkg-plist mplusfonts/pkg-plist
--- mplusfonts.orig/pkg-plist Tue Mar 25 22:08:56 2003
+++ mplusfonts/pkg-plist Tue Mar 25 22:09:25 2003
@@ -1,12 +1,49 @@
-%%FONTSDIR%%/mplus_j12b_iso8859.pcf.gz
-%%FONTSDIR%%/mplus_j12b_jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_f10b-euro.pcf.gz
+%%FONTSDIR%%/mplus_f10b.pcf.gz
+%%FONTSDIR%%/mplus_f10r-euro.pcf.gz
+%%FONTSDIR%%/mplus_f10r.pcf.gz
+%%FONTSDIR%%/mplus_f12b-euro.pcf.gz
+%%FONTSDIR%%/mplus_f12b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_f12b.pcf.gz
+%%FONTSDIR%%/mplus_f12r-euro.pcf.gz
+%%FONTSDIR%%/mplus_f12r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_f12r.pcf.gz
+%%FONTSDIR%%/mplus_h10b-euro.pcf.gz
+%%FONTSDIR%%/mplus_h10b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h10b.pcf.gz
+%%FONTSDIR%%/mplus_h10r-euro.pcf.gz
+%%FONTSDIR%%/mplus_h10r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h10r.pcf.gz
+%%FONTSDIR%%/mplus_h12b-euro.pcf.gz
+%%FONTSDIR%%/mplus_h12b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h12b.pcf.gz
+%%FONTSDIR%%/mplus_h12r-euro.pcf.gz
+%%FONTSDIR%%/mplus_h12r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_h12r.pcf.gz
+%%FONTSDIR%%/mplus_h12rw-euro.pcf.gz
+%%FONTSDIR%%/mplus_h12rw.pcf.gz
+%%FONTSDIR%%/mplus_j10b-iso.pcf.gz
+%%FONTSDIR%%/mplus_j10b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_j10r-iso.pcf.gz
+%%FONTSDIR%%/mplus_j10r-jisx0201.pcf.gz
%%FONTSDIR%%/mplus_j12b.pcf.gz
-%%FONTSDIR%%/mplus_j12r_iso8859.pcf.gz
-%%FONTSDIR%%/mplus_j12r_jisx0201.pcf.gz
%%FONTSDIR%%/mplus_j12r.pcf.gz
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%FONTSDIR%%/mplus_s10b-euro.pcf.gz
+%%FONTSDIR%%/mplus_s10b.pcf.gz
+%%FONTSDIR%%/mplus_s10r-euro.pcf.gz
+%%FONTSDIR%%/mplus_s10r.pcf.gz
+%%FONTSDIR%%/mplus_t10r.pcf.gz
+%%FONTSDIR%%/mplus_t12r.pcf.gz
+%%DOCSDIR%%/fonts.alias.e
+%%DOCSDIR%%/fonts.alias.j
+%%DOCSDIR%%/fonts.alias.euro
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL_E
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL_J
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE_E
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J
+%%PORTDOCS%%%%DOCSDIR%%/README_E
%%PORTDOCS%%%%DOCSDIR%%/README_J
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%DOCSDIR%%
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff -u mplusfonts.orig/pkg-req mplusfonts/pkg-req
--- mplusfonts.orig/pkg-req Tue Mar 25 22:08:56 2003
+++ mplusfonts/pkg-req Tue Mar 25 22:09:25 2003
@@ -21,19 +21,15 @@
# font alias entry here!
TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
--mplus-gothic-medium-r-normal--13-120-75-75-c-120-jisx0208.1983-0 -mplus-gothic-medium-r-normal--13-120-75-75-c-120-jisx0208.1990-0
--mplus-gothic-bold-r-normal--13-120-75-75-c-120-jisx0208.1983-0 -mplus-gothic-bold-r-normal--13-120-75-75-c-120-jisx0208.1990-0
-EOF
+for i in fonts.alias.e fonts.alias.j fonts.alias.euro ; do
+ cat ${PKG_PREFIX}/share/doc/mplusfonts/${i} >> ${TMPFILE}
+done
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-if [ "$2" = "INSTALL" ] ; then
- (grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
- cat ${TMPFILE}) > fonts.alias
-elif [ "$2" = "DEINSTALL" ] ; then
+if [ "$2" = "DEINSTALL" ] ; then
+ echo "Updating ${FONTDIR}/fonts.alias"
+ cd ${FONTDIR}
+ touch fonts.alias
+ cp fonts.alias fonts.alias.orig
grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
fi
rm -f fonts.alias.orig ${TMPFILE}
============ end
New file: files/patch-aa
============ start
--- install_mplus_fonts.orig Mon Mar 17 20:22:04 2003
+++ install_mplus_fonts Sun Mar 23 21:58:11 2003
@@ -2,7 +2,7 @@
# Install "mplus" directory [ /usr/X11R6/lib/X11/fonts ]
-PREFIX=/usr/X11R6/lib/X11/fonts
+PREFIX=$1
# Install M+ bitmap fonts EURO (iso8859-15) [ YES or NO ]
EURO15=YES
@@ -11,7 +11,7 @@
MPLUSJ=YES
# Install naga10 fonts [ "source directory path" or NO ]
-NAGA10=../
+NAGA10=NO
# Install M+ cursor [ YES or NO ]
# Original "cursor.pcf.gz" path [ /usr/X11R6/lib/X11/fonts/misc ]
@@ -20,19 +20,6 @@
-
-# Backup/Create mplus directory
-if [ -d $PREFIX/mplus.BAK ]; then
- echo "remove: '$PREFIX/mplus.BAK' directory"
- rm -rf $PREFIX/mplus.BAK
-fi
-if [ -d $PREFIX/mplus ]; then
- echo "backup: present 'mplus' directory to 'mplus.BAK'"
- mv $PREFIX/mplus $PREFIX/mplus.BAK
-fi
-echo "create: new '$PREFIX/mplus' directory"
-mkdir -p $PREFIX/mplus
-
# Install M+ bitmap fonts E
echo ""
echo "Install M+ bitmap fonts E (iso8859-1)..."
@@ -47,10 +34,10 @@
do
b=`basename $f .bdf`
echo "create: $b.pcf.gz"
- bdftopcf $f | gzip > $PREFIX/mplus/$b.pcf.gz
+ bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
done
echo "create: fonts.alias for M+ bitmap fonts E"
-cat fonts.alias > $PREFIX/mplus/fonts.alias
+cat fonts.alias > $PREFIX/fonts.alias
cd -
# Install M+ bitmap fonts EURO
@@ -65,7 +52,7 @@
cp ../$b.bdf ./
patch $b.bdf $b.diff
mv $b.bdf $b-euro.bdf
- bdftopcf $b-euro.bdf | gzip > $PREFIX/mplus/$b-euro.pcf.gz
+ bdftopcf $b-euro.bdf | gzip > $PREFIX/$b-euro.pcf.gz
done
echo "create: mplus_h12rw-euro.pcf.gz"
@@ -73,11 +60,11 @@
mplus_h12r-euro.bdf > mplus_h12rw-euro.bdf
perl -pi -e 's/hlv/hlvw/' mplus_h12rw-euro.bdf
bdftopcf mplus_h12rw-euro.bdf | gzip \
- > $PREFIX/mplus/mplus_h12rw-euro.pcf.gz
+ > $PREFIX/mplus_h12rw-euro.pcf.gz
# rm $b-euro.bdf
echo "create: fonts.alias for M+ bitmap fonts EURO"
- cat fonts.alias >> $PREFIX/mplus/fonts.alias
+ cat fonts.alias >> $PREFIX/fonts.alias
cd -
fi
@@ -116,7 +103,7 @@
do
b=`basename $f .bdf`
echo "create: $b.pcf.gz"
- bdftopcf $f | gzip > $PREFIX/mplus/$b.pcf.gz
+ bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
done
if [ -f mplus_j10r.bdf~ ]; then
@@ -125,7 +112,7 @@
# rm mplus_j12b.bdf
echo "create: fonts.alias for M+ bitmap fonts J"
- cat fonts.alias >> $PREFIX/mplus/fonts.alias
+ cat fonts.alias >> $PREFIX/fonts.alias
cd -
# Install naga10 fonts
@@ -137,11 +124,11 @@
do
b=`basename $f .bdf`
echo "create: $b.pcf.gz"
- bdftopcf $f | gzip > $PREFIX/mplus/$b.pcf.gz
+ bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
done
cd -; cd fonts_j
echo "create: fonts.alias for naga10 fonts"
- cat fonts.alias_10 >> $PREFIX/mplus/fonts.alias
+ cat fonts.alias_10 >> $PREFIX/fonts.alias
cd -
fi
@@ -168,6 +155,4 @@
# Finish
echo ""
echo "create: fonts.dir file"
-mkfontdir $PREFIX/mplus
-xset fp rehash
-echo "xset fp rehash... done"
+mkfontdir $PREFIX
============ end
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list