Update to 4.7, patch 1. Notable changes in this release:

* Completely revamped the PSF font import/export system to make it
  actually useable.
* Changed to use FreeType 2.
* Miscellaneous fixes.

5 files changed, 36 insertions, 43 deletions

diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 8f678d114bf2..3159a8b2a4b1 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	xmbdfed
-PORTVERSION=	4.5.1
+PORTVERSION=	4.7.1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://crl.nmsu.edu/~mleisher/ \
-		ftp://crl.nmsu.edu/CLR/multiling/General/
+MASTER_SITES=	http://crl.nmsu.edu/~mleisher/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${PORTNAME}-${PORTVERSION:R}-patch1
+PATCHFILES=	${DISTNAME}-patch1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Motif tool for editing X11 bitmap fonts
 
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_FREETYPE=	yes
 USE_MOTIF=	yes
 
 MAN1=		xmbdfed.1
diff --git a/x11-fonts/xmbdfed/distinfo b/x11-fonts/xmbdfed/distinfo
index 69654027be30..8d1023c0e235 100644
--- a/x11-fonts/xmbdfed/distinfo
+++ b/x11-fonts/xmbdfed/distinfo
@@ -1,4 +1,4 @@
-MD5 (xmbdfed-4.5.tar.gz) = 8420d39931a0674784f3fd0c0f1f9d6a
-SIZE (xmbdfed-4.5.tar.gz) = 282055
-MD5 (xmbdfed-4.5-patch1) = 46a319341604ebd83e54ba9330b06ed6
-SIZE (xmbdfed-4.5-patch1) = 4226
+MD5 (xmbdfed-4.7.tar.bz2) = 27872bb7473e5d64d9a24281ae6ad3d9
+SIZE (xmbdfed-4.7.tar.bz2) = 208877
+MD5 (xmbdfed-4.7-patch1) = f18ea8561330db825bd7edcb61b0758a
+SIZE (xmbdfed-4.7-patch1) = 549
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index 0d4143648db4..d709efed2e2a 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -1,8 +1,11 @@
---- Makefile.orig	Mon May  3 21:17:50 1999
-+++ Makefile	Mon Feb 28 22:53:25 2000
-@@ -23,8 +23,8 @@
+
+$FreeBSD$
+
+--- Makefile.orig	Tue Feb 17 16:24:06 2004
++++ Makefile	Thu Mar 18 18:47:04 2004
+@@ -22,8 +22,8 @@
  #
- # $Id: Makefile,v 1.8 1999/05/03 17:17:50 mleisher Exp $
+ # $Id: Makefile,v 1.13 2004/02/17 15:24:06 mleisher Exp $
  #
 -CC = gcc
 -CFLAGS = -g -Wall
@@ -11,15 +14,15 @@
  
  OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
          xmbdfedrc xmbdfed.man
-@@ -47,17 +47,17 @@
+@@ -46,17 +46,17 @@
  # Uncomment these if you have the FreeType library and want to use it to
- # import TrueType fonts.
+ # import OpenType fonts.
  #
 -#FTYPE_INCS = -I/usr/local/include
--#FTYPE_LIBS = -L/user/local/lib -lttf
+-#FTYPE_LIBS = -L/usr/local/lib -lfreetype
 -#FTYPE_DEFS = -DHAVE_FREETYPE
-+FTYPE_INCS = -I${LOCALBASE}/include/freetype1/freetype
-+FTYPE_LIBS = -L${LOCALBASE}/lib -lttf
++FTYPE_INCS!= freetype-config --cflags
++FTYPE_LIBS!= freetype-config --libs
 +FTYPE_DEFS = -DHAVE_FREETYPE
  
  #
@@ -35,7 +38,7 @@
  
  #
  # Specify the various defines needed for HBF fonts.  If you do not have GNU
-@@ -65,7 +65,7 @@
+@@ -64,7 +64,7 @@
  # files with a ".gz" extension.  If you don't care about HBF fonts, just
  # comment this line out.
  #
@@ -44,7 +47,7 @@
  
  #
  # Set the defines used for all files except the HBF support.
-@@ -83,9 +83,9 @@
+@@ -82,9 +82,9 @@
  #
  # Uncomment these for Solaris.
  #
@@ -57,17 +60,17 @@
  
  #
  # Uncomment these for Linux.
-@@ -131,7 +131,15 @@
+@@ -129,7 +129,15 @@
  #LIBS = -L/usr/Motif-1.2/lib32 -lXm \
  #       -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
  
 +INCS = -I${X11BASE}/include ${FTYPE_INCS}
-+LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4 ${FTYPE_LIBS}
-+
++LIBS = -L${X11BASE}/lib ${MOTIFLIB} \
++       -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4 ${FTYPE_LIBS}
 +
  all: xmbdfed
 +
-+install: xmbdfed
++install:
 +	${BSD_INSTALL_PROGRAM} xmbdfed ${PREFIX}/bin/xmbdfed
 +	${BSD_INSTALL_MAN} xmbdfed.man ${PREFIX}/man/man1/xmbdfed.1
  
diff --git a/x11-fonts/xmbdfed/files/patch-ab b/x11-fonts/xmbdfed/files/patch-ab
index c86e38871cb3..8308fc029a86 100644
--- a/x11-fonts/xmbdfed/files/patch-ab
+++ b/x11-fonts/xmbdfed/files/patch-ab
@@ -1,11 +1,14 @@
---- xmbdfed.c.orig	Sat Oct 23 15:43:37 1999
-+++ xmbdfed.c	Mon Nov  1 13:34:23 1999
-@@ -102,7 +102,7 @@
+
+$FreeBSD$
+
+--- xmbdfed.c.orig	Thu Mar 18 18:32:37 2004
++++ xmbdfed.c	Thu Mar 18 18:33:17 2004
+@@ -103,7 +103,7 @@
  #define HGINFO "\"%s\" %04lX (%02X,%02X)\nascent %d descent %d right %d left %d"
  
  static String fallback_resources[] = {
--    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-100-100-100-p-82-iso8859-1",
-+/*    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-100-100-100-p-82-iso8859-1", */
+-    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-140-75-75-p-82-iso8859-1",
++/*    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-140-75-75-p-82-iso8859-1", */
      (String) NULL,
  };
  
diff --git a/x11-fonts/xmbdfed/files/patch-ac b/x11-fonts/xmbdfed/files/patch-ac
deleted file mode 100644
index 752d45ee8464..000000000000
--- a/x11-fonts/xmbdfed/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- bdf.h.orig	Fri Mar 17 05:08:51 2000
-+++ bdf.h	Sat May 20 04:47:50 2000
-@@ -41,7 +41,11 @@
- 
- #ifdef HAVE_FREETYPE
- #include <freetype.h>
-+#ifdef __FreeBSD__
-+#include <ftxsbit.h>
-+#else
- #include <extend/ftxsbit.h>
-+#endif
- #endif /* HAVE_FREETYPE */
- 
- #ifdef __cplusplus