View | Details | Raw Unified | Return to bug 111246
Collapse All | Expand All

(-)print/transfig/Makefile (-10 / +14 lines)
Lines 6-36 Link Here
6
#
6
#
7
7
8
PORTNAME=	transfig
8
PORTNAME=	transfig
9
PORTVERSION=	3.2.4
9
PORTVERSION=	3.2.5
10
PORTREVISION=	1
11
CATEGORIES=	print
10
CATEGORIES=	print
12
MASTER_SITES=	http://www.xfig.org/xfigdist/ \
11
MASTER_SITES=	http://xfig.org/software/xfig/${PORTVERSION}/ \
13
		ftp://www-epb.lbl.gov/xfig/%SUBDIR%/
12
		ftp://www-epb.lbl.gov/xfig/
14
MASTER_SITE_SUBDIR=	. previous_versions
15
DISTNAME=	${PORTNAME}.${PORTVERSION}
13
DISTNAME=	${PORTNAME}.${PORTVERSION}
16
14
17
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ports@FreeBSD.org
18
COMMENT=	Tools to convert Xfig's .fig files
16
COMMENT=	Tools to convert Xfig's .fig files
19
17
20
USE_GHOSTSCRIPT_RUN=	yes
21
22
LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
23
RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
18
RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
19
LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
24
20
21
USE_GHOSTSCRIPT_RUN=	yes
25
USE_IMAKE=	yes
22
USE_IMAKE=	yes
26
USE_XPM=	yes
23
USE_XPM=	yes
27
MAN1=		fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
24
MAN1=		fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
28
25
26
MAKE_ARGS+=	INSTALLFLAGS="${COPY}" \
27
		INSTPGMFLAGS="${STRIP} ${_BINOWNGRP} -m ${BINMODE}" \
28
		INSTBINFLAGS="${_BINOWNGRP} -m ${BINMODE}" \
29
		INSTDATFLAGS="${_SHROWNGRP} -m ${SHAREMODE}" \
30
		INSTMANFLAGS="${_MANOWNGRP} -m ${MANMODE}"
31
29
pre-everything::
32
pre-everything::
30
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
33
.if !defined(WITH_GHOSTSCRIPT_AFPL) && !defined(WITH_GHOSTSCRIPT_GNU)
31
	@${ECHO_MSG} ""
34
	@${ECHO_MSG} ""
32
	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
35
	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
33
	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
36
	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GPL one"
37
	@${ECHO_MSG} "      Or define WITH_GHOSTSCRIPT_GNU=yes to use GNU one"
34
	@${ECHO_MSG} ""
38
	@${ECHO_MSG} ""
35
.endif
39
.endif
36
40
(-)print/transfig/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (transfig.3.2.4.tar.gz) = 742de0f7a3cae74d247bbd0c70dd9dd7
1
MD5 (transfig.3.2.5.tar.gz) = 3b2cffdd25529ae5877e305f29aae6d1
2
SHA256 (transfig.3.2.4.tar.gz) = a4b59323d97866de7b72675c11dc33b95bb479a69cae7d83f98ba972a1d54910
2
SHA256 (transfig.3.2.5.tar.gz) = ea5a5724c8fa1dcb52531c4d44ec8a59830b2dc2da11e561e15240e8dd16d043
3
SIZE (transfig.3.2.4.tar.gz) = 326284
3
SIZE (transfig.3.2.5.tar.gz) = 394296
(-)print/transfig/files/patch-ac (-53 / +14 lines)
Lines 1-6 Link Here
1
--- fig2dev/Imakefile.orig	Fri Dec 20 02:33:44 2002
1
--- fig2dev/Imakefile.orig	Thu Oct 27 09:56:02 2005
2
+++ fig2dev/Imakefile	Wed Jan  8 08:36:50 2003
2
+++ fig2dev/Imakefile
3
@@ -20,13 +20,13 @@
3
@@ -34,7 +34,7 @@
4
 XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
4
 XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
5
 XCOMM and installed xfig.
5
 XCOMM and installed xfig.
6
 
6
 
Lines 8-22 Link Here
8
+XFIGLIBDIR =	$(LIBDIR)/xfig
8
+XFIGLIBDIR =	$(LIBDIR)/xfig
9
 
9
 
10
 XCOMM ******
10
 XCOMM ******
11
 XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
11
 XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
12
 XCOMM comment out NEED_STRERROR with an XCOMM comment.
12
@@ -53,7 +53,7 @@
13
 
14
-NEED_STRERROR = -DNEED_STRERROR
15
+XCOMM NEED_STRERROR = -DNEED_STRERROR
16
 
17
 XCOMM The following probably only applies to Windows 9x/NT:
18
 XCOMM If your system can open files in text and binary modes and has the
19
@@ -39,7 +39,7 @@
20
 XCOMM inline functions. With the "INLINE" keyword, you should notice that
13
 XCOMM inline functions. With the "INLINE" keyword, you should notice that
21
 XCOMM the display will be a bit faster in complex figures
14
 XCOMM the display will be a bit faster in complex figures
22
 
15
 
Lines 25-47 Link Here
25
 
18
 
26
 XCOMM ****************
19
 XCOMM ****************
27
 XCOMM Change RGB if necessary, to point to your rgb.txt color database
20
 XCOMM Change RGB if necessary, to point to your rgb.txt color database
28
@@ -60,8 +60,8 @@
21
@@ -74,9 +74,9 @@
29
 XCOMM are in different places
22
 XCOMM file are in different places
30
 
23
 
31
 #ifdef USEPNG
24
 #ifdef USEPNG
32
-PNGLIBDIR = $(USRLIBDIR)
25
-PNGLIBDIR = $(USRLIBDIR)
33
-PNGINC = -I/usr/include/X11
34
+PNGLIBDIR = ${LOCALBASE}/lib
26
+PNGLIBDIR = ${LOCALBASE}/lib
27
 ZLIBDIR = $(USRLIBDIR)
28
-PNGINC = -I/usr/include/X11
35
+PNGINC = -I${LOCALBASE}/include/libpng
29
+PNGINC = -I${LOCALBASE}/include/libpng
36
 #endif
30
 #endif
37
 
31
 
38
 XCOMM ****************
32
 XCOMM ****************
39
@@ -73,11 +73,11 @@
33
@@ -92,7 +92,7 @@
40
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
41
 XCOMM
42
 
43
-XCOMM #define USEXPM
44
+#define USEXPM
45
 
34
 
46
 #ifdef USEXPM
35
 #ifdef USEXPM
47
 XPMLIBDIR = $(USRLIBDIR)
36
 XPMLIBDIR = $(USRLIBDIR)
Lines 50-93 Link Here
50
 #endif
39
 #endif
51
 
40
 
52
 XCOMM ****************
41
 XCOMM ****************
53
@@ -126,23 +126,23 @@
42
@@ -141,7 +141,7 @@
54
 
43
 
55
 #ifdef I18N
44
 #ifdef I18N
56
 I18N_DEFS = -DI18N 
45
 I18N_DEFS = -DI18N 
57
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
46
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
58
+FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
47
+FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
59
 I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
48
 I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
60
 
61
 install::
62
 	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
63
-	$(INSTALL) -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
64
+	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS)  dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
65
 	( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
66
 	  rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \
67
 	  $(LN) japanese.ps ja.ps; $(LN) japanese.ps ja_JP.ps; \
68
 	  $(LN) japanese.ps ja_JP.ujis.ps; $(LN) japanese.ps ja_JP.eucJP.ps; \
69
 	  $(LN) japanese.ps ja_JP.EUC.ps )
70
-	$(INSTALL) -c  dev/korean.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
71
+	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS)  dev/korean.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
72
 	( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
73
 	  rm -f ko.ps ko_KR.ps ko_KR.eucKR.ps ko_KR.EUC.ps; \
74
 	  $(LN) korean.ps ko.ps; $(LN) korean.ps ko_KR.ps; \
75
 	  $(LN) korean.ps ko_KR.eucKR.ps; $(LN) korean.ps ko_KR.EUC.ps )
76
-	$(INSTALL) -c  dev/cs_CZ.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
77
+	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS)  dev/cs_CZ.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
78
 	( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
79
 	  rm -f hr_HR.ps hu_HU.ps pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps; \
80
 	  $(LN) cs_CZ.ps hr_HR.ps; $(LN) cs_CZ.ps hu_HU.ps; \
81
@@ -177,7 +177,7 @@
82
 
83
 IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
84
 
85
-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
86
+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
87
 		$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
88
 
49
 
89
 #define IHaveSubdirs
50
 #endif /* I18N */
90
@@ -233,7 +233,7 @@
51
@@ -229,7 +229,7 @@
91
 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \
52
 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \
92
 	echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
53
 	echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
93
 	for f in * ; do \
54
 	for f in * ; do \
(-)print/transfig/files/patch-fig2dev_dev_Imakefile (+10 lines)
Line 0 Link Here
1
--- fig2dev/dev/Imakefile.orig	Tue Sep 30 08:48:08 2003
2
+++ fig2dev/dev/Imakefile
3
@@ -23,6 +23,7 @@
4
 #ifdef USE_PNG
5
 READPNGS=readpng.c
6
 READPNGO=readpng.o
7
+DEPEND_DEFINES=-I${LOCALBASE}/include/libpng DependDefines
8
 #endif
9
 
10
 #ifdef USE_XPM
(-)print/transfig/files/patch-fig2dev_dev_genemf.h (-13 lines)
Lines 1-13 Link Here
1
--- fig2dev/dev/genemf.h.orig	Thu Dec 19 07:42:05 2002
2
+++ fig2dev/dev/genemf.h	Tue Jan  7 20:16:08 2003
3
@@ -30,8 +30,10 @@
4
 #ifndef __USE_MISC
5
 /* Old compatibility names for C types.  */
6
 typedef unsigned long int ulong;
7
+#ifndef __FreeBSD__
8
 typedef unsigned short int ushort;
9
 typedef unsigned int uint;
10
+#endif
11
 #endif
12
 
13
 
(-)print/transfig/files/patch-fig2dev_dev_gensvg.c (-21 lines)
Lines 1-21 Link Here
1
--- fig2dev/dev/gensvg.c.orig	Wed Jul 23 16:39:14 2003
2
+++ fig2dev/dev/gensvg.c	Wed Jul 23 16:39:52 2003
3
@@ -692,16 +692,14 @@
4
     if (t->angle != 0) {
5
 	fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
6
 		 (int) (t->base_x * mag), (int) (t->base_y * mag), degrees (t->angle));
7
-	fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"  font-family=\"%s\" 
8
-		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
9
+	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",
10
 		 rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)],
11
 		 (t->font % 2 == 0 ? "normal" : "italic"),
12
 		 (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)),
13
 		 anchor[t->type]);
14
     }
15
     else
16
-	fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  font-family=\"%s\" 
17
-		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
18
+	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",
19
 		 (int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal (t->color),
20
 		 family[(int) ceil ((t->font + 1) / 4)],
21
 		 (t->font % 2 == 0 ? "normal" : "italic"),
(-)print/transfig/files/patch-fig2dev_dev_readgif.c (+11 lines)
Line 0 Link Here
1
--- fig2dev/dev/readgif.c.orig	Tue Apr  8 14:42:07 2003
2
+++ fig2dev/dev/readgif.c
3
@@ -197,7 +197,7 @@
4
 	/* make name for temp output file */
5
 	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
6
 	/* make command to convert gif to pcx into temp file */
7
-	sprintf(buf, "giftopnm | ppmtopcx > %s 2> /dev/null", pcxname);
8
+	sprintf(buf, "giftopnm -quiet | ppmtopcx -quiet > %s", pcxname);
9
 	if ((giftopcx = popen(buf,"w" )) == 0) {
10
 	    fprintf(stderr,"Cannot open pipe to giftoppm\n");
11
 	    return 0;
(-)print/transfig/files/patch-fig2dev_fig2dev.h (-11 / +3 lines)
Lines 1-14 Link Here
1
--- fig2dev/fig2dev.h.orig	Thu Dec 19 07:45:28 2002
1
--- fig2dev/fig2dev.h.orig	Tue Jul 15 09:21:12 2003
2
+++ fig2dev/fig2dev.h	Tue Jan  7 20:08:45 2003
2
+++ fig2dev/fig2dev.h
3
@@ -22,7 +22,6 @@
3
@@ -213,7 +213,7 @@
4
 #include <sys/file.h>
5
 #include <signal.h>
6
 #include <string.h>
7
-#include <varargs.h>
8
 #include <pwd.h>
9
 #include <errno.h>
10
 #include <time.h>
11
@@ -210,7 +209,7 @@
12
 #endif /* MAXPATHLEN */
4
 #endif /* MAXPATHLEN */
13
 #endif /* PATH_MAX */
5
 #endif /* PATH_MAX */
14
 
6
 
(-)print/transfig/files/patch-transfig_Imakefile (-4 / +4 lines)
Lines 1-11 Link Here
1
--- transfig/Imakefile.orig	Thu Dec 19 07:44:03 2002
1
--- transfig/Imakefile.orig	Tue Mar 25 12:52:37 2003
2
+++ transfig/Imakefile	Fri Jan 10 17:28:18 2003
2
+++ transfig/Imakefile
3
@@ -18,7 +18,7 @@
3
@@ -32,7 +32,7 @@
4
 XCOMM \\usepackage{} command for LaTeX2e. 
4
 XCOMM \\usepackage{} command for LaTeX2e. 
5
 XCOMM The default is to use \\documentstyle{} for LaTeX209.
5
 XCOMM The default is to use \\documentstyle{} for LaTeX209.
6
 
6
 
7
-XCOMM USELATEX2E = -DLATEX2E
7
-XCOMM USELATEX2E = -DLATEX2E
8
+USELATEX2E = -DLATEX2E
8
+USELATEX2E = -DLATEX2E
9
 
9
 
10
 XCOMM ******* DON'T CHANGE ANYTHIN BELOW THIS POINT *******
10
 XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******
11
 
11
 
(-)print/transfig/pkg-descr (-3 / +6 lines)
Lines 2-7 Link Here
2
which are portable, in the sense that they can be printed in a wide
2
which are portable, in the sense that they can be printed in a wide
3
variety of environments. 
3
variety of environments. 
4
4
5
Drivers currently exist for the following graphics langauges: (E)EPIC
5
Drivers currently exist for the following graphics langauges:
6
macros, LaTeX picture environment, PIC, PiCTeX, PostScript, and
6
AutoCad slide, BOX, (E)EPIC macros, LaTeX picture environment,
7
TeXtyl.  Fig2dev can be configured with a subset of these drivers
7
PIC, PiCTeX, PNG, PostScript, Encapsulated Postscript, GIF,
8
IBM-GL, JPEG, PCX, MF (METAFONT), TeXtyl, TIFF, TPIC, XBM (X11
9
Bitmap), XPM (X11 Pixmap), and TK (tcl/tk).  Fig2dev can be
10
configured with a subset of these drivers.

Return to bug 111246