Attachment #34327 for bug #55804

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




#

PORTNAME=	mplusfonts
PORTVERSION=	2.0.5
CATEGORIES=	japanese x11-fonts
MASTER_SITES=	http://downloads.sourceforge.jp/mplus-fonts/5030/ \
		http://wids.net/archive/mplusfonts/distfiles/
DISTNAME=	mplus_bitmap_fonts-${PORTVERSION}

MAINTAINER=	Ys@PixyGarden.net
COMMENT=	12x13 dots X11 kanji fonts with simple and readable design

NO_BUILD=	yes
USE_X_PREFIX=	yes

.include <bsd.port.pre.mk>


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}\///}

do-build:

pre-install:
	@${MKDIR} ${DOCSDIR}
.for i in e j


do-install:
	cd ${WRKSRC} && \
		DESTDIR="${FONTSDIR}" ${WRKSRC}/install_mplus_fonts
.if !defined(NOPORTDOCS)
.for i in ${DOCS}
	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}

Line 1 Link Here

(-)mplusfonts/distinfo (-1 / +1 lines)
1	MD5 (mplus_bitmap_fonts-1.2.5.tar.gz) = bd30bd8ee0b8f375d3b307f2aa243de1	1	MD5 (mplus_bitmap_fonts-2.0.5.tar.gz) = 937051f553fe5825b37de187cde0a437




--- install_mplus_fonts.orig	Mon Aug 18 13:26:45 2003
+++ install_mplus_fonts	Mon Aug 18 13:32:03 2003
@@ -29,18 +29,6 @@
 
 
 # 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
@@ -20,19 +20,6 @@
 
 
 
-
-# Backup/Create mplus directory
-if [ -d ${PREFIX}.BAK ]; then
-	echo "remove: '${PREFIX}.BAK' directory"
-	rm -rf ${PREFIX}.BAK
-fi
-if [ -d $PREFIX ]; then
-	echo "backup: present '${PREFIX##/*/}' directory to '${PREFIX##/*/}.BAK'"
-	mv ${PREFIX} ${PREFIX}.BAK
-fi
-echo "create: new '$PREFIX' directory"
-mkdir -p $PREFIX
-
 # Install M+ bitmap fonts E
 echo -e "\nInstall M+ bitmap fonts E (iso8859-1)..."
 cd fonts_e
@@ -55,7 +43,7 @@
 	bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
 	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/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
-		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"
 	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"
-	cat fonts.alias >> $PREFIX/mplus/fonts.alias
+	cat fonts.alias >> $PREFIX/fonts.alias
 	cd -
 fi
 
@@ -128,12 +115,12 @@
 	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
 
 #	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
 
@@ -158,7 +145,5 @@
 # Finish
 echo ""
 echo "create: fonts.dir file"
-mkfontdir $PREFIX/mplus
-echo -n "xset fp rehash..."
-xset fp rehash &&
+mkfontdir $PREFIX
 echo " done"

Lines 54-60 Link Here

(-)mplusfonts/pkg-plist (-1 lines)
54	%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J	54	%%PORTDOCS%%%%DOCSDIR%%/LICENSE_J
55	%%PORTDOCS%%%%DOCSDIR%%/README_E	55	%%PORTDOCS%%%%DOCSDIR%%/README_E
56	%%PORTDOCS%%%%DOCSDIR%%/README_J	56	%%PORTDOCS%%%%DOCSDIR%%/README_J
57	%%PORTDOCS%%%%DOCSDIR%%/README_mplusj10
58	@dirrm %%DOCSDIR%%	57	@dirrm %%DOCSDIR%%
59	@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir	58	@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
60	@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias	59	@exec cat %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias

Return to bug 55804

Lines 6-20 Link Here

(-)mplusfonts/Makefile (-7 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= mplusfonts	8	PORTNAME= mplusfonts
9	PORTVERSION= 1.2.5	9	PORTVERSION= 2.0.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/5030/ \
12	http://wids.net/archive/mplusfonts/distfiles/	12	http://wids.net/archive/mplusfonts/distfiles/
13	DISTNAME= mplus_bitmap_fonts-${PORTVERSION}	13	DISTNAME= mplus_bitmap_fonts-${PORTVERSION}
14		14
15	MAINTAINER= Ys@PixyGarden.net	15	MAINTAINER= Ys@PixyGarden.net
16	COMMENT= 12x13 dots X11 kanji fonts with simple and readable design	16	COMMENT= 12x13 dots X11 kanji fonts with simple and readable design
17		17
		18	NO_BUILD= yes
18	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
19		20
20	.include <bsd.port.pre.mk>	21	.include <bsd.port.pre.mk>
Lines 26-39 Link Here
26		27
27	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}	28	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
28	DOCS= INSTALL_E LICENSE_E README_E \	29	DOCS= INSTALL_E LICENSE_E README_E \
29	INSTALL_J LICENSE_J README_J \	30	INSTALL_J LICENSE_J README_J
30	README_mplusj10
31		31
32	FONTSDIR= ${PREFIX}/lib/X11/fonts/local	32	FONTSDIR= ${PREFIX}/lib/X11/fonts/local
33	PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}	33	PLIST_SUB= FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
34		34
35	do-build:
36
37	pre-install:	35	pre-install:
38	@${MKDIR} ${DOCSDIR}	36	@${MKDIR} ${DOCSDIR}
39	.for i in e j	37	.for i in e j
Lines 49-55 Link Here
49		47
50	do-install:	48	do-install:
51	cd ${WRKSRC} && \	49	cd ${WRKSRC} && \
52	${WRKSRC}/install_mplus_fonts ${FONTSDIR}	50	DESTDIR="${FONTSDIR}" ${WRKSRC}/install_mplus_fonts
53	.if !defined(NOPORTDOCS)	51	.if !defined(NOPORTDOCS)
54	.for i in ${DOCS}	52	.for i in ${DOCS}
55	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}	53	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}

Lines 1-90 Link Here

(-)mplusfonts/files/patch-install_mplus_fonts (-76 / +16 lines)
1	--- install_mplus_fonts.orig Sat May 31 00:02:38 2003	1	--- install_mplus_fonts.orig Mon Aug 18 13:26:45 2003
2	+++ install_mplus_fonts Sat May 31 00:06:47 2003	2	+++ install_mplus_fonts Mon Aug 18 13:32:03 2003
3	@@ -2,7 +2,7 @@	3	@@ -29,18 +29,6 @@
4		4
5		5
6	# Install "mplus" directory [ /usr/X11R6/lib/X11/fonts ]
7	-PREFIX=/usr/X11R6/lib/X11/fonts
8	+PREFIX=$1
9		6
10	# Install M+ bitmap fonts EURO (iso8859-15) [ YES or NO ]
11	EURO15=YES
12	@@ -20,19 +20,6 @@
13
14
15
16	-
17	-# Backup/Create mplus directory	7	-# Backup/Create mplus directory
18	-if [ -d $PREFIX/mplus.BAK ]; then	8	-if [ -d ${PREFIX}.BAK ]; then
19	- echo "remove: '$PREFIX/mplus.BAK' directory"	9	- echo "remove: '${PREFIX}.BAK' directory"
20	- rm -rf $PREFIX/mplus.BAK	10	- rm -rf ${PREFIX}.BAK
21	-fi	11	-fi
22	-if [ -d $PREFIX/mplus ]; then	12	-if [ -d $PREFIX ]; then
23	- echo "backup: present 'mplus' directory to 'mplus.BAK'"	13	- echo "backup: present '${PREFIX##//}' directory to '${PREFIX##//}.BAK'"
24	- mv $PREFIX/mplus $PREFIX/mplus.BAK	14	- mv ${PREFIX} ${PREFIX}.BAK
25	-fi	15	-fi
26	-echo "create: new '$PREFIX/mplus' directory"	16	-echo "create: new '$PREFIX' directory"
27	-mkdir -p $PREFIX/mplus	17	-mkdir -p $PREFIX
28	-	18	-
29	# Install M+ bitmap fonts E	19	# Install M+ bitmap fonts E
30	echo ""	20	echo -e "\nInstall M+ bitmap fonts E (iso8859-1)..."
31	echo "Install M+ bitmap fonts E (iso8859-1)..."	21	cd fonts_e
32	@@ -45,10 +32,10 @@	22	@@ -55,7 +43,7 @@
33	do	23	bdftopcf $f \| gzip > $PREFIX/$b.pcf.gz
34	b=`basename $f .bdf`
35	echo "create: $b.pcf.gz"
36	- bdftopcf $f \| gzip > $PREFIX/mplus/$b.pcf.gz
37	+ bdftopcf $f \| gzip > $PREFIX/$b.pcf.gz
38	done	24	done
39	echo "create: fonts.alias for M+ bitmap fonts E"	25	echo "create: fonts.alias for M+ bitmap fonts E"
40	-cat fonts.alias > $PREFIX/mplus/fonts.alias	26	-cat fonts.alias > $PREFIX/fonts.alias
41	+cat fonts.alias >> $PREFIX/fonts.alias	27	+cat fonts.alias >> $PREFIX/fonts.alias
42	cd -	28	cd -
43		29
44	# Install M+ bitmap fonts EURO	30	# Install M+ bitmap fonts EURO
45	@@ -63,18 +50,18 @@
46	cp ../$b.bdf ./
47	patch $b.bdf $b.diff
48	mv $b.bdf $b-euro.bdf
49	- bdftopcf $b-euro.bdf \| gzip > $PREFIX/mplus/$b-euro.pcf.gz
50	+ bdftopcf $b-euro.bdf \| gzip > $PREFIX/$b-euro.pcf.gz
51	done
52
53	echo "create: mplus_h12rw-euro.pcf.gz"
54	awk '/^SWIDTH/{$2 += 80} /^DWIDTH/{$2 += 1} {print}' \
55	mplus_h12r-euro.bdf \| sed 's/hlv/hlvw/' > mplus_h12rw-euro.bdf
56	bdftopcf mplus_h12rw-euro.bdf \
57	- \| gzip > $PREFIX/mplus/mplus_h12rw-euro.pcf.gz
58	+ \| gzip > $PREFIX/mplus_h12rw-euro.pcf.gz
59
60	# rm $b-euro.bdf
61	echo "create: fonts.alias for M+ bitmap fonts EURO"
62	- cat fonts.alias >> $PREFIX/mplus/fonts.alias
63	+ cat fonts.alias >> $PREFIX/fonts.alias
64	cd -
65	fi
66
67	@@ -128,12 +115,12 @@
68	do
69	b=`basename $f .bdf`
70	echo "create: $b.pcf.gz"
71	- bdftopcf $f \| gzip > $PREFIX/mplus/$b.pcf.gz
72	+ bdftopcf $f \| gzip > $PREFIX/$b.pcf.gz
73	done
74
75	# rm mplus_j1*b.bdf
76	echo "create: fonts.alias for M+ bitmap fonts J"
77	- cat fonts.alias >> $PREFIX/mplus/fonts.alias
78	+ cat fonts.alias >> $PREFIX/fonts.alias
79	cd -
80	fi
81
82	@@ -158,7 +145,5 @@
83	# Finish
84	echo ""
85	echo "create: fonts.dir file"
86	-mkfontdir $PREFIX/mplus
87	-echo -n "xset fp rehash..."
88	-xset fp rehash &&
89	+mkfontdir $PREFIX
90	echo " done"