diff options
Diffstat (limited to 'print')
| -rw-r--r-- | print/transfig/Makefile | 13 | ||||
| -rw-r--r-- | print/transfig/distinfo | 16 | ||||
| -rw-r--r-- | print/transfig/patches/patch-aa | 94 | ||||
| -rw-r--r-- | print/transfig/patches/patch-ab | 13 | ||||
| -rw-r--r-- | print/transfig/patches/patch-ac | 10 | ||||
| -rw-r--r-- | print/transfig/patches/patch-ad | 24 | ||||
| -rw-r--r-- | print/transfig/patches/patch-ae | 16 |
7 files changed, 88 insertions, 98 deletions
diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 2514271101c..95beab3149f 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.28 2005/09/07 14:10:56 adam Exp $ +# $NetBSD: Makefile,v 1.29 2005/11/10 14:29:01 itohy Exp $ -DISTNAME= transfig.3.2.4 -PKGNAME= transfig-3.2.4 -PKGREVISION= 2 +DISTNAME= transfig.3.2.5_alpha7 +PKGNAME= transfig-3.2.5alpha7 CATEGORIES= graphics print -MASTER_SITES= ftp://epb.lbl.gov/xfig/ +MASTER_SITES= ftp://epb.lbl.gov/xfig/alpha/ MAINTAINER= root@garbled.net +HOMEPAGE= http://www.xfig.org/ COMMENT= TeX document creation tool utilizing portable graphics USE_IMAKE= yes @@ -23,6 +23,9 @@ MAKE_ENV+= DDA4="-DA4" USE_TOOLS+= gmake .endif +MAKE_ENV+= ICONVLIBS="${BUILDLINK_LDADD.iconv}" + .include "../../graphics/png/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" +.include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/transfig/distinfo b/print/transfig/distinfo index c001aa04fbb..465605323fd 100644 --- a/print/transfig/distinfo +++ b/print/transfig/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.11 2005/09/07 14:10:56 adam Exp $ +$NetBSD: distinfo,v 1.12 2005/11/10 14:29:01 itohy Exp $ -SHA1 (transfig.3.2.4.tar.gz) = edfec1865dbfe9e7a06ae8be016f1a489b3d307d -RMD160 (transfig.3.2.4.tar.gz) = 7b1238f3d36c6dc30033dca43348e3c7d3116610 -Size (transfig.3.2.4.tar.gz) = 326284 bytes -SHA1 (patch-aa) = efc4eb298f4c5871432569c041226127ee0527c1 -SHA1 (patch-ab) = f1193557969ca7f6cc9d507710348d38dbfb7bf6 -SHA1 (patch-ac) = ac0823470d4de6df7bd5e3ff0f87decf8b4c44b8 -SHA1 (patch-ad) = b3a0d55eca4defbec4276f9aa4ce8f1352c3f1fb -SHA1 (patch-ae) = 6afb961c66ce594ac9044fb74364998219669d3f +SHA1 (transfig.3.2.5_alpha7.tar.gz) = f9d53b374a588c577f6a7a883e7b257f38146ec4 +RMD160 (transfig.3.2.5_alpha7.tar.gz) = 741f48df50f79c57850c699ce8801f71585a425f +Size (transfig.3.2.5_alpha7.tar.gz) = 393797 bytes +SHA1 (patch-aa) = 1b3db8fdb7b93a8dc8efbd31680a72793938f923 +SHA1 (patch-ac) = 0258794cf6f6d22d3355ed01c2cc89c7ee0088d4 +SHA1 (patch-ae) = d3d0eeb08083092f717525914c64e72c7ceaa1fd diff --git a/print/transfig/patches/patch-aa b/print/transfig/patches/patch-aa index cced14a1b7a..3dcf0fafe96 100644 --- a/print/transfig/patches/patch-aa +++ b/print/transfig/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $ +$NetBSD: patch-aa,v 1.10 2005/11/10 14:29:01 itohy Exp $ ---- fig2dev/Imakefile.orig Thu Dec 19 10:33:44 2002 -+++ fig2dev/Imakefile -@@ -20,13 +20,13 @@ +--- fig2dev/Imakefile.orig Fri Oct 28 01:56:02 2005 ++++ fig2dev/Imakefile Wed Nov 9 22:49:57 2005 +@@ -34,7 +34,7 @@ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled XCOMM and installed xfig. @@ -10,15 +10,8 @@ $NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $ +XFIGLIBDIR = $(PROJECTROOT)/lib/X11/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 If your system doesn't have the strerror() function (has sys_errlist) then +@@ -53,7 +53,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures @@ -27,43 +20,57 @@ $NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $ XCOMM **************** XCOMM Change RGB if necessary, to point to your rgb.txt color database -@@ -61,7 +61,7 @@ - +@@ -76,7 +76,7 @@ #ifdef USEPNG PNGLIBDIR = $(USRLIBDIR) + ZLIBDIR = $(USRLIBDIR) -PNGINC = -I/usr/include/X11 +PNGINC = -I$(LOCALBASE)/include #endif XCOMM **************** -@@ -73,11 +73,11 @@ - XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) - XCOMM - --XCOMM #define USEXPM -+#define USEXPM +@@ -92,7 +92,19 @@ #ifdef USEXPM XPMLIBDIR = $(USRLIBDIR) -XPMINC = -I/usr/include/X11 +XPMINC = -I$(LOCALBASE)/include/X11 ++#endif ++ ++XCOMM **************** ++XCOMM Uncomment the #define for USEICONV if you want to use the iconv(3). If the ++XCOMM iconv(3) is in separate library (-liconv), define USELIBICONV too. ++ ++#define USEICONV ++XCOMM #define USELIBICONV ++ ++#ifdef USEICONV ++ICONVLIBDIR = $(USRLIBDIR) ++ICONVINC = -I$(LOCALBASE)/include #endif XCOMM **************** -@@ -126,7 +126,7 @@ +@@ -141,8 +153,8 @@ #ifdef I18N I18N_DEFS = -DI18N -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev +-I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\" +FIG2DEV_LIBDIR = $(PROJECTROOT)/lib/fig2dev - I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\" ++I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) + + #endif /* I18N */ - install:: -@@ -158,12 +158,12 @@ +@@ -150,30 +162,37 @@ + XCOMM *** You shouldn't have to change anything below this point *** + XCOMM ************************************************************** + +-DIR_DEFS= -DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\" ++DIR_DEFS= -DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\" -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\" #ifdef USEPNG DUSEPNG = -DUSE_PNG --PNGLIBS = -L$(PNGLIBDIR) -lpng -lz +-PNGLIBS = -L$(PNGLIBDIR) -lpng -L$(ZLIBDIR) -lz +PNGLIBS = -Wl,-R$(LOCALBASE)/lib -L$(PNGLIBDIR) -lpng -lz #endif /* USEPNG */ @@ -73,13 +80,40 @@ $NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $ +XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm -lX11 #endif /* USEXPM */ ++#ifdef USEICONV ++DUSEICONV = -DUSE_ICONV ++#ifdef USELIBICONV ++ICONVLIBS = -L$(ICONVLIBDIR) -liconv ++#endif /* USELIBICONV */ ++#endif /* USEICONV */ ++ #if defined(NOSTRSTR) -@@ -177,7 +177,7 @@ + STRSTRC= strstr.c + STRSTRO= strstr.o + #endif /* defined(NOSTRSTR) */ + + DEFINES = $(NEED_STRERROR) $(HAVE_NO_STRCASECMP) $(HAVE_NO_STRNCASECMP) $(DDNFSS) $(USEINLINE) \ +- $(I18N_DEFS) $(HAVE_SETMODE) $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) ++ $(I18N_DEFS) $(HAVE_SETMODE) $(DUSEPNG) $(DUSEXPM) $(DUSEICONV) $(PNGINC) $(XPMINC) $(ICONVINC) + - IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) +-IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) $(I18N_DEV_DEFS) ++IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) $(I18N_DEV_DEFS) $(DUSEICONV) --DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \ -+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \ +-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \ ++DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(DUSEICONV) $(PNGINC) $(XPMINC) $(ICONVINC) $(DDNFSS) $(DDA4) \ $(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS) #define IHaveSubdirs +@@ -189,9 +208,9 @@ + + LOCAL_LIBRARIES = $(LIBTRANSFIG) + #if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) +-SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm -lcompat ++SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) $(ICONVLIBS) -lm -lcompat + #else +-SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm ++SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) $(ICONVLIBS) -lm + #endif + DEPLIBS = $(LIBTRANSFIG) + diff --git a/print/transfig/patches/patch-ab b/print/transfig/patches/patch-ab deleted file mode 100644 index 931200a3f7f..00000000000 --- a/print/transfig/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/01/07 06:19:07 rh Exp $ - ---- fig2dev/dev/genemf.h.orig Wed Dec 18 15:42:05 2002 -+++ fig2dev/dev/genemf.h -@@ -27,7 +27,7 @@ - typedef unsigned char uchar; - typedef unsigned short TCHAR; - --#ifndef __USE_MISC -+#if !defined(__USE_MISC) && !defined(__NetBSD__) - /* Old compatibility names for C types. */ - typedef unsigned long int ulong; - typedef unsigned short int ushort; diff --git a/print/transfig/patches/patch-ac b/print/transfig/patches/patch-ac index d5e06145275..1ffb36d9c59 100644 --- a/print/transfig/patches/patch-ac +++ b/print/transfig/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2003/01/07 06:19:07 rh Exp $ +$NetBSD: patch-ac,v 1.4 2005/11/10 14:29:01 itohy Exp $ ---- transfig/Imakefile.orig Wed Dec 18 15:44:03 2002 -+++ transfig/Imakefile -@@ -18,7 +18,7 @@ +--- transfig/Imakefile.orig Wed Mar 26 05:52:37 2003 ++++ transfig/Imakefile Wed Nov 9 21:44:38 2005 +@@ -32,7 +32,7 @@ XCOMM \\usepackage{} command for LaTeX2e. XCOMM The default is to use \\documentstyle{} for LaTeX209. -XCOMM USELATEX2E = -DLATEX2E +USELATEX2E = -DLATEX2E - XCOMM ******* DON'T CHANGE ANYTHIN BELOW THIS POINT ******* + XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT ******* diff --git a/print/transfig/patches/patch-ad b/print/transfig/patches/patch-ad deleted file mode 100644 index 2936b3f05ab..00000000000 --- a/print/transfig/patches/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2003/10/18 13:20:32 cjep Exp $ ---- fig2dev/dev/gensvg.c.orig 2002-12-18 23:38:18.000000000 +0100 -+++ fig2dev/dev/gensvg.c 2003-09-24 15:50:52.000000000 +0200 -@@ -692,16 +692,16 @@ - 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\" " -+ "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\" " -+ "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"), diff --git a/print/transfig/patches/patch-ae b/print/transfig/patches/patch-ae index 5032eaef109..2df1baeaabc 100644 --- a/print/transfig/patches/patch-ae +++ b/print/transfig/patches/patch-ae @@ -1,16 +1,8 @@ -$NetBSD: patch-ae,v 1.3 2005/09/07 14:10:57 adam Exp $ +$NetBSD: patch-ae,v 1.4 2005/11/10 14:29:01 itohy Exp $ ---- fig2dev/fig2dev.h.orig 2002-12-18 22:45:28.000000000 +0000 -+++ fig2dev/fig2dev.h 2005-09-02 14:20:02.000000000 +0100 -@@ -22,7 +22,6 @@ - #include <sys/file.h> - #include <signal.h> - #include <string.h> --#include <varargs.h> - #include <pwd.h> - #include <errno.h> - #include <time.h> -@@ -210,13 +209,14 @@ +--- fig2dev/fig2dev.h.orig Wed Jul 16 01:21:12 2003 ++++ fig2dev/fig2dev.h Wed Nov 9 21:52:22 2005 +@@ -213,13 +213,14 @@ #endif /* MAXPATHLEN */ #endif /* PATH_MAX */ |