matching transfig for the xfig update. I'm not sure why the newlines
were added to the fprintf() in the gensvg.c patch, anyone remember?
those lines have changed format quite a bit upstream now, so I haven't
carried that across.
works for oga@ on amd64, anyone else like to try it?
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/transfig/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 15 Sep 2007 22:50:19 -0000 1.29
+++ Makefile 20 Aug 2008 12:23:53 -0000
@@ -2,15 +2,13 @@
COMMENT= tools to convert Xfig's .fig files
-VERSION= 3.2.4
+VERSION= 3.2.5
DISTNAME= transfig.${VERSION}
-PKGNAME= transfig-${VERSION}p0
+PKGNAME= transfig-${VERSION}
CATEGORIES= print
-MASTER_SITES= ftp://www-epb.lbl.gov/xfig/ \
- ftp://www-epb.lbl.gov/xfig/previous_versions/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcj/}
-LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
- png.>=2::graphics/png
+LIB_DEPENDS= png.>=2::graphics/png
RUN_DEPENDS= :ghostscript-*:print/ghostscript/gnu \
:netpbm->=9.19:graphics/netpbm
@@ -18,6 +16,8 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+
+PATCHORIG= .pat.orig
CONFIGURE_STYLE=imake
USE_X11= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/transfig/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 5 Apr 2007 16:20:19 -0000 1.4
+++ distinfo 20 Aug 2008 12:23:53 -0000
@@ -1,5 +1,5 @@
-MD5 (transfig.3.2.4.tar.gz) = dC3g96PK500ke70McN2d1w==
-RMD160 (transfig.3.2.4.tar.gz) = exI489NsbcMAM9ykM0jjx9MRZhA=
-SHA1 (transfig.3.2.4.tar.gz) = 7f7Bhl2/6eegaui+AW8aSJs9MH0=
-SHA256 (transfig.3.2.4.tar.gz) = pLWTI9l4Zt57cmdcEdwzuVu0eaacrn2D+YupcqHVSRA=
-SIZE (transfig.3.2.4.tar.gz) = 326284
+MD5 (transfig.3.2.5.tar.gz) = Oyz/3SVSmuWHfjBfKarm0Q==
+RMD160 (transfig.3.2.5.tar.gz) = Q1YVve1mIiUSfqVk/HRunLAFjxg=
+SHA1 (transfig.3.2.5.tar.gz) = JlfBBNAJnctFZah2KpVDMQ5V52c=
+SHA256 (transfig.3.2.5.tar.gz) = 6lpXJMj6HctSUxxNROyKWYMLLcLaEeVh4VJA6N0W0EM=
+SIZE (transfig.3.2.5.tar.gz) = 394296
Index: patches/patch-fig2dev_Imakefile
===================================================================
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Imakefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-fig2dev_Imakefile
--- patches/patch-fig2dev_Imakefile 4 Apr 2003 14:28:36 -0000 1.5
+++ patches/patch-fig2dev_Imakefile 20 Aug 2008 12:23:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-fig2dev_Imakefile,v 1.5 2003/04/04 14:28:36 naddy Exp $
---- fig2dev/Imakefile.orig Thu Dec 19 18:33:44 2002
-+++ fig2dev/Imakefile Thu Apr 3 01:33:40 2003
-@@ -20,13 +20,13 @@ XCOMM ******
+--- fig2dev/Imakefile.orig Thu Oct 27 17:56:02 2005
++++ fig2dev/Imakefile Wed Aug 20 13:20:52 2008
+@@ -34,7 +34,7 @@ XCOMM ******
XCOMM You should point XFIGLIBDIR to the same directory you did when you
compiled
XCOMM and installed xfig.
@@ -9,15 +9,8 @@ $OpenBSD: patch-fig2dev_Imakefile,v 1.5
+XFIGLIBDIR = $(LIBDIR)/xfig
XCOMM ******
- XCOMM If your system has the strerror() function (doesn't have sys_errlist)
then
- XCOMM comment out NEED_STRERROR with an XCOMM comment.
-
--NEED_STRERROR = -DNEED_STRERROR
-+XCOMM NEED_STRERROR = -DNEED_STRERROR
-
- 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
-@@ -39,7 +39,7 @@ XCOMM Uncomment the following line if yo
+ XCOMM If your system doesn't have the strerror() function (has sys_errlist)
then
+@@ -53,7 +53,7 @@ XCOMM Uncomment the following line if your compiler su
XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
@@ -26,23 +19,20 @@ $OpenBSD: patch-fig2dev_Imakefile,v 1.5
XCOMM ****************
XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -60,8 +60,8 @@ XCOMM Redefine the following if your PNG
- XCOMM are in different places
+@@ -74,9 +74,9 @@ XCOMM Redefine the following if your PNG library, zlib
+ XCOMM file are in different places
#ifdef USEPNG
-PNGLIBDIR = $(USRLIBDIR)
--PNGINC = -I/usr/include/X11
+PNGLIBDIR = ${LOCALBASE}/lib
+ ZLIBDIR = $(USRLIBDIR)
+-PNGINC = -I/usr/include/X11
+PNGINC = -I${LOCALBASE}/include/libpng
#endif
XCOMM ****************
-@@ -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
-
--XCOMM #define USEXPM
-+#define USEXPM
+@@ -91,8 +91,8 @@ XCOMM
+ #define USEXPM
#ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
@@ -52,16 +42,16 @@ $OpenBSD: patch-fig2dev_Imakefile,v 1.5
#endif
XCOMM ****************
-@@ -126,7 +126,7 @@ XCOMM Comment out the next line if you h
+@@ -141,7 +141,7 @@ XCOMM Comment out the next line if you have any proble
#ifdef I18N
I18N_DEFS = -DI18N
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
- I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
+ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR)
-DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
- install::
-@@ -154,7 +154,7 @@ XCOMM **********************************
+ #endif /* I18N */
+@@ -150,7 +150,7 @@ XCOMM ************************************************
XCOMM *** You shouldn't have to change anything below this point ***
XCOMM **************************************************************
@@ -70,12 +60,3 @@ $OpenBSD: patch-fig2dev_Imakefile,v 1.5
#ifdef USEPNG
DUSEPNG = -DUSE_PNG
-@@ -177,7 +177,7 @@ DEFINES = $(NEED_STRERROR) $(HAVE_NO_STR
-
- IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
-
--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-fig2dev_dev_gensvg_c
===================================================================
RCS file: patches/patch-fig2dev_dev_gensvg_c
diff -N patches/patch-fig2dev_dev_gensvg_c
--- patches/patch-fig2dev_dev_gensvg_c 30 Dec 2003 02:05:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-fig2dev_dev_gensvg_c,v 1.1 2003/12/30 02:05:55 espie Exp $
---- fig2dev/dev/gensvg.c.orig 2003-12-30 02:59:03.000000000 +0100
-+++ fig2dev/dev/gensvg.c 2003-12-30 02:59:49.000000000 +0100
-@@ -692,16 +692,16 @@ gensvg_text (t)
- if (t->angle != 0) {
- fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
- (int) (t->base_x * mag), (int) (t->base_y * mag), degrees
(t->angle));
-- fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"
font-family=\"%s\"
-- font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
-+ fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"
font-family=\"%s\" \n"
-+" font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
- rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)],
- (t->font % 2 == 0 ? "normal" : "italic"),
- (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size *
12 * mag)),
- anchor[t->type]);
- }
- else
-- fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"
font-family=\"%s\"
-- font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
-+ fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"
font-family=\"%s\" \n"
-+" font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
- (int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal
(t->color),
- family[(int) ceil ((t->font + 1) / 4)],
- (t->font % 2 == 0 ? "normal" : "italic"),
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/transfig/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 15 Sep 2004 18:32:15 -0000 1.7
+++ pkg/PLIST 20 Aug 2008 12:23:53 -0000
@@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.7 2004/09/15 18:32:15 espie Exp $
-bin/fig2dev
[EMAIL PROTECTED] bin/fig2dev
bin/fig2ps2tex
bin/fig2ps2tex.sh
bin/pic2tpic
-bin/transfig
[EMAIL PROTECTED] bin/transfig
lib/X11/fig2dev/
lib/X11/fig2dev/cs_CZ.ps
lib/X11/fig2dev/hr_HR.ps
