Date: Mon, 16 Apr 2007 01:00:31 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/111627: Update port: print/transfig to 3.2.5 Message-ID: <20070416010031.82babfa4.tkato432@yahoo.com> Resent-Message-ID: <200704151610.l3FGA785023750@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111627 >Category: ports >Synopsis: Update port: print/transfig to 3.2.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 15 16:10:07 GMT 2007 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p26 i386 >Organization: >Environment: >Description: - Update to version 3.2.5 New file: files/patch-fig2dev__dev__genps.c Remove file: files/patch-fig2dev_dev_genemf.h files/patch-fig2dev_dev_gensvg.c >How-To-Repeat: >Fix: diff -urN /usr/ports/print/transfig/Makefile print/transfig/Makefile --- /usr/ports/print/transfig/Makefile Wed Jan 21 11:46:46 2004 +++ print/transfig/Makefile Mon Mar 26 14:50:50 2007 @@ -6,24 +6,24 @@ # PORTNAME= transfig -PORTVERSION= 3.2.4 -PORTREVISION= 1 +PORTVERSION= 3.2.5 CATEGORIES= print -MASTER_SITES= http://www.xfig.org/xfigdist/ \ - ftp://www-epb.lbl.gov/xfig/%SUBDIR%/ -MASTER_SITE_SUBDIR= . previous_versions +MASTER_SITES= http://www.xfig.org/software/xfig/%SUBDIR%/ +MASTER_SITE_SUBDIR= ${PORTVERSION} DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Tools to convert Xfig's .fig files -USE_GHOSTSCRIPT_RUN= yes - LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm USE_IMAKE= yes USE_XPM= yes +USE_GHOSTSCRIPT_RUN= yes +XMKMF= xmkmf + +MANCOMPRESSED= no MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1 pre-everything:: @@ -33,5 +33,34 @@ @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" @${ECHO_MSG} "" .endif + +post-configure: +.for i in fig2dev fig2dev/dev transfig + @cd ${WRKSRC}/${i} \ + && ${SETENV} ${MAKE_ENV} ${XMKMF} -DUSE_PNG -DUSE_XPM +.endfor + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/fig2dev/fig2dev ${PREFIX}/bin +.for i in fig2ps2tex fig2ps2tex.sh pic2tpic + ${INSTALL_SCRIPT} ${WRKSRC}/fig2dev/${i}.script ${PREFIX}/bin/${i} +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/transfig/transfig ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${MANPREFIX}/man/man1 + @${MKDIR} ${PREFIX}/lib/X11/fig2dev +.for i in cs_CZ.ps japanese.ps korean.ps + ${INSTALL_DATA} ${WRKSRC}/fig2dev/dev/${i} ${PREFIX}/lib/X11/fig2dev/${i} +.endfor +.for i in hr_HR.ps hu_HU.ps pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps + ${LN} -sf cs_CZ.ps ${PREFIX}/lib/X11/fig2dev/${i} +.endfor +.for i in ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps + ${LN} -sf japanese.ps ${PREFIX}/lib/X11/fig2dev/${i} +.endfor +.for i in ko.ps ko_KR.ps ko_KR.eucKR.ps ko_KR.EUC.ps + ${LN} -sf korean.ps ${PREFIX}/lib/X11/fig2dev/${i} +.endfor + @${MKDIR} ${PREFIX}/lib/X11/xfig/bitmaps + ${INSTALL_DATA} ${WRKSRC}/fig2dev/bitmaps/*.bmp ${PREFIX}/lib/X11/xfig/bitmaps .include <bsd.port.mk> diff -urN /usr/ports/print/transfig/distinfo print/transfig/distinfo --- /usr/ports/print/transfig/distinfo Sat Nov 26 19:30:41 2005 +++ print/transfig/distinfo Sat Mar 24 19:34:27 2007 @@ -1,3 +1,3 @@ -MD5 (transfig.3.2.4.tar.gz) = 742de0f7a3cae74d247bbd0c70dd9dd7 -SHA256 (transfig.3.2.4.tar.gz) = a4b59323d97866de7b72675c11dc33b95bb479a69cae7d83f98ba972a1d54910 -SIZE (transfig.3.2.4.tar.gz) = 326284 +MD5 (transfig.3.2.5.tar.gz) = 3b2cffdd25529ae5877e305f29aae6d1 +SHA256 (transfig.3.2.5.tar.gz) = ea5a5724c8fa1dcb52531c4d44ec8a59830b2dc2da11e561e15240e8dd16d043 +SIZE (transfig.3.2.5.tar.gz) = 394296 diff -urN /usr/ports/print/transfig/files/patch-ac print/transfig/files/patch-ac --- /usr/ports/print/transfig/files/patch-ac Mon Feb 10 19:56:42 2003 +++ print/transfig/files/patch-ac Sat Mar 24 19:43:13 2007 @@ -1,6 +1,6 @@ ---- fig2dev/Imakefile.orig Fri Dec 20 02:33:44 2002 -+++ fig2dev/Imakefile Wed Jan 8 08:36:50 2003 -@@ -20,13 +20,13 @@ +--- fig2dev/Imakefile.orig Fri Oct 28 01:56:02 2005 ++++ fig2dev/Imakefile Sat Mar 24 19:42:59 2007 +@@ -34,7 +34,7 @@ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled XCOMM and installed xfig. @@ -8,15 +8,8 @@ +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 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 @@ -25,23 +18,20 @@ XCOMM **************** XCOMM Change RGB if necessary, to point to your rgb.txt color database -@@ -60,8 +60,8 @@ - XCOMM are in different places +@@ -74,9 +74,9 @@ + XCOMM file are in different places #ifdef USEPNG -PNGLIBDIR = $(USRLIBDIR) +-ZLIBDIR = $(USRLIBDIR) -PNGINC = -I/usr/include/X11 +PNGLIBDIR = ${LOCALBASE}/lib ++ZLIBDIR = /usr +PNGINC = -I${LOCALBASE}/include/libpng #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,7 @@ #ifdef USEXPM XPMLIBDIR = $(USRLIBDIR) @@ -50,49 +40,12 @@ #endif XCOMM **************** -@@ -126,23 +126,23 @@ +@@ -141,7 +141,7 @@ #ifdef I18N I18N_DEFS = -DI18N -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev +FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev - I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\" - - install:: - [ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR) -- $(INSTALL) -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR) -+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR) - ( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \ - rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \ - $(LN) japanese.ps ja.ps; $(LN) japanese.ps ja_JP.ps; \ - $(LN) japanese.ps ja_JP.ujis.ps; $(LN) japanese.ps ja_JP.eucJP.ps; \ - $(LN) japanese.ps ja_JP.EUC.ps ) -- $(INSTALL) -c dev/korean.ps $(DESTDIR)$(FIG2DEV_LIBDIR) -+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) dev/korean.ps $(DESTDIR)$(FIG2DEV_LIBDIR) - ( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \ - rm -f ko.ps ko_KR.ps ko_KR.eucKR.ps ko_KR.EUC.ps; \ - $(LN) korean.ps ko.ps; $(LN) korean.ps ko_KR.ps; \ - $(LN) korean.ps ko_KR.eucKR.ps; $(LN) korean.ps ko_KR.EUC.ps ) -- $(INSTALL) -c dev/cs_CZ.ps $(DESTDIR)$(FIG2DEV_LIBDIR) -+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) dev/cs_CZ.ps $(DESTDIR)$(FIG2DEV_LIBDIR) - ( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \ - rm -f hr_HR.ps hu_HU.ps pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps; \ - $(LN) cs_CZ.ps hr_HR.ps; $(LN) cs_CZ.ps hu_HU.ps; \ -@@ -177,7 +177,7 @@ - - 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 -@@ -233,7 +233,7 @@ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \ - echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \ - for f in * ; do \ -- $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \ -+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$f $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \ - done) ; + I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\" - install.all:: + #endif /* I18N */ diff -urN /usr/ports/print/transfig/files/patch-fig2dev__dev__genps.c print/transfig/files/patch-fig2dev__dev__genps.c --- /usr/ports/print/transfig/files/patch-fig2dev__dev__genps.c Thu Jan 1 09:00:00 1970 +++ print/transfig/files/patch-fig2dev__dev__genps.c Mon Mar 26 14:12:26 2007 @@ -0,0 +1,10 @@ +--- fig2dev/dev/genps.c.orig Wed Sep 21 00:09:25 2005 ++++ fig2dev/dev/genps.c Mon Mar 26 14:12:15 2007 +@@ -36,6 +36,7 @@ + * splitting into layers. + */ + ++#include <sys/types.h> + #include <sys/stat.h> + #include "fig2dev.h" + #include "object.h" diff -urN /usr/ports/print/transfig/files/patch-fig2dev_dev_genemf.h print/transfig/files/patch-fig2dev_dev_genemf.h --- /usr/ports/print/transfig/files/patch-fig2dev_dev_genemf.h Sun Feb 9 13:26:33 2003 +++ print/transfig/files/patch-fig2dev_dev_genemf.h Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- fig2dev/dev/genemf.h.orig Thu Dec 19 07:42:05 2002 -+++ fig2dev/dev/genemf.h Tue Jan 7 20:16:08 2003 -@@ -30,8 +30,10 @@ - #ifndef __USE_MISC - /* Old compatibility names for C types. */ - typedef unsigned long int ulong; -+#ifndef __FreeBSD__ - typedef unsigned short int ushort; - typedef unsigned int uint; -+#endif - #endif - - diff -urN /usr/ports/print/transfig/files/patch-fig2dev_dev_gensvg.c print/transfig/files/patch-fig2dev_dev_gensvg.c --- /usr/ports/print/transfig/files/patch-fig2dev_dev_gensvg.c Thu Jul 24 00:37:54 2003 +++ print/transfig/files/patch-fig2dev_dev_gensvg.c Thu Jan 1 09:00:00 1970 @@ -1,21 +0,0 @@ ---- fig2dev/dev/gensvg.c.orig Wed Jul 23 16:39:14 2003 -+++ fig2dev/dev/gensvg.c Wed Jul 23 16:39:52 2003 -@@ -692,16 +692,14 @@ - 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 -urN /usr/ports/print/transfig/files/patch-fig2dev_fig2dev.h print/transfig/files/patch-fig2dev_fig2dev.h --- /usr/ports/print/transfig/files/patch-fig2dev_fig2dev.h Wed Oct 8 09:46:56 2003 +++ print/transfig/files/patch-fig2dev_fig2dev.h Mon Mar 26 14:48:38 2007 @@ -1,14 +1,6 @@ ---- fig2dev/fig2dev.h.orig Thu Dec 19 07:45:28 2002 -+++ fig2dev/fig2dev.h Tue Jan 7 20:08:45 2003 -@@ -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,7 +209,7 @@ +--- fig2dev/fig2dev.h.orig Wed Jul 16 01:21:12 2003 ++++ fig2dev/fig2dev.h Mon Mar 26 14:48:23 2007 +@@ -213,7 +213,7 @@ #endif /* MAXPATHLEN */ #endif /* PATH_MAX */ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070416010031.82babfa4.tkato432>