Upgrade from 3.7 to 3.9.

PR:		12873
Submitted by:	Christian Weisgerber <naddy@mips.rhein-neckar.de>

3 files changed, 54 insertions, 20 deletions

diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index c92425876cee..761bd9c79806 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -3,21 +3,30 @@
 # Date created:		June 20, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.8 1998/10/30 07:45:50 asami Exp $
+# $Id: Makefile,v 1.9 1999/01/16 23:25:56 jfieber Exp $
 #
 
-DISTNAME=	xmbdfed-3.7
+DISTNAME=	xmbdfed-3.9
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://crl.nmsu.edu/CLR/multiling/General/
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	xmbdfed-3.7.patch1
+PATCHFILES=	xmbdfed-3.9.patch1 xmbdfed-3.9.patch2
 
 MAINTAINER=	jfieber@FreeBSD.ORG
 
+.if defined(USE_FREETYPE)
+LIB_DEPENDS=	ttf.3:${PORTSDIR}/print/freetype
+.endif
+
 USE_X_PREFIX=	yes
 REQUIRES_MOTIF=	yes
 
 MAN1=		xmbdfed.1
 
+.if !defined(USE_FREETYPE)
+pre-extract:
+	@${ECHO} "You can add the optional FreeType import capability by defining USE_FREETYPE"
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-fonts/xmbdfed/distinfo b/x11-fonts/xmbdfed/distinfo
index 891670708e43..be501f136649 100644
--- a/x11-fonts/xmbdfed/distinfo
+++ b/x11-fonts/xmbdfed/distinfo
@@ -1,2 +1,3 @@
-MD5 (xmbdfed-3.7.tar.gz) = 4271bdf58369897760427ab5d38d6f6c
-MD5 (xmbdfed-3.7.patch1) = 1508ba39c6cc95d91e7439879ee6935d
+MD5 (xmbdfed-3.9.tar.gz) = cf46985aaf12442cb2fcd1a806195a13
+MD5 (xmbdfed-3.9.patch1) = 53a94bd5c99bd9687fc3505aec6506aa
+MD5 (xmbdfed-3.9.patch2) = 4c43818a68c0777e2a3adffaa52232a3
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index de7c6634acdd..4e4a1ee51d45 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -1,17 +1,43 @@
---- Makefile.orig	Wed Oct 28 18:23:15 1998
-+++ Makefile	Wed Oct 28 18:26:30 1998
+--- Makefile.orig	Mon May  3 19:17:50 1999
++++ Makefile	Thu Jul 29 20:44:35 1999
 @@ -23,8 +23,8 @@
  #
- # $Id: Makefile,v 1.3 1998/10/17 18:34:10 mleisher Exp $
+ # $Id: Makefile,v 1.8 1999/05/03 17:17:50 mleisher Exp $
  #
 -CC = gcc
 -CFLAGS = -g -Wall
 +#CC = gcc
 +#CFLAGS = -g -Wall
  
- OTHER = README COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
+ OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
          xmbdfedrc xmbdfed.man
-@@ -65,7 +65,7 @@
+@@ -47,17 +47,19 @@
+ # Uncomment these if you have the FreeType library and want to use it to
+ # import TrueType fonts.
+ #
+-#FTYPE_INCS = -I/usr/local/include
+-#FTYPE_LIBS = -L/user/local/lib -lttf
+-#FTYPE_DEFS = -DHAVE_FREETYPE
++.if defined(USE_FREETYPE)
++FTYPE_INCS = -I${LOCALBASE}/include
++FTYPE_LIBS = -L${LOCALBASE}/lib -lttf
++FTYPE_DEFS = -DHAVE_FREETYPE
++.endif
+ 
+ #
+ # Uncomment these if you have the hbf.h and hbf.c files in the current
+ # directory and the patch has been applied.
+ #
+-#HBF_HDRS = hbf.h
+-#HBF_OBJS = hbf.o
+-#HBF_DEFS = -DHAVE_HBF
++HBF_HDRS = hbf.h
++HBF_OBJS = hbf.o
++HBF_DEFS = -DHAVE_HBF
+ 
+ #
+ # Specify the various defines needed for HBF fonts.  If you do not have GNU
+@@ -65,7 +67,7 @@
  # files with a ".gz" extension.  If you don't care about HBF fonts, just
  # comment this line out.
  #
@@ -20,7 +46,7 @@
  
  #
  # Set the defines used for all files except the HBF support.
-@@ -83,9 +83,9 @@
+@@ -83,9 +85,9 @@
  #
  # Uncomment these for Solaris.
  #
@@ -33,21 +59,19 @@
  
  #
  # Uncomment these for Linux.
-@@ -114,7 +114,17 @@
- #INCS = $(FTYPE_INCS)
- #LIBS = -lXm -lXmu -lXt -lXext -lX11 -lsocket $(FTYPE_LIBS)
+@@ -131,7 +133,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
-+LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4
++INCS = -I${X11BASE}/include ${FTYPE_INCS}
++LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4 ${FTYPE_LIBS}
 +
 +
  all: xmbdfed
 +
 +install: xmbdfed
-+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-+		xmbdfed ${X11BASE}/bin/xmbdfed
-+	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-+		xmbdfed.man ${X11BASE}/man/man1/xmbdfed.1
++	${BSD_INSTALL_PROGRAM} xmbdfed ${PREFIX}/bin/xmbdfed
++	${BSD_INSTALL_MAN} xmbdfed.man ${PREFIX}/man/man1/xmbdfed.1
  
  xmbdfed: $(OBJS)
  	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)