Date: Fri, 10 Jan 2003 23:58:47 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46948: Update port: print/transfig to 3.2.4 Message-ID: <20030110235847.175db8e0.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46948 >Category: ports >Synopsis: Update port: print/transfig to 3.2.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 10 07:10:10 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.7-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 3.2.4 New file: files/patch-fig2dev_dev_genemf.h files/patch-transfig_Imakefile Remove file: files/patch-bb Following PRs should be superseded by this one: [2002/05/20] ports/38324 chuckr print/transfig should default to LaTeX 2e instead of LaTeX 2.09 >How-To-Repeat: >Fix: diff -urN /usr/ports/print/transfig/Makefile print/transfig/Makefile --- /usr/ports/print/transfig/Makefile Tue Sep 11 11:59:20 2001 +++ print/transfig/Makefile Tue Jan 7 20:09:28 2003 @@ -6,17 +6,16 @@ # PORTNAME= transfig -PORTVERSION= 3.2.3d +PORTVERSION= 3.2.4 CATEGORIES= print MASTER_SITES= http://www.xfig.org/xfigdist/ \ - ftp://www-epb.lbl.gov/xfig/ -MASTER_SITE_SUBDIR= applications/drawing_tools/transfig + ftp://www-epb.lbl.gov/xfig/%SUBDIR%/ +MASTER_SITE_SUBDIR= . previous_versions DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= chuckr@FreeBSD.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm USE_IMAKE= yes diff -urN /usr/ports/print/transfig/distinfo print/transfig/distinfo --- /usr/ports/print/transfig/distinfo Tue Jul 10 08:55:59 2001 +++ print/transfig/distinfo Tue Jan 7 20:02:31 2003 @@ -1 +1 @@ -MD5 (transfig.3.2.3d.tar.gz) = 4fbf4184fe2df4fe9bb5130b6e19907c +MD5 (transfig.3.2.4.tar.gz) = 742de0f7a3cae74d247bbd0c70dd9dd7 diff -urN /usr/ports/print/transfig/files/patch-ac print/transfig/files/patch-ac --- /usr/ports/print/transfig/files/patch-ac Tue Jul 10 08:56:00 2001 +++ print/transfig/files/patch-ac Wed Jan 8 08:40:06 2003 @@ -1,15 +1,15 @@ ---- fig2dev/Imakefile.orig Fri Apr 20 02:19:38 2001 -+++ fig2dev/Imakefile Tue Jun 5 23:18:08 2001 -@@ -28,7 +28,7 @@ +--- fig2dev/Imakefile.orig Fri Dec 20 02:33:44 2002 ++++ fig2dev/Imakefile Wed Jan 8 08:36:50 2003 +@@ -20,7 +20,7 @@ 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 XCOMM ****** XCOMM If your system has the strerror() function (doesn't have sys_errlist) then -@@ -47,7 +47,7 @@ +@@ -39,7 +39,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures @@ -18,18 +18,18 @@ XCOMM **************** XCOMM Change RGB if necessary, to point to your rgb.txt color database -@@ -65,8 +65,8 @@ - #define USEPNG +@@ -60,8 +60,8 @@ + XCOMM are in different places #ifdef USEPNG -PNGLIBDIR = $(USRLIBDIR) -PNGINC = -I/usr/include/X11 +PNGLIBDIR = ${LOCALBASE}/lib -+PNGINC = -I${LOCALBASE}/include ++PNGINC = -I${LOCALBASE}/include/libpng #endif XCOMM **************** -@@ -78,11 +78,11 @@ +@@ -73,11 +73,11 @@ XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) XCOMM @@ -43,18 +43,7 @@ #endif XCOMM **************** -@@ -104,8 +104,8 @@ - - #ifdef USEJPEG - #ifdef USEINSTALLEDJPEG --JPEGLIBDIR = /usr/local/lib --JPEGINCDIR = /usr/include/X11 -+JPEGLIBDIR = ${LOCALBASE}/lib -+JPEGINCDIR = ${LOCALBASE}/include - #else - JPEGLIBDIR = ../jpeg - JPEGINCDIR = $(JPEGLIBDIR) -@@ -158,7 +158,7 @@ +@@ -126,23 +126,23 @@ #ifdef I18N I18N_DEFS = -DI18N @@ -63,3 +52,40 @@ 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) ; + + install.all:: diff -urN /usr/ports/print/transfig/files/patch-bb print/transfig/files/patch-bb --- /usr/ports/print/transfig/files/patch-bb Thu Feb 21 04:20:01 2002 +++ print/transfig/files/patch-bb Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ -*** fig2dev/dev/readjpg.c.orig Tue Dec 21 09:52:00 1999 ---- fig2dev/dev/readjpg.c Tue Jun 19 08:53:20 2001 -*************** -*** 39,44 **** ---- 39,45 ---- - { - - *llx = *lly = 0; -+ pic->transp = -1; - pict = pic; /* for global access to the object */ - if (!read_JPEG_file(file)) - return 0; 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 Thu Jan 1 09:00:00 1970 +++ print/transfig/files/patch-fig2dev_dev_genemf.h Tue Jan 7 20:16:45 2003 @@ -0,0 +1,13 @@ +--- 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_fig2dev.h print/transfig/files/patch-fig2dev_fig2dev.h --- /usr/ports/print/transfig/files/patch-fig2dev_fig2dev.h Fri Aug 16 05:05:41 2002 +++ print/transfig/files/patch-fig2dev_fig2dev.h Tue Jan 7 20:09:09 2003 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/print/transfig/files/patch-fig2dev_fig2dev.h,v 1.1 2002/08/15 20:05:41 naddy Exp $ - ---- fig2dev/fig2dev.h.orig Thu Aug 15 21:56:05 2002 -+++ fig2dev/fig2dev.h Thu Aug 15 21:56:40 2002 -@@ -186,7 +186,7 @@ +--- fig2dev/fig2dev.h.orig Thu Dec 19 07:45:28 2002 ++++ fig2dev/fig2dev.h Tue Jan 7 20:08:45 2003 +@@ -210,7 +210,7 @@ #endif /* MAXPATHLEN */ #endif /* PATH_MAX */ --#ifndef __NetBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) +-#if ( !defined(__NetBSD__) && !defined(__DARWIN__)) ++#if ( !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DARWIN__)) extern int sys_nerr, errno; #endif diff -urN /usr/ports/print/transfig/files/patch-transfig_Imakefile print/transfig/files/patch-transfig_Imakefile --- /usr/ports/print/transfig/files/patch-transfig_Imakefile Thu Jan 1 09:00:00 1970 +++ print/transfig/files/patch-transfig_Imakefile Fri Jan 10 17:28:31 2003 @@ -0,0 +1,11 @@ +--- transfig/Imakefile.orig Thu Dec 19 07:44:03 2002 ++++ transfig/Imakefile Fri Jan 10 17:28:18 2003 +@@ -18,7 +18,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 ******* + diff -urN /usr/ports/print/transfig/pkg-plist print/transfig/pkg-plist --- /usr/ports/print/transfig/pkg-plist Tue Jul 10 08:55:59 2001 +++ print/transfig/pkg-plist Wed Jan 8 08:48:49 2003 @@ -4,6 +4,18 @@ bin/pic2tpic bin/transfig lib/X11/fig2dev/cs_CZ.ps +@exec ln -sf cs_CZ.ps %D/lib/X11/fig2dev/hr_HR.ps +@exec ln -sf cs_CZ.ps %D/lib/X11/fig2dev/hu_HU.ps +@exec ln -sf cs_CZ.ps %D/lib/X11/fig2dev/pl_PL.ps +@exec ln -sf cs_CZ.ps %D/lib/X11/fig2dev/ro_RO.ps +@exec ln -sf cs_CZ.ps %D/lib/X11/fig2dev/sk_SK.ps +@exec ln -sf cs_CZ.ps %D/lib/X11/fig2dev/sl_SI.ps +@unexec rm -f %D/lib/X11/fig2dev/sl_SI.ps +@unexec rm -f %D/lib/X11/fig2dev/sk_SK.ps +@unexec rm -f %D/lib/X11/fig2dev/ro_RO.ps +@unexec rm -f %D/lib/X11/fig2dev/pl_PL.ps +@unexec rm -f %D/lib/X11/fig2dev/hu_HU.ps +@unexec rm -f %D/lib/X11/fig2dev/hr_HR.ps lib/X11/fig2dev/japanese.ps @exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja.ps @exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.EUC.ps >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030110235847.175db8e0.tkato>