4 files changed, 22 insertions, 85 deletions

diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index a8071c64499c..a6cbfd7c5500 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	mplusfonts
-PORTVERSION=	1.2.5
+PORTVERSION=	2.0.5
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://downloads.sourceforge.jp/mplus-fonts/2464/ \
+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>
@@ -26,14 +27,11 @@ RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 DOCS=		INSTALL_E LICENSE_E README_E \
-		INSTALL_J LICENSE_J README_J \
-		README_mplusj10
+		INSTALL_J LICENSE_J README_J
 
 FONTSDIR=	${PREFIX}/lib/X11/fonts/local
 PLIST_SUB=	FONTSDIR=${FONTSDIR:S/${PREFIX}\///}
 
-do-build:
-
 pre-install:
 	@${MKDIR} ${DOCSDIR}
 .for i in e j
@@ -49,7 +47,7 @@ pre-install:
 
 do-install:
 	cd ${WRKSRC} && \
-		${WRKSRC}/install_mplus_fonts ${FONTSDIR}
+		DESTDIR="${FONTSDIR}" ${WRKSRC}/install_mplus_fonts
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
diff --git a/japanese/font-mplus/distinfo b/japanese/font-mplus/distinfo
index 2ed22efc147f..406064233191 100644
--- a/japanese/font-mplus/distinfo
+++ b/japanese/font-mplus/distinfo
@@ -1 +1 @@
-MD5 (mplus_bitmap_fonts-1.2.5.tar.gz) = bd30bd8ee0b8f375d3b307f2aa243de1
+MD5 (mplus_bitmap_fonts-2.0.5.tar.gz) = 937051f553fe5825b37de187cde0a437
diff --git a/japanese/font-mplus/files/patch-install_mplus_fonts b/japanese/font-mplus/files/patch-install_mplus_fonts
index 4e90cb0f861a..a67c16e56dd0 100644
--- a/japanese/font-mplus/files/patch-install_mplus_fonts
+++ b/japanese/font-mplus/files/patch-install_mplus_fonts
@@ -1,90 +1,30 @@
---- 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_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/mplus.BAK ]; then
--	echo "remove: '$PREFIX/mplus.BAK' directory"
--	rm -rf $PREFIX/mplus.BAK
+-if [ -d ${PREFIX}.BAK ]; then
+-	echo "remove: '${PREFIX}.BAK' directory"
+-	rm -rf ${PREFIX}.BAK
 -fi
--if [ -d $PREFIX/mplus ]; then
--	echo "backup: present 'mplus' directory to 'mplus.BAK'"
--	mv $PREFIX/mplus $PREFIX/mplus.BAK
+-if [ -d $PREFIX ]; then
+-	echo "backup: present '${PREFIX##/*/}' directory to '${PREFIX##/*/}.BAK'"
+-	mv ${PREFIX} ${PREFIX}.BAK
 -fi
--echo "create: new '$PREFIX/mplus' directory"
--mkdir -p $PREFIX/mplus
+-echo "create: new '$PREFIX' directory"
+-mkdir -p $PREFIX
 -
  # 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"
--	bdftopcf $f | gzip > $PREFIX/mplus/$b.pcf.gz
-+	bdftopcf $f | gzip > $PREFIX/$b.pcf.gz
+ echo -e "\nInstall M+ bitmap fonts E (iso8859-1)..."
+ cd fonts_e
+@@ -55,7 +43,7 @@
+ 	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
 +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"
diff --git a/japanese/font-mplus/pkg-plist b/japanese/font-mplus/pkg-plist
index 24ed25b4025c..6caf21722189 100644
--- a/japanese/font-mplus/pkg-plist
+++ b/japanese/font-mplus/pkg-plist
@@ -54,7 +54,6 @@
 %%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
 @exec cat  %D/%%DOCSDIR%%/fonts.alias >> %D/%%FONTSDIR%%/fonts.alias