6 files changed, 101 insertions, 74 deletions

diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile
index e5217228cbde..f88e59eaaef1 100644
--- a/japanese/monafonts/Makefile
+++ b/japanese/monafonts/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	monafonts
-PORTVERSION=	20010323
+PORTVERSION=	2.0
+PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://members.tripod.co.jp/s42335/mona/
-DISTNAME=	mona-${PORTVERSION}
+MASTER_SITES=	http://members.tripod.co.jp/s42335/mona/dist/
+EXTRACT_SUFX=	.tar.bz2.bin
 
 MAINTAINER=	nobutaka@nobutaka.com
 
 FONTSDIR=	lib/X11/fonts/local
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-ALL_TARGET=	fonts
+ALL_TARGET=	bdf
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
diff --git a/japanese/monafonts/distinfo b/japanese/monafonts/distinfo
index 3c47bfddbe4d..a37c0236a85e 100644
--- a/japanese/monafonts/distinfo
+++ b/japanese/monafonts/distinfo
@@ -1 +1 @@
-MD5 (mona-20010323.tar.gz) = 304eed80a9201cf0322adf616f6ae53d
+MD5 (monafonts-2.0.tar.bz2.bin) = ac775efccd9cf488f30468e6fbf9bb4b
diff --git a/japanese/monafonts/files/patch-aa b/japanese/monafonts/files/patch-aa
index 0cc8cb79275a..7545795860a7 100644
--- a/japanese/monafonts/files/patch-aa
+++ b/japanese/monafonts/files/patch-aa
@@ -1,27 +1,25 @@
---- Makefile.orig	Fri Mar 23 21:07:28 2001
-+++ Makefile	Thu May 10 02:43:39 2001
-@@ -3,11 +3,11 @@
+--- Makefile.orig	Sun Jun 17 22:05:12 2001
++++ Makefile	Mon Jun 18 01:22:27 2001
+@@ -15,8 +15,8 @@
+ #GZIP_CMD	= compress
+ #GZIP_SUFFIX	= Z
  
- SED	= sed
- PERL	= perl
--X11BIN	= /usr/X11R6/bin
--GZIP	= gzip
--AWK	= gawk
-+X11BIN	= ${PREFIX}/bin
-+GZIP_CMD?=	gzip
-+AWK	= awk
+-X11BINDIR	= /usr/X11R6/bin
+-X11FONTDIR	= /usr/X11R6/lib/X11/fonts/local
++X11BINDIR	= ${PREFIX}/bin
++X11FONTDIR	= ${PREFIX}/lib/X11/fonts/local
+ BDFTOPCF	= $(X11BINDIR)/bdftopcf
+ MKDIRHIER	= $(X11BINDIR)/mkdirhier
+ MKFONTDIR	= $(X11BINDIR)/mkfontdir
+@@ -36,7 +36,10 @@
+ 	mona8x16a mona8x16aB mona8x16aI mona8x16aBI \
+ 	monak12 monak12B monak12I monak12BI \
+ 	monak14 monak14B monak14I monak14BI \
+-	monak16 monak16B monak16I monak16BI
++	monak16 monak16B monak16I monak16BI \
++	mona6x12r mona6x12rB mona6x12rI mona6x12rBI \
++	mona7x14r mona7x14rB mona7x14rI mona7x14rBI \
++	mona8x16r mona8x16rB mona8x16rI mona8x16rBI
  
--FONTDIR = /usr/X11R6/lib/X11/fonts/misc
-+FONTDIR = ${PREFIX}/lib/X11/fonts/local
+ ## Dependencies
  
- BDFTOPCF= $(X11BIN)/bdftopcf
- MKFONTDIR=$(X11BIN)/mkfontdir
-@@ -86,7 +86,7 @@
- 
- install: fonts
- 	if [ ! -e $(FONTDIR) ] ; then mkdir -p $(FONTDIR); fi
--	for i in $(FONTS); do $(GZIP) -c $$i > $(FONTDIR)/$$i.gz; done
-+	for i in $(FONTS); do $(GZIP_CMD) -c $$i > $(FONTDIR)/$$i.gz; done
- 	$(MKFONTDIR) $(FONTDIR)
- 
- clean:
diff --git a/japanese/monafonts/files/patch-ab b/japanese/monafonts/files/patch-ab
deleted file mode 100644
index aed38348270a..000000000000
--- a/japanese/monafonts/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- tools/mkitalic	Sun Feb 11 09:09:45 2001
-+++ tools/mkitalic	Thu Feb 15 20:40:19 2001
-@@ -1,4 +1,4 @@
--#!/usr/bin/gawk -f
-+#!/usr/bin/awk -f
- #
- # -- makes BDF font italic
- #     version 0.00.1
diff --git a/japanese/monafonts/pkg-plist b/japanese/monafonts/pkg-plist
index b8cd2c446133..88ab46fc3250 100644
--- a/japanese/monafonts/pkg-plist
+++ b/japanese/monafonts/pkg-plist
@@ -1,21 +1,39 @@
-%%FONTSDIR%%/mona12aB.pcf.gz
-%%FONTSDIR%%/mona12aI.pcf.gz
-%%FONTSDIR%%/mona12aR.pcf.gz
-%%FONTSDIR%%/mona12kB.pcf.gz
-%%FONTSDIR%%/mona12kI.pcf.gz
-%%FONTSDIR%%/mona12kR.pcf.gz
-%%FONTSDIR%%/mona12rB.pcf.gz
-%%FONTSDIR%%/mona12rI.pcf.gz
-%%FONTSDIR%%/mona12rR.pcf.gz
-%%FONTSDIR%%/mona16aB.pcf.gz
-%%FONTSDIR%%/mona16aI.pcf.gz
-%%FONTSDIR%%/mona16aR.pcf.gz
-%%FONTSDIR%%/mona16kB.pcf.gz
-%%FONTSDIR%%/mona16kI.pcf.gz
-%%FONTSDIR%%/mona16kR.pcf.gz
-%%FONTSDIR%%/mona16rB.pcf.gz
-%%FONTSDIR%%/mona16rI.pcf.gz
-%%FONTSDIR%%/mona16rR.pcf.gz
+%%FONTSDIR%%/mona6x12a.pcf.gz
+%%FONTSDIR%%/mona6x12aB.pcf.gz
+%%FONTSDIR%%/mona6x12aBI.pcf.gz
+%%FONTSDIR%%/mona6x12aI.pcf.gz
+%%FONTSDIR%%/mona6x12r.pcf.gz
+%%FONTSDIR%%/mona6x12rB.pcf.gz
+%%FONTSDIR%%/mona6x12rBI.pcf.gz
+%%FONTSDIR%%/mona6x12rI.pcf.gz
+%%FONTSDIR%%/mona7x14a.pcf.gz
+%%FONTSDIR%%/mona7x14aB.pcf.gz
+%%FONTSDIR%%/mona7x14aBI.pcf.gz
+%%FONTSDIR%%/mona7x14aI.pcf.gz
+%%FONTSDIR%%/mona7x14r.pcf.gz
+%%FONTSDIR%%/mona7x14rB.pcf.gz
+%%FONTSDIR%%/mona7x14rBI.pcf.gz
+%%FONTSDIR%%/mona7x14rI.pcf.gz
+%%FONTSDIR%%/mona8x16a.pcf.gz
+%%FONTSDIR%%/mona8x16aB.pcf.gz
+%%FONTSDIR%%/mona8x16aBI.pcf.gz
+%%FONTSDIR%%/mona8x16aI.pcf.gz
+%%FONTSDIR%%/mona8x16r.pcf.gz
+%%FONTSDIR%%/mona8x16rB.pcf.gz
+%%FONTSDIR%%/mona8x16rBI.pcf.gz
+%%FONTSDIR%%/mona8x16rI.pcf.gz
+%%FONTSDIR%%/monak12.pcf.gz
+%%FONTSDIR%%/monak12B.pcf.gz
+%%FONTSDIR%%/monak12BI.pcf.gz
+%%FONTSDIR%%/monak12I.pcf.gz
+%%FONTSDIR%%/monak14.pcf.gz
+%%FONTSDIR%%/monak14B.pcf.gz
+%%FONTSDIR%%/monak14BI.pcf.gz
+%%FONTSDIR%%/monak14I.pcf.gz
+%%FONTSDIR%%/monak16.pcf.gz
+%%FONTSDIR%%/monak16B.pcf.gz
+%%FONTSDIR%%/monak16BI.pcf.gz
+%%FONTSDIR%%/monak16I.pcf.gz
 @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 --git a/japanese/monafonts/pkg-req b/japanese/monafonts/pkg-req
index e68d231d4589..17b9b93d487f 100644
--- a/japanese/monafonts/pkg-req
+++ b/japanese/monafonts/pkg-req
@@ -22,24 +22,42 @@ fi
 # font alias entry here!
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
-mona12aR -mona-gothic-medium-r-normal--12-120-75-75-p-60-iso8859-1
-mona16aB -mona-gothic-bold-r-normal--16-150-75-75-p-80-iso8859-1
-mona16kR -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
-mona12kB -mona-gothic-bold-r-normal--12-120-75-75-p-120-jisx0208.1990-0
-mona16aI -mona-gothic-medium-i-normal--16-150-75-75-p-80-iso8859-1
-mona12kI -mona-gothic-medium-i-normal--12-120-75-75-p-120-jisx0208.1990-0
-mona16aR -mona-gothic-medium-r-normal--16-150-75-75-p-80-iso8859-1
-mona12aB -mona-gothic-bold-r-normal--12-120-75-75-p-60-iso8859-1
-mona12kR -mona-gothic-medium-r-normal--12-120-75-75-p-120-jisx0208.1990-0
-mona16kB -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
-mona12aI -mona-gothic-medium-i-normal--12-120-75-75-p-60-iso8859-1
-mona16kI -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
-mona12rR -mona-gothic-medium-r-normal--12-120-75-75-p-60-jisx0201.1976-0
-mona16rB -mona-gothic-bold-r-normal--16-150-75-75-p-80-jisx0201.1976-0
-mona16rI -mona-gothic-medium-i-normal--16-150-75-75-p-80-jisx0201.1976-0
-mona16rR -mona-gothic-medium-r-normal--16-150-75-75-p-80-jisx0201.1976-0
-mona12rB -mona-gothic-bold-r-normal--12-120-75-75-p-60-jisx0201.1976-0
-mona12rI -mona-gothic-medium-i-normal--12-120-75-75-p-60-jisx0201.1976-0
+mona6x12a -mona-gothic-medium-r-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aB -mona-gothic-bold-r-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-iso8859-1
+mona6x12aI -mona-gothic-medium-i-normal--12-110-75-75-p-60-iso8859-1
+mona6x12r -mona-gothic-medium-r-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rB -mona-gothic-bold-r-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rBI -mona-gothic-bold-i-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona6x12rI -mona-gothic-medium-i-normal--12-110-75-75-p-60-jisx0201.1976-0
+mona7x14a -mona-gothic-medium-r-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aB -mona-gothic-bold-r-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-iso8859-1
+mona7x14aI -mona-gothic-medium-i-normal--14-130-75-75-p-70-iso8859-1
+mona7x14r -mona-gothic-medium-r-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rB -mona-gothic-bold-r-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rBI -mona-gothic-bold-i-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona7x14rI -mona-gothic-medium-i-normal--14-130-75-75-p-70-jisx0201.1976-0
+mona8x16a -mona-gothic-medium-r-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aB -mona-gothic-bold-r-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-iso8859-1
+mona8x16aI -mona-gothic-medium-i-normal--16-150-75-75-p-80-iso8859-1
+mona8x16r -mona-gothic-medium-r-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rB -mona-gothic-bold-r-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rBI -mona-gothic-bold-i-normal--16-150-75-75-p-80-jisx0201.1976-0
+mona8x16rI -mona-gothic-medium-i-normal--16-150-75-75-p-80-jisx0201.1976-0
+monak12 -mona-gothic-medium-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12B -mona-gothic-bold-r-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12BI -mona-gothic-bold-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak12I -mona-gothic-medium-i-normal--12-110-75-75-p-120-jisx0208.1990-0
+monak14 -mona-gothic-medium-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14B -mona-gothic-bold-r-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14BI -mona-gothic-bold-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak14I -mona-gothic-medium-i-normal--14-130-75-75-p-140-jisx0208.1990-0
+monak16 -mona-gothic-medium-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16B -mona-gothic-bold-r-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16BI -mona-gothic-bold-i-normal--16-150-75-75-p-160-jisx0208.1990-0
+monak16I -mona-gothic-medium-i-normal--16-150-75-75-p-160-jisx0208.1990-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"