1) Move install code to Makefile rather than in patch.

2) Use type1inst to generale fonts.scale, and remove another patch.

#2 suggested by:	Pedro F. Giffuni <giffunip@yahoo.com>

4 files changed, 13 insertions, 48 deletions

diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 9641a2b5c87f..e1a492822424 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -7,19 +7,28 @@
 
 PORTNAME=	freefonts
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A collection of ATM fonts (not all free) from the CICA archives
 
+BUILD_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
+
 RESTRICTED=	"see accompanying .license files"
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
+do-build:
+	@cd ${WRKSRC}/freefont && ${LOCALBASE}/bin/type1inst -silent -quiet -nolog >/dev/null 2>&1
+	@${RM} ${WRKSRC}/freefont/Fontmap.bak
+
+do-install:
+	@${MKDIR} ${PREFIX}/lib/X11/fonts/freefont
+	@${INSTALL_DATA} ${WRKSRC}/freefont/* ${PREFIX}/lib/X11/fonts/freefont
+
 post-install:
-	@${RM} ${PREFIX}/lib/X11/fonts/freefont/fonts.dir.orig
 	@${CAT} ${DESCR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/freefonts/files/patch-aa b/x11-fonts/freefonts/files/patch-aa
deleted file mode 100644
index c08cc575057c..000000000000
--- a/x11-fonts/freefonts/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.orig	Fri Aug  2 11:30:35 1996
-+++ Makefile	Fri Aug  2 11:32:02 1996
-@@ -0,0 +1,11 @@
-+ 
-+DESTDIR=$(PREFIX)/lib/X11/fonts
-+ 
-+all:
-+	@echo nothing to be done for \`$@\'
-+	@echo this is an install-only port.
-+ 
-+install:
-+	[ -d $(DESTDIR) ] || mkdir -p $(DESTDIR)
-+	tar -cf - freefont |(cd ${DESTDIR}; tar -xf -)
-+
diff --git a/x11-fonts/freefonts/files/patch-ab b/x11-fonts/freefonts/files/patch-ab
deleted file mode 100644
index bc08d2b7c33d..000000000000
--- a/x11-fonts/freefonts/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- freefont/fonts.dir.orig	Thu Mar 23 23:38:51 1995
-+++ freefont/fonts.dir	Wed Jul  1 15:54:37 1998
-@@ -47,19 +47,19 @@
- goudyo.pfb -freefont-GoudyOldStyle-normal-r-normal--0-0-0-0-p-0-iso8859-1
- goudyob.pfb -freefont-GoudyOldStyle-bold-r-normal--0-0-0-0-p-0-iso8859-1
- goudyoi.pfb -freefont-GoudyOldStyle-normal-i-normal--0-0-0-0-p-0-iso8859-1
--igloolas.pfb -freefont-IglooLaser-normal-normal--0-0-0-0-p-0-iso8859-1
--linotext.pfb -freefont-Linotext-normal-normal--0-0-0-0-p-0-iso8859-1
--luxembrg.pfb -freefont-Luxembourg-normal-normal--0-0-0-0-p-0-iso8859-1
--manzanit.pfb -freefont-Manzanita-normal-normal--0-0-0-0-p-0-iso8859-1
--mazama.pfb -freefont-Mazama-normal-normal--0-0-0-0-p-0-iso8859-1
--muriel.pfb -freefont-Muriel-normal-normal--0-0-0-0-p-0-iso8859-1
--old_town.pfb -freefont-OldTown-normal-normal--0-0-0-0-p-0-iso8859-1
-+igloolas.pfb -freefont-IglooLaser-normal-r-normal--0-0-0-0-p-0-iso8859-1
-+linotext.pfb -freefont-Linotext-normal-r-normal--0-0-0-0-p-0-iso8859-1
-+luxembrg.pfb -freefont-Luxembourg-normal-r-normal--0-0-0-0-p-0-iso8859-1
-+manzanit.pfb -freefont-Manzanita-normal-r-normal--0-0-0-0-p-0-iso8859-1
-+mazama.pfb -freefont-Mazama-normal-r-normal--0-0-0-0-p-0-iso8859-1
-+muriel.pfb -freefont-Muriel-normal-r-normal--0-0-0-0-p-0-iso8859-1
-+old_town.pfb -freefont-OldTown-normal-r-normal--0-0-0-0-p-0-iso8859-1
- oldcnd_r.pfb -freefont-OldTown-normal-r-condensed--0-0-0-0-p-0-iso8859-1
- oldext_r.pfb -freefont-OldTown-normal-r-extended--0-0-0-0-p-0-iso8859-1
- oldtwn_r.pfb -freefont-OldTown-normal-r-normal--0-0-0-0-p-0-iso8859-1
--oswaldbl.pfb -freefont-OSWALDblack-normal-normal--0-0-0-0-p-0-iso8859-1
-+oswaldbl.pfb -freefont-OSWALDblack-normal-r-normal--0-0-0-0-p-0-iso8859-1
- parkave.pfb -freefont-ParkAvenue-normal-r-normal--0-0-0-0-p-0-iso8859-1
--postanti.pfb -freefont-PostAntiquaRoman-normal-normal--0-0-0-0-p-0-iso8859-1
-+postanti.pfb -freefont-PostAntiquaRoman-normal-r-normal--0-0-0-0-p-0-iso8859-1
- rechtman.pfb -freefont-RechtmanScript-normal-r-normal--0-0-0-0-p-0-iso8859-1
- roosthea.pfb -freefont-RoostHeavy-normal-r-normal--0-0-0-0-p-0-iso8859-1
- rudelsbe.pfb -freefont-Rudelsberg-normal-r-normal--0-0-0-0-p-0-iso8859-1
diff --git a/x11-fonts/freefonts/pkg-plist b/x11-fonts/freefonts/pkg-plist
index 804a89cc1b33..d7a303dd85d9 100644
--- a/x11-fonts/freefonts/pkg-plist
+++ b/x11-fonts/freefonts/pkg-plist
@@ -32,8 +32,8 @@ lib/X11/fonts/freefont/crf_____.pfb
 lib/X11/fonts/freefont/crillee.license
 lib/X11/fonts/freefont/crillee.pfb
 lib/X11/fonts/freefont/cunei.pfb
-lib/X11/fonts/freefont/dabkc____.license
 lib/X11/fonts/freefont/dabkc___.pfb
+lib/X11/fonts/freefont/dabkc____.license
 lib/X11/fonts/freefont/dos_____.pfb
 lib/X11/fonts/freefont/dragonwi.license
 lib/X11/fonts/freefont/dragonwi.pfb
@@ -48,6 +48,7 @@ lib/X11/fonts/freefont/erasltra.pfb
 lib/X11/fonts/freefont/erasmed.pfb
 lib/X11/fonts/freefont/florence.pfb
 lib/X11/fonts/freefont/fonts.dir
+lib/X11/fonts/freefont/fonts.scale
 lib/X11/fonts/freefont/frquad.pfb
 lib/X11/fonts/freefont/frquadb.pfb
 lib/X11/fonts/freefont/ftpstrps.pfb