Upgrade and unbreak.

3 files changed, 59 insertions, 84 deletions

diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 1c79d9ed8ed5..2c8fb990e6de 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -1,21 +1,19 @@
 # New ports collection makefile for:	xmbdfed
-# Version required:	2.7
+# Version required:	3.4
 # Date created:		June 20, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.5 1998/08/05 09:31:50 asami Exp $
+# $Id: Makefile,v 1.6 1998/08/07 22:43:10 asami Exp $
 #
 
-DISTNAME=	xmbdfed-2.7
+DISTNAME=	xmbdfed-3.4
 CATEGORIES=	x11-fonts
 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
-
-BROKEN=		old version not available, new version needs debugging
+PATCHFILES=	xmbdfed-3.4.patch1
 
 USE_X_PREFIX=	yes
 REQUIRES_MOTIF=	yes
diff --git a/x11-fonts/xmbdfed/distinfo b/x11-fonts/xmbdfed/distinfo
index a00c4868f2fd..f274bcb55870 100644
--- a/x11-fonts/xmbdfed/distinfo
+++ b/x11-fonts/xmbdfed/distinfo
@@ -1 +1,2 @@
-MD5 (xmbdfed-2.7.tar.gz) = 09a050dd4a5ead9e08ccdcce763fb0d7
+MD5 (xmbdfed-3.4.tar.gz) = 3876da04c817d571393b371ce0ccaf38
+MD5 (xmbdfed-3.4.patch1) = f06549c36cc653e34610c25303c9829e
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index e9743a3caa9c..de7c6634acdd 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -1,77 +1,53 @@
-*** Makefile.orig	Wed Nov  5 02:39:24 1997
---- Makefile	Sun Nov  9 10:32:13 1997
-***************
-*** 22,29 ****
-  #
-  # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
-  #
-! CC = gcc
-! CFLAGS = -g -Wall
-  
-  OTHER = README COPYRIGHTS Makefile Imakefile.lesstif xmbdfedrc xmbdfed.man
-  
---- 22,29 ----
-  #
-  # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
-  #
-! #CC = gcc
-! #CFLAGS = -g -Wall
-  
-  OTHER = README COPYRIGHTS Makefile Imakefile.lesstif xmbdfedrc xmbdfed.man
-  
-***************
-*** 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\""
-  
-  #
-  # 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 $(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.
-***************
-*** 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
-+ 
-  
-  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
-  
-  xmbdfed: $(OBJS)
-  	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)
+--- Makefile.orig	Wed Oct 28 18:23:15 1998
++++ Makefile	Wed Oct 28 18:26:30 1998
+@@ -23,8 +23,8 @@
+ #
+ # $Id: Makefile,v 1.3 1998/10/17 18:34:10 mleisher Exp $
+ #
+-CC = gcc
+-CFLAGS = -g -Wall
++#CC = gcc
++#CFLAGS = -g -Wall
+ 
+ OTHER = README COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
+         xmbdfedrc xmbdfed.man
+@@ -65,7 +65,7 @@
+ # 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\""
++HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""
+ 
+ #
+ # Set the defines used for all files except the HBF support.
+@@ -83,9 +83,9 @@
+ #
+ # Uncomment these for Solaris.
+ #
+-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
+-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
+-       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
++#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
++#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
++#       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
+ 
+ #
+ # Uncomment these for Linux.
+@@ -114,7 +114,17 @@
+ #INCS = $(FTYPE_INCS)
+ #LIBS = -lXm -lXmu -lXt -lXext -lX11 -lsocket $(FTYPE_LIBS)
+ 
++INCS = -I${X11BASE}/include
++LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4
++
++
+ 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
+ 
+ xmbdfed: $(OBJS)
+ 	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)