Update to transfig-3.2.1.

4 files changed, 81 insertions, 19 deletions

diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 0354614b00c..5bdfa451524 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 13:04:39 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/07/03 14:24:42 frueauf Exp $
 #
 
-DISTNAME=		transfig.3.2
-PKGNAME=		transfig-3.2
-WRKSRC=			${WRKDIR}/transfig.3.2
+DISTNAME=		transfig.3.2.1
+PKGNAME=		transfig-3.2.1
+WRKSRC=			${WRKDIR}/transfig.3.2.1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications/drawing_tools/transfig
@@ -13,6 +13,8 @@ MAINTAINER=		root@garbled.futureone.com
 DEPENDS+=		xpm-3.4j:../../graphics/xpm
 DEPENDS+=		jpeg-6a:../../graphics/jpeg
 
+CONFLICTS=		transfig-3.2
+
 USE_IMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/files/md5 b/print/transfig/files/md5
index 86756967565..54913b1a4f1 100644
--- a/print/transfig/files/md5
+++ b/print/transfig/files/md5
@@ -1 +1 @@
-MD5 (transfig.3.2.tar.gz) = d5ded82f303c75a92bbf4bec568e7853
+MD5 (transfig.3.2.1.tar.gz) = 6bc1ecdd6b72da1bf3ad4ffcb7975fb9
diff --git a/print/transfig/patches/patch-aa b/print/transfig/patches/patch-aa
index bdb85b08af5..fcf25cce8d3 100644
--- a/print/transfig/patches/patch-aa
+++ b/print/transfig/patches/patch-aa
@@ -1,25 +1,34 @@
---- fig2dev/Imakefile.orig	Fri Aug 22 23:33:55 1997
-+++ fig2dev/Imakefile	Sun Feb  8 15:57:10 1998
-@@ -54,7 +54,7 @@
- XCOMM Finally, if your system doesn't have ndbm (the 'new' database subroutines)
- XCOMM remove the -DNDBM from the XPMDBM definition.
+--- fig2dev/Imakefile.orig	Wed Jul  1 01:52:50 1998
++++ fig2dev/Imakefile	Fri Jul  3 13:34:01 1998
+@@ -31,7 +31,7 @@
+ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
+ XCOMM and installed xfig.  This will be made automatic in the future.
+ 
+-XFIGLIBDIR =	/usr/local/lib/X11/xfig
++XFIGLIBDIR =	$(PROJECTROOT)/lib/X11/xfig
+ 
+ XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
+ XCOMM comment out NEED_STRERROR with an XCOMM comment.
+@@ -57,7 +57,7 @@
+ XCOMM You need version 3.4c of the XPM package.
+ XCOMM
  
 -XCOMM #define USEXPM
 +#define USEXPM
  
- XCOMM If you don't have the JPEG library or don't want to use JPEG, comment
- XCOMM out the following line
-@@ -78,7 +78,7 @@
+ XCOMM For Linux machines or any machines that have a separate library for
+ XCOMM the database management routines, uncomment the following line.
+@@ -136,7 +136,7 @@
  #ifdef USEXPM
  DUSEXPM = -DUSE_XPM
  XPMLIBDIR = $(USRLIBDIR)
 -XPMINC = -I$(INCDIR)
 +XPMINC = -I$(INCDIR)/X11
- XPMLIB = -L$(XPMLIBDIR) -lXpm -lX11
+ XPMLIBS = -L$(XPMLIBDIR) -lXpm -lX11
  XPMRGB = XPMRGB=$(LIBDIR)/rgb
- XPMDBM = -DNDBM
-@@ -137,8 +137,8 @@
- #ifdef USEJPEG
+ XPMDBM = $(USE_NDBM)
+@@ -153,8 +153,8 @@
+ DUSEJPEG = -DUSE_JPEG
  
  #ifdef USEINSTALLEDJPEG
 -JPEGLIBDIR = /usr/local/lib
@@ -28,4 +37,4 @@
 +JPEGINCDIR = $(LOCALBASE)/include
  JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
  #else
- JPEGLIBDIR = ../../jpeg
+ XCOMM this is relative to this directory (transfig/fig2dev)
diff --git a/print/transfig/pkg/PLIST b/print/transfig/pkg/PLIST
index 553146e11de..39903cb797f 100644
--- a/print/transfig/pkg/PLIST
+++ b/print/transfig/pkg/PLIST
@@ -1,10 +1,61 @@
-@comment $NetBSD: PLIST,v 1.1 1998/02/08 23:31:24 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/07/03 14:24:43 frueauf Exp $
 bin/transfig
 bin/fig2dev
 bin/fig2ps2tex
 bin/fig2ps2tex.sh
 bin/pic2tpic
+lib/X11/xfig/bitmaps/bricks.bmp
+lib/X11/xfig/bitmaps/circles.bmp
+lib/X11/xfig/bitmaps/crosshatch.bmp
+lib/X11/xfig/bitmaps/crosshatch30.bmp
+lib/X11/xfig/bitmaps/crosshatch45.bmp
+lib/X11/xfig/bitmaps/dash.bmp
+lib/X11/xfig/bitmaps/dashDot.bmp
+lib/X11/xfig/bitmaps/dashDotDot.bmp
+lib/X11/xfig/bitmaps/dashDotDotDot.bmp
+lib/X11/xfig/bitmaps/dot.bmp
+lib/X11/xfig/bitmaps/fishscales.bmp
+lib/X11/xfig/bitmaps/hexagons.bmp
+lib/X11/xfig/bitmaps/horiz_saw.bmp
+lib/X11/xfig/bitmaps/horizontal.bmp
+lib/X11/xfig/bitmaps/left30.bmp
+lib/X11/xfig/bitmaps/left45.bmp
+lib/X11/xfig/bitmaps/leftshingle.bmp
+lib/X11/xfig/bitmaps/octagons.bmp
+lib/X11/xfig/bitmaps/p13.bmp
+lib/X11/xfig/bitmaps/right30.bmp
+lib/X11/xfig/bitmaps/right45.bmp
+lib/X11/xfig/bitmaps/rightshingle.bmp
+lib/X11/xfig/bitmaps/small_fishscales.bmp
+lib/X11/xfig/bitmaps/sp0.bmp
+lib/X11/xfig/bitmaps/sp1.bmp
+lib/X11/xfig/bitmaps/sp10.bmp
+lib/X11/xfig/bitmaps/sp11.bmp
+lib/X11/xfig/bitmaps/sp12.bmp
+lib/X11/xfig/bitmaps/sp13.bmp
+lib/X11/xfig/bitmaps/sp14.bmp
+lib/X11/xfig/bitmaps/sp15.bmp
+lib/X11/xfig/bitmaps/sp16.bmp
+lib/X11/xfig/bitmaps/sp17.bmp
+lib/X11/xfig/bitmaps/sp18.bmp
+lib/X11/xfig/bitmaps/sp19.bmp
+lib/X11/xfig/bitmaps/sp2.bmp
+lib/X11/xfig/bitmaps/sp20.bmp
+lib/X11/xfig/bitmaps/sp3.bmp
+lib/X11/xfig/bitmaps/sp4.bmp
+lib/X11/xfig/bitmaps/sp5.bmp
+lib/X11/xfig/bitmaps/sp6.bmp
+lib/X11/xfig/bitmaps/sp7.bmp
+lib/X11/xfig/bitmaps/sp8.bmp
+lib/X11/xfig/bitmaps/sp9.bmp
+lib/X11/xfig/bitmaps/vert_bricks.bmp
+lib/X11/xfig/bitmaps/vert_leftshingle.bmp
+lib/X11/xfig/bitmaps/vert_rightshingle.bmp
+lib/X11/xfig/bitmaps/vert_saw.bmp
+lib/X11/xfig/bitmaps/vertical.bmp
 man/cat1/fig2dev.0
 man/cat1/fig2ps2tex.0
 man/cat1/pic2tpic.0
 man/cat1/transfig.0
+@dirrm lib/X11/xfig/bitmaps
+@dirrm lib/X11/xfig