Date: Wed, 26 Jan 2000 07:14:34 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/16381: Update port: print/transfig to 3.2.3 Message-ID: <20000126151434.45CB114A0A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 16381
>Category: ports
>Synopsis: Update port: print/transfig to 3.2.3
>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: Wed Jan 26 07:20:03 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 3.2.3
New file:
patches/patch-ag
Remove file:
patches/patch-af
Note:
Since latest version of transfig supports ko_KR.EUC printing by default,
ports/16375 should be superseded by this PR.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/print/transfig/Makefile print/transfig/Makefile
--- /usr/ports/print/transfig/Makefile Tue Aug 31 19:17:21 1999
+++ print/transfig/Makefile Sat Jan 22 10:54:08 2000
@@ -1,17 +1,17 @@
# New ports collection makefile for: transfig
-# Version required: 3.2.1
+# Version required: 3.2.3
# Date created: 9 August 1996
# Whom: chuckr@freebsd.org
#
# $FreeBSD: ports/print/transfig/Makefile,v 1.24 1999/08/31 01:45:25 peter Exp $
#
-DISTNAME= transfig.3.2.1
-PKGNAME= transfig-3.2.1
+DISTNAME= transfig.3.2.3
+PKGNAME= transfig-3.2.3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+ ftp://www-epb.lbl.gov/xfig/
MASTER_SITE_SUBDIR= applications/drawing_tools/transfig
-DISTFILES= transfig.3.2.1.tar.gz transfig.3.2.ja_JP.EUC.ps.gz
MAINTAINER= chuckr@freebsd.org
@@ -20,12 +20,9 @@
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
USE_IMAKE= yes
-EXTRACT_ONLY= transfig.3.2.1.tar.gz
MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
-post-install:
- @${MKDIR} ${PREFIX}/lib/X11/fig2dev
- @${GZCAT} ${DISTDIR}/transfig.3.2.ja_JP.EUC.ps.gz \
- > ${PREFIX}/lib/X11/fig2dev/ja_JP.EUC.ps
+post-patch:
+ @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/fig2dev/Imakefile
.include <bsd.port.mk>
diff -urN /usr/ports/print/transfig/files/md5 print/transfig/files/md5
--- /usr/ports/print/transfig/files/md5 Tue Jan 26 20:27:34 1999
+++ print/transfig/files/md5 Sat Jan 22 08:53:37 2000
@@ -1,2 +1 @@
-MD5 (transfig.3.2.1.tar.gz) = 6bc1ecdd6b72da1bf3ad4ffcb7975fb9
-MD5 (transfig.3.2.ja_JP.EUC.ps.gz) = c608af518c15cf44d57a6abe3ce86b2f
+MD5 (transfig.3.2.3.tar.gz) = 1cd02e931b9cf7dfb955694369e72c8c
diff -urN /usr/ports/print/transfig/patches/patch-ac print/transfig/patches/patch-ac
--- /usr/ports/print/transfig/patches/patch-ac Sat Jan 22 08:20:46 2000
+++ print/transfig/patches/patch-ac Sat Jan 22 09:16:25 2000
@@ -1,24 +1,49 @@
---- fig2dev/Imakefile.orig Tue Jun 30 16:52:50 1998
-+++ fig2dev/Imakefile Fri Dec 24 10:44:17 1999
-@@ -31,7 +31,7 @@
+--- fig2dev/Imakefile.orig Fri Jan 14 12:59:04 2000
++++ fig2dev/Imakefile Sat Jan 22 09:16:13 2000
+@@ -27,7 +27,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.
-XFIGLIBDIR = /usr/local/lib/X11/xfig
-+XFIGLIBDIR = $(PREFIX)/lib/X11/xfig
++XFIGLIBDIR = $(LIBDIR)/xfig
XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
XCOMM comment out NEED_STRERROR with an XCOMM comment.
-@@ -42,7 +42,7 @@
+@@ -38,7 +38,7 @@
XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
- XCOMM Unomment the #define for USEXPM if you want to use the XPM
- XCOMM (color pixmap) package.
-@@ -112,11 +112,11 @@
+ XCOMM Change RGB if necessary, to point to your rgb.txt color database
+ XCOMM file (for X11). This is needed for the -g (background color) option.
+@@ -54,11 +54,11 @@
+ XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
+ XCOMM
+
+-XCOMM #define USEXPM
++#define USEXPM
+
+ #ifdef USEXPM
+ XPMLIBDIR = $(USRLIBDIR)
+-XPMINC = -I/usr/include/X11
++XPMINC = -I$(INCDIR)/X11
+ #endif
+
+ XCOMM For Linux machines or any machines that have a separate library for
+@@ -87,8 +87,8 @@
+
+ #ifdef USEJPEG
+ #ifdef USEINSTALLEDJPEG
+-JPEGLIBDIR = /usr/local/lib
+-JPEGINCDIR = /usr/include/X11
++JPEGLIBDIR = %%LOCALBASE%%/lib
++JPEGINCDIR = %%LOCALBASE%%/include
+ #else
+ JPEGLIBDIR = ../jpeg
+ JPEGINCDIR = $(JPEGLIBDIR)
+@@ -127,12 +127,12 @@
XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
@@ -27,26 +52,19 @@
#ifdef I18N
I18N_DEFS = -DI18N
+-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
-I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
-+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(PREFIX)/lib/X11/fig2dev\"'
- #endif
++FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
++I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(FIG2DEV_LIBDIR)\"'
- DEFINES = $(NEED_STRERROR) $(HAVE_NO_STRCASECMP) $(HAVE_NO_STRNCASECMP) $(USEINLINE) \
-@@ -154,7 +154,7 @@
+ install::
+ [ -d $(FIG2DEV_LIBDIR) ] || mkdir $(FIG2DEV_LIBDIR)
+@@ -177,7 +177,7 @@
+ DUSEJPEG = -DUSE_JPEG
#ifdef USEINSTALLEDJPEG
- JPEGLIBDIR = /usr/local/lib
--JPEGINCDIR = /usr/include/X11
-+JPEGINCDIR = /usr/local/include
+-JPEGLIBDIR = /usr/local/lib
++JPEGLIBDIR = %%LOCALBASE%%/lib
JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
#else
XCOMM this is relative to this directory (transfig/fig2dev)
-@@ -182,7 +182,7 @@
- INCLUDES = -I..
-
- LOCAL_LIBRARIES = $(LIBTRANSFIG) $(JPEGLIB)
--#if defined(NetBSDArchitecture)
-+#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
- SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm -lcompat
- #else
- SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm
diff -urN /usr/ports/print/transfig/patches/patch-af print/transfig/patches/patch-af
--- /usr/ports/print/transfig/patches/patch-af Tue Jan 26 11:42:34 1999
+++ print/transfig/patches/patch-af Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
---- fig2dev/fig2dev.h.~1~ Thu Feb 12 08:13:01 1998
-+++ fig2dev/fig2dev.h Tue Jan 19 11:04:53 1999
-@@ -163,6 +163,10 @@
- #endif /* MAXPATHLEN */
- #endif /* PATH_MAX */
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifndef __NetBSD__
- extern int sys_nerr, errno;
- #endif
diff -urN /usr/ports/print/transfig/patches/patch-ag print/transfig/patches/patch-ag
--- /usr/ports/print/transfig/patches/patch-ag Thu Jan 1 09:00:00 1970
+++ print/transfig/patches/patch-ag Sat Jan 22 10:15:49 2000
@@ -0,0 +1,11 @@
+--- fig2dev/dev/Imakefile.orig Thu Jan 6 03:30:09 2000
++++ fig2dev/dev/Imakefile Sat Jan 22 10:15:39 2000
+@@ -22,7 +22,7 @@
+ XCOMM the party supplying this software to the X Consortium.
+
+ INCLUDES = -I.. -I../..
+-#ifdef JPEGINCDIR
++#ifdef USE_JPEG
+ JPEGINC = -I$(JPEGINCDIR)
+ #endif
+
diff -urN /usr/ports/print/transfig/pkg/PLIST print/transfig/pkg/PLIST
--- /usr/ports/print/transfig/pkg/PLIST Sat Dec 25 08:16:53 1999
+++ print/transfig/pkg/PLIST Sat Jan 22 10:44:32 2000
@@ -3,7 +3,28 @@
bin/fig2ps2tex.sh
bin/pic2tpic
bin/transfig
-lib/X11/fig2dev/ja_JP.EUC.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
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.eucJP.ps
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.ps
+@exec ln -sf japanese.ps %D/lib/X11/fig2dev/ja_JP.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.eucJP.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja_JP.EUC.ps
+@unexec rm -f %D/lib/X11/fig2dev/ja.ps
+lib/X11/fig2dev/korean.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.EUC.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.eucKR.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.ps
+@exec ln -sf korean.ps %D/lib/X11/fig2dev/ko_KR.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.ujis.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.eucKR.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko_KR.EUC.ps
+@unexec rm -f %D/lib/X11/fig2dev/ko.ps
lib/X11/xfig/bitmaps/bricks.bmp
lib/X11/xfig/bitmaps/circles.bmp
lib/X11/xfig/bitmaps/crosshatch.bmp
>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?20000126151434.45CB114A0A>