3 files changed, 27 insertions, 47 deletions

diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index b795239a40c1..43a1d787d8cf 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	transfig
-# Version required:	3.2
+# Version required:	3.2.1
 # Date created:		9 August 1996
 # Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.21 1998/09/17 00:32:53 asami Exp $
+# $Id: Makefile,v 1.22 1998/10/03 21:34:09 steve Exp $
 #
 
-DISTNAME=	transfig.3.2
-PKGNAME=	transfig-3.2
+DISTNAME=	transfig.3.2.1
+PKGNAME=	transfig-3.2.1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} ${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	applications/drawing_tools/transfig
-DISTFILES=	transfig.3.2.tar.gz transfig.3.2.ja_JP.EUC.ps.gz
+DISTFILES=	transfig.3.2.1.tar.gz transfig.3.2.ja_JP.EUC.ps.gz
 
 MAINTAINER=	chuckr@freebsd.org
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
 
 USE_IMAKE=	yes
-EXTRACT_ONLY=	transfig.3.2.tar.gz
+EXTRACT_ONLY=	transfig.3.2.1.tar.gz
 MAN1=		fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
 
 post-install:
diff --git a/print/transfig/distinfo b/print/transfig/distinfo
index b0b6bfcc9754..7ee8a25ccebd 100644
--- a/print/transfig/distinfo
+++ b/print/transfig/distinfo
@@ -1,2 +1,2 @@
-MD5 (transfig.3.2.tar.gz) = d5ded82f303c75a92bbf4bec568e7853
+MD5 (transfig.3.2.1.tar.gz) = 6bc1ecdd6b72da1bf3ad4ffcb7975fb9
 MD5 (transfig.3.2.ja_JP.EUC.ps.gz) = c608af518c15cf44d57a6abe3ce86b2f
diff --git a/print/transfig/files/patch-ac b/print/transfig/files/patch-ac
index 3c2e9933a509..1df60976a65e 100644
--- a/print/transfig/files/patch-ac
+++ b/print/transfig/files/patch-ac
@@ -1,36 +1,29 @@
---- fig2dev/Imakefile.orig	Fri Aug 22 23:33:55 1997
-+++ fig2dev/Imakefile	Sat Sep 27 14:35:49 1997
-@@ -37,7 +37,7 @@
+--- fig2dev/Imakefile.orig	Wed Jul  1 08:52:50 1998
++++ fig2dev/Imakefile	Tue Jan 19 11:14:16 1999
+@@ -42,7 +42,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
 -XCOMM USEINLINE = -DUSE_INLINE
 +USEINLINE = -DUSE_INLINE
  
- XCOMM Uncomment the XPM variables here  if you have the XPM (color pixmap)
- XCOMM package and you would like to allow XPM files.
-@@ -100,8 +100,8 @@
- XCOMM     Hint: Users of LaTeX2e will probably want to include both of these
- XCOMM     options; users of LaTeX 2.09 will probably want to include neither.
- 
--XCOMM DDNFSS = -DNFSS
--XCOMM DDEPSF = -DEPSF
-+DDNFSS = -DNFSS
-+DDEPSF = -DEPSF
- 
- XCOMM For Linux machines or any machines that have a separate library for
- XCOMM the database management routines, uncomment the following line
-@@ -116,7 +116,8 @@
+ XCOMM Unomment the #define for USEXPM if you want to use the XPM
+ XCOMM (color pixmap) package.
+@@ -112,11 +112,11 @@
  
  XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
  
--XCOMM I18N_DEFS = -DI18N -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
-+I18N_DEFS = -DI18N
+-XCOMM #define I18N
++#define I18N
+ 
+ #ifdef I18N
+ I18N_DEFS = -DI18N 
+-I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
 +I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(PREFIX)/lib/X11/fig2dev\"'
+ #endif
  
  DEFINES = $(NEED_STRERROR) $(HAVE_NO_STRCASECMP) $(HAVE_NO_STRNCASECMP) $(USEINLINE) \
- 	$(I18N_DEFS)
-@@ -138,7 +139,7 @@
+@@ -154,7 +154,7 @@
  
  #ifdef USEINSTALLEDJPEG
  JPEGLIBDIR = /usr/local/lib
@@ -38,26 +31,13 @@
 +JPEGINCDIR = /usr/local/include
  JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
  #else
- JPEGLIBDIR = ../../jpeg
-@@ -161,7 +162,7 @@
- #endif
- 
- DEVDEFINES = $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(XPMDBM) \
--		$(DDNFSS) $(DDEPSF) $(DDA4) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEFS)
-+		$(DDNFSS) $(DDEPSF) $(DDA4) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
- 
- #define IHaveSubdirs
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-@@ -175,10 +176,10 @@
- INCLUDES = -I.. -I$(JPEGINCDIR)
+ XCOMM this is relative to this directory (transfig/fig2dev)
+@@ -182,7 +182,7 @@
+ INCLUDES = -I..
  
  LOCAL_LIBRARIES = $(LIBTRANSFIG) $(JPEGLIB)
 -#if defined(NetBSDArchitecture)
-+#if defined(NetBSDArchitecture) 
- SYS_LIBRARIES = $(XPMLIB) $(DBMLIB) -lm -lcompat
++#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
+ SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm -lcompat
  #else
--SYS_LIBRARIES = $(XPMLIB) $(DBMLIB) -lm
-+SYS_LIBRARIES = $(XPMLIB) $(XLIB) $(DBMLIB) -lm -lcompat
- #endif
- DEPLIBS = $(LIBTRANSFIG)
- 
+ SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm