ports/52816: Update: japanese/mplusfonts
H.Miyamoto
Ys at PixyGarden.net
Fri May 30 18:40:03 UTC 2003
>Number: 52816
>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: Fri May 30 11:40:01 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: "H.Miyamoto"
>Release: FreeBSD 4.8-STABLE i386
>Organization:
PixyGarden Networks
>Environment:
System: FreeBSD requiem.pixygarden.net 4.8-STABLE FreeBSD 4.8-STABLE #1: Sun Apr 6 23:53:08 JST 2003 kazane at requiem.pixygarden.net:/usr/obj/usr/src/sys/REQUIEM i386
>Description:
Update for M+ Bitmap Fonts 1.2.5.
The bug which existed 1.2.0a and before port, were fixed the port.
- The fonts.alias is deleted when installing.
- Entries are not added to fonts.alias when 'pkg_add' installing.
This bug was told by the user o f this port. I am thankful to him
who reported.
>How-To-Repeat:
>Fix:
diff -ruN mplusfonts.orig/Makefile mplusfonts/Makefile
--- mplusfonts.orig/Makefile Sat May 31 02:47:50 2003
+++ mplusfonts/Makefile Sat May 31 03:28:34 2003
@@ -6,7 +6,7 @@
#
PORTNAME= mplusfonts
-PORTVERSION= 1.2.0a
+PORTVERSION= 1.2.5
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/2464/ \
http://wids.net/archive/mplusfonts/distfiles/
@@ -26,7 +26,8 @@
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
DOCS= INSTALL_E LICENSE_E README_E \
- INSTALL_J LICENSE_J README_J
+ INSTALL_J LICENSE_J README_J \
+ README_mplusj10
FONTSDIR= ${PREFIX}/lib/X11/fonts/local
PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
@@ -38,9 +39,11 @@
.for i in e j
@${INSTALL_DATA} ${WRKSRC}/fonts_${i}/fonts.alias \
${DOCSDIR}/fonts.alias.${i}
+ @${CAT} ${DOCSDIR}/fonts.alias.${i} >> ${DOCSDIR}/fonts.alias
.endfor
@${INSTALL_DATA} ${WRKSRC}/fonts_e/euro/fonts.alias \
${DOCSDIR}/fonts.alias.euro
+ @${CAT} ${DOCSDIR}/fonts.alias.euro >> ${DOCSDIR}/fonts.alias
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGREQ} ${PKGNAME} INSTALL
diff -ruN mplusfonts.orig/distinfo mplusfonts/distinfo
--- mplusfonts.orig/distinfo Sat May 31 02:47:50 2003
+++ mplusfonts/distinfo Sat May 31 02:51:38 2003
@@ -1 +1 @@
-MD5 (mplus_bitmap_fonts-1.2.0a.tar.gz) = 17a191badeaa3e42f92592f9093fcf9a
+MD5 (mplus_bitmap_fonts-1.2.5.tar.gz) = bd30bd8ee0b8f375d3b307f2aa243de1
diff -ruN mplusfonts.orig/files/patch-install_mplus_fonts mplusfonts/files/patch-install_mplus_fonts
--- mplusfonts.orig/files/patch-install_mplus_fonts Sat May 31 02:47:50 2003
+++ mplusfonts/files/patch-install_mplus_fonts Sat May 31 02:51:38 2003
@@ -1,5 +1,5 @@
---- install_mplus_fonts.orig Mon Mar 17 20:22:04 2003
-+++ install_mplus_fonts Sun Mar 23 21:58:11 2003
+--- install_mplus_fonts.orig Sat May 31 00:02:38 2003
++++ install_mplus_fonts Sat May 31 00:06:47 2003
@@ -2,7 +2,7 @@
@@ -9,15 +9,6 @@
# 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 @@
@@ -38,7 +29,7 @@
# Install M+ bitmap fonts E
echo ""
echo "Install M+ bitmap fonts E (iso8859-1)..."
-@@ -47,10 +34,10 @@
+@@ -45,10 +32,10 @@
do
b=`basename $f .bdf`
echo "create: $b.pcf.gz"
@@ -47,11 +38,11 @@
done
echo "create: fonts.alias for M+ bitmap fonts E"
-cat fonts.alias > $PREFIX/mplus/fonts.alias
-+cat fonts.alias > $PREFIX/fonts.alias
++cat fonts.alias >> $PREFIX/fonts.alias
cd -
# Install M+ bitmap fonts EURO
-@@ -65,7 +52,7 @@
+@@ -63,18 +50,18 @@
cp ../$b.bdf ./
patch $b.bdf $b.diff
mv $b.bdf $b-euro.bdf
@@ -60,12 +51,11 @@
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
+ awk '/^SWIDTH/{$2 += 80} /^DWIDTH/{$2 += 1} {print}' \
+ mplus_h12r-euro.bdf | sed 's/hlv/hlvw/' > mplus_h12rw-euro.bdf
+ bdftopcf mplus_h12rw-euro.bdf \
+- | gzip > $PREFIX/mplus/mplus_h12rw-euro.pcf.gz
++ | gzip > $PREFIX/mplus_h12rw-euro.pcf.gz
# rm $b-euro.bdf
echo "create: fonts.alias for M+ bitmap fonts EURO"
@@ -74,7 +64,7 @@
cd -
fi
-@@ -116,7 +103,7 @@
+@@ -128,12 +115,12 @@
do
b=`basename $f .bdf`
echo "create: $b.pcf.gz"
@@ -82,35 +72,19 @@
+ bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
done
- if [ -f mplus_j10r.bdf~ ]; then
-@@ -125,7 +112,7 @@
-
- # rm mplus_j12b.bdf
+ # rm mplus_j1*b.bdf
echo "create: fonts.alias for M+ bitmap fonts J"
- cat fonts.alias >> $PREFIX/mplus/fonts.alias
+ cat fonts.alias >> $PREFIX/fonts.alias
cd -
+ fi
- # 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 @@
+@@ -158,7 +145,5 @@
# Finish
echo ""
echo "create: fonts.dir file"
-mkfontdir $PREFIX/mplus
--xset fp rehash
--echo "xset fp rehash... done"
+-echo -n "xset fp rehash..."
+-xset fp rehash &&
+mkfontdir $PREFIX
+ echo " done"
diff -ruN mplusfonts.orig/pkg-descr mplusfonts/pkg-descr
--- mplusfonts.orig/pkg-descr Sat May 31 02:47:50 2003
+++ mplusfonts/pkg-descr Sat May 31 03:01:54 2003
@@ -1,17 +1,7 @@
M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
-
-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.
+This font set includes Japanese and Latin fonts, and they're 10 and 12 dots.
WWW: http://mplus-fonts.sourceforge.jp/
--- H.Miyamoto
-<Ys at PixyGarden.net>
+--
+H.Miyamoto <Ys at PixyGarden.net>
diff -ruN mplusfonts.orig/pkg-plist mplusfonts/pkg-plist
--- mplusfonts.orig/pkg-plist Sat May 31 02:47:50 2003
+++ mplusfonts/pkg-plist Sat May 31 02:51:38 2003
@@ -24,10 +24,14 @@
%%FONTSDIR%%/mplus_h12rw.pcf.gz
%%FONTSDIR%%/mplus_j10b-iso.pcf.gz
%%FONTSDIR%%/mplus_j10b-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_j10b.pcf.gz
%%FONTSDIR%%/mplus_j10r-iso.pcf.gz
%%FONTSDIR%%/mplus_j10r-jisx0201.pcf.gz
+%%FONTSDIR%%/mplus_j10r.pcf.gz
%%FONTSDIR%%/mplus_j12b.pcf.gz
%%FONTSDIR%%/mplus_j12r.pcf.gz
+%%FONTSDIR%%/mplus_q06r-euro.pcf.gz
+%%FONTSDIR%%/mplus_q06r.pcf.gz
%%FONTSDIR%%/mplus_s10b-euro.pcf.gz
%%FONTSDIR%%/mplus_s10b.pcf.gz
%%FONTSDIR%%/mplus_s10r-euro.pcf.gz
@@ -40,6 +44,7 @@
%%FONTSDIR%%/mplus_t12b.pcf.gz
%%FONTSDIR%%/mplus_t12r-euro.pcf.gz
%%FONTSDIR%%/mplus_t12r.pcf.gz
+%%DOCSDIR%%/fonts.alias
%%DOCSDIR%%/fonts.alias.e
%%DOCSDIR%%/fonts.alias.j
%%DOCSDIR%%/fonts.alias.euro
@@ -49,8 +54,10 @@
%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J
%%PORTDOCS%%%%DOCSDIR%%/README_E
%%PORTDOCS%%%%DOCSDIR%%/README_J
+%%PORTDOCS%%%%DOCSDIR%%/README_mplusj10
@dirrm %%DOCSDIR%%
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+ at exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
@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
@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
diff -ruN mplusfonts.orig/pkg-req mplusfonts/pkg-req
--- mplusfonts.orig/pkg-req Sat May 31 02:47:50 2003
+++ mplusfonts/pkg-req Sat May 31 02:51:38 2003
@@ -19,20 +19,19 @@
mkdir ${FONTDIR}
fi
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-for i in fonts.alias.e fonts.alias.j fonts.alias.euro ; do
- cat ${PKG_PREFIX}/share/doc/mplusfonts/${i} >> ${TMPFILE}
-done
-
if [ "$2" = "DEINSTALL" ] ; then
+ # font alias entry here!
+ TMPFILE=/tmp/install-fonts-alias-$$
+ 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
grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+ rm -f fonts.alias.orig ${TMPFILE}
fi
-rm -f fonts.alias.orig ${TMPFILE}
echo "**********************************************************"
echo "You should restart X server or do 'xset fp rehash' command"
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list