diff --git a/print/transfig/Makefile b/print/transfig/Makefile index c29210c58fc..c37bc272260 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -3,11 +3,11 @@ # Date created: December 2, 1997 # Whom: Angelos D. Keromytis # -# $OpenBSD: Makefile,v 1.3 1998/06/13 23:27:02 marc Exp $ +# $OpenBSD: Makefile,v 1.4 1998/07/04 04:41:22 marc 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_SUBDIR= applications/drawing_tools/transfig 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 deleted file mode 100644 index 54c55fd4d5b..00000000000 --- a/print/transfig/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- fig2dev/read1_3.c.orig Mon Mar 3 14:38:36 1997 -+++ fig2dev/read1_3.c Mon Aug 25 21:44:46 1997 -@@ -29,6 +29,7 @@ - /*******************************************************************/ - #include - #include -+#include - #include - #include - #include "alloc.h" -@@ -52,7 +53,9 @@ - extern F_arrow *forward_arrow(), *backward_arrow(); - extern int figure_modified; - #ifndef __NetBSD__ -+#if !defined(BSD) || (BSD < 199306) - extern char *sys_errlist[]; -+#endif - extern int sys_nerr, errno; - #endif - diff --git a/print/transfig/patches/patch-ab b/print/transfig/patches/patch-ab deleted file mode 100644 index 38ee465addc..00000000000 --- a/print/transfig/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- fig2dev/dev/genps.c.orig Fri Aug 22 14:33:56 1997 -+++ fig2dev/dev/genps.c Mon Aug 25 21:40:30 1997 -@@ -48,7 +48,7 @@ - #include - #include - #ifndef __NetBSD__ --#if (! (defined(BSD) && (BSD >= 199306))) -+#if !defined(BSD) || (BSD < 199306) - extern char *sys_errlist[]; - #endif - #endif diff --git a/print/transfig/patches/patch-ac b/print/transfig/patches/patch-ac index 3e265c7d25e..3ee5582766c 100644 --- a/print/transfig/patches/patch-ac +++ b/print/transfig/patches/patch-ac @@ -1,26 +1,15 @@ ---- fig2dev/Imakefile.orig Mon Aug 25 20:51:04 1997 -+++ fig2dev/Imakefile Mon Aug 25 20:54:14 1997 -@@ -37,7 +37,7 @@ +--- fig2dev/Imakefile.orig Tue Jun 30 16:52:50 1998 ++++ fig2dev/Imakefile Fri Jul 3 21:19:57 1998 +@@ -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 -@@ -138,7 +138,7 @@ + XCOMM Unomment the #define for USEXPM if you want to use the XPM + XCOMM (color pixmap) package. +@@ -154,7 +154,7 @@ #ifdef USEINSTALLEDJPEG JPEGLIBDIR = /usr/local/lib @@ -28,17 +17,4 @@ +JPEGINCDIR = /usr/local/include JPEGLIB = -L$(JPEGLIBDIR) -ljpeg #else - JPEGLIBDIR = ../../jpeg -@@ -175,10 +175,10 @@ - INCLUDES = -I.. -I$(JPEGINCDIR) - - LOCAL_LIBRARIES = $(LIBTRANSFIG) $(JPEGLIB) --#if defined(NetBSDArchitecture) -+#if defined(NetBSDArchitecture) - SYS_LIBRARIES = $(XPMLIB) $(DBMLIB) -lm -lcompat - #else --SYS_LIBRARIES = $(XPMLIB) $(DBMLIB) -lm -+SYS_LIBRARIES = $(XPMLIB) $(DBMLIB) -lm -lcompat - #endif - DEPLIBS = $(LIBTRANSFIG) - + XCOMM this is relative to this directory (transfig/fig2dev) diff --git a/print/transfig/patches/patch-ad b/print/transfig/patches/patch-ad deleted file mode 100644 index 74936a10649..00000000000 --- a/print/transfig/patches/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- fig2dev/read.c.orig Fri Jun 20 14:55:50 1997 -+++ fig2dev/read.c Mon Aug 25 21:42:00 1997 -@@ -56,7 +56,7 @@ - strerror(e) - int e; - { --#if (! (defined(BSD) && (BSD >= 199306)) && !defined(__NetBSD__)) -+#if !defined(BSD) || (BSD < 199306) - extern char *sys_errlist[]; - #endif - return sys_errlist[e];