Attachment #31787 for bug #52816

View | Details | Raw Unified | Return to bug 52816
Collapse All | Expand All




#

PORTNAME=	mplusfonts
PORTVERSION=	1.2.5
CATEGORIES=	japanese x11-fonts
MASTER_SITES=	http://downloads.sourceforge.jp/mplus-fonts/2464/ \
		http://wids.net/archive/mplusfonts/distfiles/


DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
DOCS=		INSTALL_E LICENSE_E README_E \
		INSTALL_J LICENSE_J README_J \
		README_mplusj10

FONTSDIR=	${PREFIX}/lib/X11/fonts/local
PLIST_SUB=	FONTSDIR=${FONTSDIR:S/${PREFIX}\///}

.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


Line 1 Link Here

(-)mplusfonts/distinfo (-1 / +1 lines)
1	MD5 (mplus_bitmap_fonts-1.2.0a.tar.gz) = 17a191badeaa3e42f92592f9093fcf9a	1	MD5 (mplus_bitmap_fonts-1.2.5.tar.gz) = bd30bd8ee0b8f375d3b307f2aa243de1




--- 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 @@
 
 

 
 # 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 @@
 
 

 # Install M+ bitmap fonts E
 echo ""
 echo "Install M+ bitmap fonts E (iso8859-1)..."
@@ -45,10 +32,10 @@
 do
 	b=`basename $f .bdf`
 	echo "create: $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
@@ -63,18 +50,18 @@
 		cp ../$b.bdf ./
 		patch $b.bdf $b.diff
 		mv $b.bdf $b-euro.bdf

 	done
 
 	echo "create: 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
+	> $PREFIX/mplus_h12rw-euro.pcf.gz
 
 #	rm $b-euro.bdf
 	echo "create: fonts.alias for M+ bitmap fonts EURO"

 	cd -
 fi
 
@@ -128,12 +115,12 @@
 	do
 		b=`basename $f .bdf`
 		echo "create: $b.pcf.gz"

+		bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
 	done
 
 #	rm mplus_j1*b.bdf
@@ -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 -
 fi
 
@@ -158,7 +145,5 @@
@@ -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
-echo -n "xset fp rehash..."
-xset fp rehash &&
+mkfontdir $PREFIX
 echo " done"




M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
This font set includes Japanese and Latin fonts, and they're 10 and 12 dots.
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/


Lines 24-33 Link Here

(-)mplusfonts/pkg-plist (+7 lines)
24	%%FONTSDIR%%/mplus_h12rw.pcf.gz	24	%%FONTSDIR%%/mplus_h12rw.pcf.gz
25	%%FONTSDIR%%/mplus_j10b-iso.pcf.gz	25	%%FONTSDIR%%/mplus_j10b-iso.pcf.gz
26	%%FONTSDIR%%/mplus_j10b-jisx0201.pcf.gz	26	%%FONTSDIR%%/mplus_j10b-jisx0201.pcf.gz
		27	%%FONTSDIR%%/mplus_j10b.pcf.gz
27	%%FONTSDIR%%/mplus_j10r-iso.pcf.gz	28	%%FONTSDIR%%/mplus_j10r-iso.pcf.gz
28	%%FONTSDIR%%/mplus_j10r-jisx0201.pcf.gz	29	%%FONTSDIR%%/mplus_j10r-jisx0201.pcf.gz
		30	%%FONTSDIR%%/mplus_j10r.pcf.gz
29	%%FONTSDIR%%/mplus_j12b.pcf.gz	31	%%FONTSDIR%%/mplus_j12b.pcf.gz
30	%%FONTSDIR%%/mplus_j12r.pcf.gz	32	%%FONTSDIR%%/mplus_j12r.pcf.gz
		33	%%FONTSDIR%%/mplus_q06r-euro.pcf.gz
		34	%%FONTSDIR%%/mplus_q06r.pcf.gz
31	%%FONTSDIR%%/mplus_s10b-euro.pcf.gz	35	%%FONTSDIR%%/mplus_s10b-euro.pcf.gz
32	%%FONTSDIR%%/mplus_s10b.pcf.gz	36	%%FONTSDIR%%/mplus_s10b.pcf.gz
33	%%FONTSDIR%%/mplus_s10r-euro.pcf.gz	37	%%FONTSDIR%%/mplus_s10r-euro.pcf.gz
Lines 40-45 Link Here
40	%%FONTSDIR%%/mplus_t12b.pcf.gz	44	%%FONTSDIR%%/mplus_t12b.pcf.gz
41	%%FONTSDIR%%/mplus_t12r-euro.pcf.gz	45	%%FONTSDIR%%/mplus_t12r-euro.pcf.gz
42	%%FONTSDIR%%/mplus_t12r.pcf.gz	46	%%FONTSDIR%%/mplus_t12r.pcf.gz
		47	%%DOCSDIR%%/fonts.alias
43	%%DOCSDIR%%/fonts.alias.e	48	%%DOCSDIR%%/fonts.alias.e
44	%%DOCSDIR%%/fonts.alias.j	49	%%DOCSDIR%%/fonts.alias.j
45	%%DOCSDIR%%/fonts.alias.euro	50	%%DOCSDIR%%/fonts.alias.euro
Lines 49-56 Link Here
49	%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J	54	%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J
50	%%PORTDOCS%%%%DOCSDIR%%/README_E	55	%%PORTDOCS%%%%DOCSDIR%%/README_E
51	%%PORTDOCS%%%%DOCSDIR%%/README_J	56	%%PORTDOCS%%%%DOCSDIR%%/README_J
		57	%%PORTDOCS%%%%DOCSDIR%%/README_mplusj10
52	@dirrm %%DOCSDIR%%	58	@dirrm %%DOCSDIR%%
53	@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir	59	@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
		60	@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias
54	@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir	61	@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
55	@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir \| awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi	62	@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir \| awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
56	@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi	63	@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi




	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"

Return to bug 52816

Lines 6-12 Link Here

(-)mplusfonts/Makefile (-2 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= mplusfonts	8	PORTNAME= mplusfonts
9	PORTVERSION= 1.2.0a	9	PORTVERSION= 1.2.5
10	CATEGORIES= japanese x11-fonts	10	CATEGORIES= japanese x11-fonts
11	MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/2464/ \	11	MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/2464/ \
12	http://wids.net/archive/mplusfonts/distfiles/	12	http://wids.net/archive/mplusfonts/distfiles/
Lines 26-32 Link Here
26		26
27	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}	27	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
28	DOCS= INSTALL_E LICENSE_E README_E \	28	DOCS= INSTALL_E LICENSE_E README_E \
29	INSTALL_J LICENSE_J README_J	29	INSTALL_J LICENSE_J README_J \
		30	README_mplusj10
30		31
31	FONTSDIR= ${PREFIX}/lib/X11/fonts/local	32	FONTSDIR= ${PREFIX}/lib/X11/fonts/local
32	PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}	33	PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
Lines 38-46 Link Here
38	.for i in e j	39	.for i in e j
39	@${INSTALL_DATA} ${WRKSRC}/fonts_${i}/fonts.alias \	40	@${INSTALL_DATA} ${WRKSRC}/fonts_${i}/fonts.alias \
40	${DOCSDIR}/fonts.alias.${i}	41	${DOCSDIR}/fonts.alias.${i}
		42	@${CAT} ${DOCSDIR}/fonts.alias.${i} >> ${DOCSDIR}/fonts.alias
41	.endfor	43	.endfor
42	@${INSTALL_DATA} ${WRKSRC}/fonts_e/euro/fonts.alias \	44	@${INSTALL_DATA} ${WRKSRC}/fonts_e/euro/fonts.alias \
43	${DOCSDIR}/fonts.alias.euro	45	${DOCSDIR}/fonts.alias.euro
		46	@${CAT} ${DOCSDIR}/fonts.alias.euro >> ${DOCSDIR}/fonts.alias
44	@${SETENV} PKG_PREFIX=${PREFIX} \	47	@${SETENV} PKG_PREFIX=${PREFIX} \
45	${SH} ${PKGREQ} ${PKGNAME} INSTALL	48	${SH} ${PKGREQ} ${PKGNAME} INSTALL
46		49

Lines 1-5 Link Here

(-)mplusfonts/files/patch-install_mplus_fonts (-43 / +17 lines)
1	--- install_mplus_fonts.orig Mon Mar 17 20:22:04 2003	1	--- install_mplus_fonts.orig Sat May 31 00:02:38 2003
2	+++ install_mplus_fonts Sun Mar 23 21:58:11 2003	2	+++ install_mplus_fonts Sat May 31 00:06:47 2003
3	@@ -2,7 +2,7 @@	3	@@ -2,7 +2,7 @@
4		4
5		5
Lines 9-23 Link Here
9		9
10	# Install M+ bitmap fonts EURO (iso8859-15) [ YES or NO ]	10	# Install M+ bitmap fonts EURO (iso8859-15) [ YES or NO ]
11	EURO15=YES	11	EURO15=YES
12	@@ -11,7 +11,7 @@
13	MPLUSJ=YES
14
15	# Install naga10 fonts [ "source directory path" or NO ]
16	-NAGA10=../
17	+NAGA10=NO
18
19	# Install M+ cursor [ YES or NO ]
20	# Original "cursor.pcf.gz" path [ /usr/X11R6/lib/X11/fonts/misc ]
21	@@ -20,19 +20,6 @@	12	@@ -20,19 +20,6 @@
22		13
23		14
Lines 38-44 Link Here
38	# Install M+ bitmap fonts E	29	# Install M+ bitmap fonts E
39	echo ""	30	echo ""
40	echo "Install M+ bitmap fonts E (iso8859-1)..."	31	echo "Install M+ bitmap fonts E (iso8859-1)..."
41	@@ -47,10 +34,10 @@	32	@@ -45,10 +32,10 @@
42	do	33	do
43	b=`basename $f .bdf`	34	b=`basename $f .bdf`
44	echo "create: $b.pcf.gz"	35	echo "create: $b.pcf.gz"
Lines 47-57 Link Here
47	done	38	done
48	echo "create: fonts.alias for M+ bitmap fonts E"	39	echo "create: fonts.alias for M+ bitmap fonts E"
49	-cat fonts.alias > $PREFIX/mplus/fonts.alias	40	-cat fonts.alias > $PREFIX/mplus/fonts.alias
50	+cat fonts.alias > $PREFIX/fonts.alias	41	+cat fonts.alias >> $PREFIX/fonts.alias
51	cd -	42	cd -
52		43
53	# Install M+ bitmap fonts EURO	44	# Install M+ bitmap fonts EURO
54	@@ -65,7 +52,7 @@	45	@@ -63,18 +50,18 @@
55	cp ../$b.bdf ./	46	cp ../$b.bdf ./
56	patch $b.bdf $b.diff	47	patch $b.bdf $b.diff
57	mv $b.bdf $b-euro.bdf	48	mv $b.bdf $b-euro.bdf
Lines 60-71 Link Here
60	done	51	done
61		52
62	echo "create: mplus_h12rw-euro.pcf.gz"	53	echo "create: mplus_h12rw-euro.pcf.gz"
63	@@ -73,11 +60,11 @@	54	awk '/^SWIDTH/{$2 += 80} /^DWIDTH/{$2 += 1} {print}' \
64	mplus_h12r-euro.bdf > mplus_h12rw-euro.bdf	55	mplus_h12r-euro.bdf \| sed 's/hlv/hlvw/' > mplus_h12rw-euro.bdf
65	perl -pi -e 's/hlv/hlvw/' mplus_h12rw-euro.bdf	56	bdftopcf mplus_h12rw-euro.bdf \
66	bdftopcf mplus_h12rw-euro.bdf \| gzip \	57	- \| gzip > $PREFIX/mplus/mplus_h12rw-euro.pcf.gz
67	- > $PREFIX/mplus/mplus_h12rw-euro.pcf.gz	58	+ \| gzip > $PREFIX/mplus_h12rw-euro.pcf.gz
68	+ > $PREFIX/mplus_h12rw-euro.pcf.gz
69		59
70	# rm $b-euro.bdf	60	# rm $b-euro.bdf
71	echo "create: fonts.alias for M+ bitmap fonts EURO"	61	echo "create: fonts.alias for M+ bitmap fonts EURO"
Lines 74-80 Link Here
74	cd -	64	cd -
75	fi	65	fi
76		66
77	@@ -116,7 +103,7 @@	67	@@ -128,12 +115,12 @@
78	do	68	do
79	b=`basename $f .bdf`	69	b=`basename $f .bdf`
80	echo "create: $b.pcf.gz"	70	echo "create: $b.pcf.gz"
Lines 82-116 Link Here
82	+ bdftopcf $f \| gzip > $PREFIX/$b.pcf.gz	72	+ bdftopcf $f \| gzip > $PREFIX/$b.pcf.gz
83	done	73	done
84		74
85	if [ -f mplus_j10r.bdf~ ]; then	75	# rm mplus_j1*b.bdf
86	@@ -125,7 +112,7 @@
87
88	# rm mplus_j12b.bdf
89	echo "create: fonts.alias for M+ bitmap fonts J"	76	echo "create: fonts.alias for M+ bitmap fonts J"
90	- cat fonts.alias >> $PREFIX/mplus/fonts.alias	77	- cat fonts.alias >> $PREFIX/mplus/fonts.alias
91	+ cat fonts.alias >> $PREFIX/fonts.alias	78	+ cat fonts.alias >> $PREFIX/fonts.alias
92	cd -	79	cd -
		80	fi
93		81
94	# Install naga10 fonts	82	@@ -158,7 +145,5 @@
95	@@ -137,11 +124,11 @@
96	do
97	b=`basename $f .bdf`
98	echo "create: $b.pcf.gz"
99	- bdftopcf $f \| gzip > $PREFIX/mplus/$b.pcf.gz
100	+ bdftopcf $f \| gzip > $PREFIX/$b.pcf.gz
101	done
102	cd -; cd fonts_j
103	echo "create: fonts.alias for naga10 fonts"
104	- cat fonts.alias_10 >> $PREFIX/mplus/fonts.alias
105	+ cat fonts.alias_10 >> $PREFIX/fonts.alias
106	cd -
107	fi
108
109	@@ -168,6 +155,4 @@
110	# Finish	83	# Finish
111	echo ""	84	echo ""
112	echo "create: fonts.dir file"	85	echo "create: fonts.dir file"
113	-mkfontdir $PREFIX/mplus	86	-mkfontdir $PREFIX/mplus
114	-xset fp rehash	87	-echo -n "xset fp rehash..."
115	-echo "xset fp rehash... done"	88	-xset fp rehash &&
116	+mkfontdir $PREFIX	89	+mkfontdir $PREFIX
		90	echo " done"

Lines 1-17 Link Here

(-)mplusfonts/pkg-descr (-11 / +1 lines)
1	M+ bitmap fonts is a bitmap font set aimed for simple and readable design.	1	M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
2		2	This font set includes Japanese and Latin fonts, and they're 10 and 12 dots.
3	Latin Fonts
4	+ mplus-fxd (10, 12 dots) An alternative to the "fixed".
5	+ mplus-hlv (10, 12 dots) An alternative to the "helvetica".
6	+ mplus-hlvw (10, 12 dots) The space between character compared with "mplus-hlv"
7	+ mplus-tms (10, 12 dots) An alternative to the "times".
8	+ mplus-sys (10 dots) Prepared for display in window titles and menu.
9
10	Japanese Fonts
11	+ mplus-gothic (12 dots) Fixed width fonts.
12	+ mplus-goth_p (12 dots) Roman characters set as proportional.
13		3
14	WWW: http://mplus-fonts.sourceforge.jp/	4	WWW: http://mplus-fonts.sourceforge.jp/
15		5

Lines 19-38 Link Here

(-)mplusfonts/pkg-req (-7 / +6 lines)
19	mkdir ${FONTDIR}	19	mkdir ${FONTDIR}
20	fi	20	fi
21		21
22	# font alias entry here!
23	TMPFILE=/tmp/install-fonts-alias-$$
24	for i in fonts.alias.e fonts.alias.j fonts.alias.euro ; do
25	cat ${PKG_PREFIX}/share/doc/mplusfonts/${i} >> ${TMPFILE}
26	done
27
28	if [ "$2" = "DEINSTALL" ] ; then	22	if [ "$2" = "DEINSTALL" ] ; then
		23	# font alias entry here!
		24	TMPFILE=/tmp/install-fonts-alias-$$
		25	for i in fonts.alias.e fonts.alias.j fonts.alias.euro ; do
		26	cat ${PKG_PREFIX}/share/doc/mplusfonts/${i} >> ${TMPFILE}
		27	done
29	echo "Updating ${FONTDIR}/fonts.alias"	28	echo "Updating ${FONTDIR}/fonts.alias"
30	cd ${FONTDIR}	29	cd ${FONTDIR}
31	touch fonts.alias	30	touch fonts.alias
32	cp fonts.alias fonts.alias.orig	31	cp fonts.alias fonts.alias.orig
33	grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias	32	grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
		33	rm -f fonts.alias.orig ${TMPFILE}
34	fi	34	fi
35	rm -f fonts.alias.orig ${TMPFILE}
36		35
37	echo "**********************************************************"	36	echo "**********************************************************"
38	echo "You should restart X server or do 'xset fp rehash' command"	37	echo "You should restart X server or do 'xset fp rehash' command"