Upgrade to version 2.7.

3 files changed, 31 insertions, 26 deletions

diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 717a37d30b1d..0bafbe384e70 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	xmbdfed
-# Version required:	2.2
+# Version required:	2.7
 # Date created:		June 20, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.1.1.1 1997/07/16 02:18:27 jfieber Exp $
+# $Id: Makefile,v 1.2 1997/09/21 17:54:26 jfieber Exp $
 #
 
-DISTNAME=	xmbdfed-2.3
+DISTNAME=	xmbdfed-2.7
 CATEGORIES=	x11
 MASTER_SITES=	ftp://crl.nmsu.edu/CLR/multiling/General/
 
 MAINTAINER=	jfieber@FreeBSD.ORG
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	xmbdfed-2.3.patch1 xmbdfed-2.3.patch2
+#PATCHFILES=	xmbdfed-2.3.patch1 xmbdfed-2.3.patch2
 
 USE_X11=	yes
 REQUIRES_MOTIF=	yes
diff --git a/x11-fonts/xmbdfed/distinfo b/x11-fonts/xmbdfed/distinfo
index 28e36f20a6aa..a00c4868f2fd 100644
--- a/x11-fonts/xmbdfed/distinfo
+++ b/x11-fonts/xmbdfed/distinfo
@@ -1,3 +1 @@
-MD5 (xmbdfed-2.3.tar.gz) = fb527e6e82be71c1e5c871f03f8226ae
-MD5 (xmbdfed-2.3.patch1) = 7b43cde41f1fbc7582ebd2a1e7a77d7b
-MD5 (xmbdfed-2.3.patch2) = 3bbeffa30bd7191b3db32c2c9eccc855
+MD5 (xmbdfed-2.7.tar.gz) = 09a050dd4a5ead9e08ccdcce763fb0d7
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index 9466db23bb2f..e9743a3caa9c 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -1,9 +1,9 @@
-*** Makefile.orig	Wed May 14 16:23:19 1997
---- Makefile	Fri Jun 20 22:46:47 1997
+*** Makefile.orig	Wed Nov  5 02:39:24 1997
+--- Makefile	Sun Nov  9 10:32:13 1997
 ***************
 *** 22,29 ****
   #
-  # $Id: Makefile,v 1.9 1997/05/14 21:23:14 mleisher Exp $
+  # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
   #
 ! CC = gcc
 ! CFLAGS = -g -Wall
@@ -12,7 +12,7 @@
   
 --- 22,29 ----
   #
-  # $Id: Makefile,v 1.9 1997/05/14 21:23:14 mleisher Exp $
+  # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
   #
 ! #CC = gcc
 ! #CFLAGS = -g -Wall
@@ -20,39 +20,46 @@
   OTHER = README COPYRIGHTS Makefile Imakefile.lesstif xmbdfedrc xmbdfed.man
   
 ***************
-*** 45,57 ****
+*** 55,61 ****
   # files with a ".gz" extension.  If you don't care about HBF fonts, just
   # comment this line out.
   #
 ! HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
   
   #
-  # Uncomment these for SunOS.
-  #
-! INCS = -I/usr/local/include/X11R5
-! LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11
-  
-  #
-  # Uncomment these for Solaris.
---- 45,57 ----
+  # Set the defines used for all files except the HBF support.
+--- 55,61 ----
   # files with a ".gz" extension.  If you don't care about HBF fonts, just
   # comment this line out.
   #
 ! HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""
   
   #
+  # Set the defines used for all files except the HBF support.
+***************
+*** 65,72 ****
+  #
   # Uncomment these for SunOS.
   #
-! #INCS = -I/usr/local/include/X11R5
-! #LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11
+! INCS = -I/usr/local/include/X11R5 $(FTYPE_INCS)
+! LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11 $(FTYPE_LIBS)
+  
+  #
+  # Uncomment these for Solaris.
+--- 65,72 ----
+  #
+  # Uncomment these for SunOS.
+  #
+! #INCS = -I/usr/local/include/X11R5 $(FTYPE_INCS)
+! #LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11 $(FTYPE_LIBS)
   
   #
   # Uncomment these for Solaris.
 ***************
-*** 65,72 ****
---- 65,81 ----
-  #INCS = -I/usr/X11/include -I/usr/Motif-2.0.1/include
-  #LIBS = -L/usr/Motif-2.0.1/lib -lXm -L/usr/X11/lib -lXpm -lXmu -lXt -lX11 -lSM -lICE
+*** 80,87 ****
+--- 80,96 ----
+  #INCS = -I/usr/X11/include -I/usr/Motif-2.0.1/include $(FTYPE_INCS)
+  #LIBS = -L/usr/Motif-2.0.1/lib -lXm -L/usr/X11/lib -lXpm -lXmu -lXt -lX11 -lSM -lICE $(FTYPE_LIBS)
   
 + INCS = -I${X11BASE}/include
 + LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext