[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: UPDATE: graphics/xfig -- please test



Christian Weisgerber <naddy_(_at_)_mips_(_dot_)_inka_(_dot_)_de> wrote:

> How about updating to 3.2.4?

And here's the corresponding transfig update.
People who use these packages, please test.

Index: Makefile
===================================================================
RCS file: /cvs/ports/print/transfig/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	28 Oct 2002 13:40:41 -0000	1.24
+++ Makefile	3 Apr 2003 00:22:38 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=	"tools to convert Xfig's .fig files"
 
-VERSION=	3.2.3d
+VERSION=	3.2.4
 DISTNAME=	transfig.${VERSION}
 PKGNAME=	transfig-${VERSION}
 CATEGORIES=	print
@@ -19,15 +19,12 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MAKE_FLAGS=	LOCALBASE="${LOCALBASE}" X11BASE="${X11BASE}"
-FAKE_FLAGS+=	${MAKE_FLAGS} DESTDIR="${WRKINST}"
-
 CONFIGURE_STYLE= imake
 
 FLAVORS=	a4
 FLAVOR?=
 
-.if ${FLAVOR:L} == "a4"
+.if ${FLAVOR:L:Ma4}
 PATCH_LIST=	patch-* a4-*
 .endif
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/transfig/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	21 Mar 2002 20:20:51 -0000	1.1
+++ distinfo	3 Apr 2003 00:22:38 -0000
@@ -1,3 +1,3 @@
-MD5 (transfig.3.2.3d.tar.gz) = 4fbf4184fe2df4fe9bb5130b6e19907c
-RMD160 (transfig.3.2.3d.tar.gz) = 3f6fc56f36c0a6783d85038db1dc2a7989b66fbb
-SHA1 (transfig.3.2.3d.tar.gz) = b3e1e27b3115b18ba5dbd8db5d68415c3b7aa7a6
+MD5 (transfig.3.2.4.tar.gz) = 742de0f7a3cae74d247bbd0c70dd9dd7
+RMD160 (transfig.3.2.4.tar.gz) = 7b1238f3d36c6dc30033dca43348e3c7d3116610
+SHA1 (transfig.3.2.4.tar.gz) = edfec1865dbfe9e7a06ae8be016f1a489b3d307d
Index: patches/a4-patch
===================================================================
RCS file: /cvs/ports/print/transfig/patches/a4-patch,v
retrieving revision 1.3
diff -u -r1.3 a4-patch
--- patches/a4-patch	19 Jun 2001 16:41:03 -0000	1.3
+++ patches/a4-patch	3 Apr 2003 00:22:38 -0000
@@ -1,9 +1,10 @@
---- fig2dev/Imakefile.orig	Tue Jun 19 12:36:02 2001
-+++ fig2dev/Imakefile	Tue Jun 19 12:36:02 2001
-@@ -114,7 +114,7 @@
+$OpenBSD$
+--- fig2dev/Imakefile.orig	Thu Apr  3 01:29:22 2003
++++ fig2dev/Imakefile	Thu Apr  3 01:29:32 2003
+@@ -82,7 +82,7 @@ XPMINC = -I${X11BASE}/include/X11
  
  XCOMM ****************
- XCOMM Uncomment the following to set paper size to A4
+ XCOMM Uncomment the following to set default paper size to A4
 -XCOMM DDA4 = -DA4
 +DDA4 = -DA4
  
Index: patches/patch-fig2dev_Imakefile
===================================================================
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Imakefile,v
retrieving revision 1.4
diff -u -r1.4 patch-fig2dev_Imakefile
--- patches/patch-fig2dev_Imakefile	19 Jul 2002 07:32:10 -0000	1.4
+++ patches/patch-fig2dev_Imakefile	3 Apr 2003 00:22:38 -0000
@@ -1,8 +1,9 @@
---- fig2dev/Imakefile.orig	Thu Apr 19 19:19:38 2001
-+++ fig2dev/Imakefile	Fri Jul 19 09:22:56 2002
-@@ -28,13 +28,13 @@ XCOMM ******
+$OpenBSD$
+--- fig2dev/Imakefile.orig	Thu Dec 19 18:33:44 2002
++++ fig2dev/Imakefile	Thu Apr  3 01:33:40 2003
+@@ -20,13 +20,13 @@ XCOMM ******
  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.
+ XCOMM and installed xfig.
  
 -XFIGLIBDIR =	/usr/local/lib/X11/xfig
 +XFIGLIBDIR =	$(LIBDIR)/xfig
@@ -16,7 +17,7 @@
  
  XCOMM The following probably only applies to Windows 9x/NT:
  XCOMM If your system can open files in text and binary modes and has the
-@@ -47,7 +47,7 @@ XCOMM Uncomment the following line if yo
+@@ -39,7 +39,7 @@ XCOMM Uncomment the following line if yo
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -25,8 +26,8 @@
  
  XCOMM ****************
  XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -65,8 +65,8 @@ XCOMM PNG (Portable Network Graphics) fi
- #define USEPNG
+@@ -60,8 +60,8 @@ XCOMM Redefine the following if your PNG
+ XCOMM are in different places
  
  #ifdef USEPNG
 -PNGLIBDIR = $(USRLIBDIR)
@@ -36,7 +37,7 @@
  #endif
  
  XCOMM ****************
-@@ -78,11 +78,11 @@ XCOMM Change XPMLIBDIR if necessary to p
+@@ -73,11 +73,11 @@ XCOMM Change XPMLIBDIR if necessary to p
  XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
  XCOMM
  
@@ -51,29 +52,16 @@
  #endif
  
  XCOMM ****************
-@@ -104,8 +104,8 @@ XCOMM You must have version 5b or newer 
- 
- #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
--JPEGINCDIR = /usr/include/X11
-+JPEGLIBDIR = ${LOCALBASE}/lib
-+JPEGINCDIR = ${LOCALBASE}/include
- #else
- JPEGLIBDIR = ../jpeg
- JPEGINCDIR = $(JPEGLIBDIR)
-@@ -158,8 +158,8 @@ XCOMM Uncomment the next line if you wan
+@@ -126,7 +126,7 @@ XCOMM Comment out the next line if you h
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
 -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
--I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
 +FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
-+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(FIG2DEV_LIBDIR)\"'
+ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  install::
- 	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
-@@ -185,7 +185,7 @@ XCOMM **********************************
+@@ -154,7 +154,7 @@ XCOMM **********************************
  XCOMM *** You shouldn't have to change anything below this point ***
  XCOMM **************************************************************
  
@@ -82,12 +70,12 @@
  
  #ifdef USEPNG
  DUSEPNG = -DUSE_PNG
-@@ -218,7 +218,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
+@@ -177,7 +177,7 @@ DEFINES = $(NEED_STRERROR) $(HAVE_NO_STR
  
- IMAKE_DEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM)
+ IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
  
--DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(JPEGINC) $(DDNFSS) $(DDA4) \
-+DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(JPEGINC) $(DDNFSS) $(DDA4) \
+-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
++DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
  		$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
  
  #define IHaveSubdirs
Index: patches/patch-transfig_sys_c
===================================================================
RCS file: patches/patch-transfig_sys_c
diff -N patches/patch-transfig_sys_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-transfig_sys_c	3 Apr 2003 00:22:38 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- transfig/sys.c.orig	Thu Apr  3 01:43:14 2003
++++ transfig/sys.c	Thu Apr  3 01:43:45 2003
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "transfig.h"
+ 
+ #define MAXSYS 10000
Index: patches/patch-transfig_transfig_c
===================================================================
RCS file: patches/patch-transfig_transfig_c
diff -N patches/patch-transfig_transfig_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-transfig_transfig_c	3 Apr 2003 00:22:38 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- transfig/transfig.c.orig	Thu Apr  3 01:42:55 2003
++++ transfig/transfig.c	Thu Apr  3 01:43:09 2003
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "patchlevel.h"
+ #include "transfig.h"
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/transfig/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST	19 Jun 2001 16:41:04 -0000	1.5
+++ pkg/PLIST	3 Apr 2003 00:22:38 -0000
@@ -1,10 +1,12 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.5 2001/06/19 16:41:04 brad Exp $
+_(_at_)_comment $OpenBSD$
 bin/fig2dev
 bin/fig2ps2tex
 bin/fig2ps2tex.sh
 bin/pic2tpic
 bin/transfig
 lib/X11/fig2dev/cs_CZ.ps
+lib/X11/fig2dev/hr_HR.ps
+lib/X11/fig2dev/hu_HU.ps
 lib/X11/fig2dev/ja.ps
 lib/X11/fig2dev/ja_JP.EUC.ps
 lib/X11/fig2dev/ja_JP.eucJP.ps
@@ -16,6 +18,10 @@
 lib/X11/fig2dev/ko_KR.eucKR.ps
 lib/X11/fig2dev/ko_KR.ps
 lib/X11/fig2dev/korean.ps
+lib/X11/fig2dev/pl_PL.ps
+lib/X11/fig2dev/ro_RO.ps
+lib/X11/fig2dev/sk_SK.ps
+lib/X11/fig2dev/sl_SI.ps
 lib/X11/xfig/bitmaps/bricks.bmp
 lib/X11/xfig/bitmaps/circles.bmp
 lib/X11/xfig/bitmaps/crosshatch.bmp
-- 
Christian "naddy" Weisgerber                          naddy_(_at_)_mips_(_dot_)_inka_(_dot_)_de



Visit your host, monkey.org