Date: Wed, 20 Jan 1999 16:30:07 -0800 (PST) From: taoka@infonets.hiroshima-u.ac.jp To: freebsd-gnats-submit@FreeBSD.ORG Subject: ports/9592: [Update] print/transfig Message-ID: <199901210030.QAA09592@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 9592
>Category: ports
>Synopsis: [Update] print/transfig
>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 20 16:40:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Satoshi TAOKA
>Release:
>Organization:
Hiroshima University, Japan
>Environment:
>Description:
By applying the next patch, a version of transfig
becomes 3.2.1.
You should delete the files:
transfig/patches/patch-aa
transfig/patches/patch-ab
transfig/patches/patch-ad
transfig/patches/patch-ae
and
notice that transfig/patches/patch-af
is a new file.
>How-To-Repeat:
>Fix:
diff -x CVS -Nur /usr/ports/print/transfig/Makefile print/transfig/Makefile
--- /usr/ports/print/transfig/Makefile Mon Oct 5 08:36:15 1998
+++ print/transfig/Makefile Tue Jan 19 10:14:20 1999
@@ -1,17 +1,17 @@
# New ports collection makefile for: transfig
-# Version required: 3.2
+# Version required: 3.2.1
# Date created: 9 August 1996
# Whom: chuckr@freebsd.org
#
# $Id: Makefile,v 1.22 1998/10/03 21:34:09 steve Exp $
#
-DISTNAME= transfig.3.2
-PKGNAME= transfig-3.2
+DISTNAME= transfig.3.2.1
+PKGNAME= transfig-3.2.1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_XCONTRIB} ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= applications/drawing_tools/transfig
-DISTFILES= transfig.3.2.tar.gz transfig.3.2.ja_JP.EUC.ps.gz
+DISTFILES= transfig.3.2.1.tar.gz transfig.3.2.ja_JP.EUC.ps.gz
MAINTAINER= chuckr@freebsd.org
@@ -20,7 +20,7 @@
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
USE_IMAKE= yes
-EXTRACT_ONLY= transfig.3.2.tar.gz
+EXTRACT_ONLY= transfig.3.2.1.tar.gz
MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
post-install:
diff -x CVS -Nur /usr/ports/print/transfig/files/md5 print/transfig/files/md5
--- /usr/ports/print/transfig/files/md5 Sat Jun 6 14:49:14 1998
+++ print/transfig/files/md5 Tue Jan 19 10:15:04 1999
@@ -1,2 +1,2 @@
-MD5 (transfig.3.2.tar.gz) = d5ded82f303c75a92bbf4bec568e7853
+MD5 (transfig.3.2.1.tar.gz) = 6bc1ecdd6b72da1bf3ad4ffcb7975fb9
MD5 (transfig.3.2.ja_JP.EUC.ps.gz) = c608af518c15cf44d57a6abe3ce86b2f
diff -x CVS -Nur /usr/ports/print/transfig/patches/patch-aa print/transfig/patches/patch-aa
--- /usr/ports/print/transfig/patches/patch-aa Thu Aug 28 13:21:29 1997
+++ print/transfig/patches/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,20 +0,0 @@
---- fig2dev/read1_3.c.orig Mon Mar 3 14:38:36 1997
-+++ fig2dev/read1_3.c Mon Aug 25 21:44:46 1997
-@@ -29,6 +29,7 @@
- /*******************************************************************/
- #include <stdio.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <errno.h>
- #include "alloc.h"
-@@ -52,7 +53,9 @@
- extern F_arrow *forward_arrow(), *backward_arrow();
- extern int figure_modified;
- #ifndef __NetBSD__
-+#if !defined(BSD) || (BSD < 199306)
- extern char *sys_errlist[];
-+#endif
- extern int sys_nerr, errno;
- #endif
-
diff -x CVS -Nur /usr/ports/print/transfig/patches/patch-ab print/transfig/patches/patch-ab
--- /usr/ports/print/transfig/patches/patch-ab Thu Aug 28 13:21:30 1997
+++ print/transfig/patches/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- fig2dev/dev/genps.c.orig Fri Aug 22 14:33:56 1997
-+++ fig2dev/dev/genps.c Mon Aug 25 21:40:30 1997
-@@ -48,7 +48,7 @@
- #include <pwd.h>
- #include <errno.h>
- #ifndef __NetBSD__
--#if (! (defined(BSD) && (BSD >= 199306)))
-+#if !defined(BSD) || (BSD < 199306)
- extern char *sys_errlist[];
- #endif
- #endif
diff -x CVS -Nur /usr/ports/print/transfig/patches/patch-ac print/transfig/patches/patch-ac
--- /usr/ports/print/transfig/patches/patch-ac Wed Sep 23 08:33:40 1998
+++ print/transfig/patches/patch-ac Tue Jan 19 11:14:28 1999
@@ -1,36 +1,29 @@
---- fig2dev/Imakefile.orig Fri Aug 22 23:33:55 1997
-+++ fig2dev/Imakefile Sat Sep 27 14:35:49 1997
-@@ -37,7 +37,7 @@
+--- fig2dev/Imakefile.orig Wed Jul 1 08:52:50 1998
++++ fig2dev/Imakefile Tue Jan 19 11:14:16 1999
+@@ -42,7 +42,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 Uncomment the XPM variables here if you have the XPM (color pixmap)
- XCOMM package and you would like to allow XPM files.
-@@ -100,8 +100,8 @@
- XCOMM Hint: Users of LaTeX2e will probably want to include both of these
- XCOMM options; users of LaTeX 2.09 will probably want to include neither.
-
--XCOMM DDNFSS = -DNFSS
--XCOMM DDEPSF = -DEPSF
-+DDNFSS = -DNFSS
-+DDEPSF = -DEPSF
-
- XCOMM For Linux machines or any machines that have a separate library for
- XCOMM the database management routines, uncomment the following line
-@@ -116,7 +116,8 @@
+ XCOMM Unomment the #define for USEXPM if you want to use the XPM
+ XCOMM (color pixmap) package.
+@@ -112,11 +112,11 @@
XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
--XCOMM I18N_DEFS = -DI18N -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
-+I18N_DEFS = -DI18N
+-XCOMM #define I18N
++#define I18N
+
+ #ifdef I18N
+ I18N_DEFS = -DI18N
+-I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(PREFIX)/lib/X11/fig2dev\"'
+ #endif
DEFINES = $(NEED_STRERROR) $(HAVE_NO_STRCASECMP) $(HAVE_NO_STRNCASECMP) $(USEINLINE) \
- $(I18N_DEFS)
-@@ -138,7 +139,7 @@
+@@ -154,7 +154,7 @@
#ifdef USEINSTALLEDJPEG
JPEGLIBDIR = /usr/local/lib
@@ -38,26 +31,13 @@
+JPEGINCDIR = /usr/local/include
JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
#else
- JPEGLIBDIR = ../../jpeg
-@@ -161,7 +162,7 @@
- #endif
-
- DEVDEFINES = $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(XPMDBM) \
-- $(DDNFSS) $(DDEPSF) $(DDA4) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEFS)
-+ $(DDNFSS) $(DDEPSF) $(DDA4) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
-
- #define IHaveSubdirs
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-@@ -175,10 +176,10 @@
- INCLUDES = -I.. -I$(JPEGINCDIR)
+ 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)
- SYS_LIBRARIES = $(XPMLIB) $(DBMLIB) -lm -lcompat
++#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
+ SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm -lcompat
#else
--SYS_LIBRARIES = $(XPMLIB) $(DBMLIB) -lm
-+SYS_LIBRARIES = $(XPMLIB) $(XLIB) $(DBMLIB) -lm -lcompat
- #endif
- DEPLIBS = $(LIBTRANSFIG)
-
+ SYS_LIBRARIES = $(XPMLIBS) $(DBMLIB) -lm
diff -x CVS -Nur /usr/ports/print/transfig/patches/patch-ad print/transfig/patches/patch-ad
--- /usr/ports/print/transfig/patches/patch-ad Thu Aug 28 13:21:33 1997
+++ print/transfig/patches/patch-ad Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- fig2dev/read.c.orig Fri Jun 20 14:55:50 1997
-+++ fig2dev/read.c Mon Aug 25 21:42:00 1997
-@@ -56,7 +56,7 @@
- strerror(e)
- int e;
- {
--#if (! (defined(BSD) && (BSD >= 199306)) && !defined(__NetBSD__))
-+#if !defined(BSD) || (BSD < 199306)
- extern char *sys_errlist[];
- #endif
- return sys_errlist[e];
diff -x CVS -Nur /usr/ports/print/transfig/patches/patch-ae print/transfig/patches/patch-ae
--- /usr/ports/print/transfig/patches/patch-ae Thu Apr 16 17:17:03 1998
+++ print/transfig/patches/patch-ae Thu Jan 1 09:00:00 1970
@@ -1,33 +0,0 @@
-Date: Tue, 10 Feb 98 08:50:58 PST
-From: "Brian V. Smith" <xfigmail@epb1.lbl.gov>
-To: Stefan.Walder@wtech.ruhr-uni-bochum.de
-Subject: Re: Wrong scaling in PSTEX-Files
-
- > iI thinks the scaling of the TeX or PS part of the pstex-file is wrong. Whe=
- > n I
- > export my work the LaTeX-text is not at the coorect location.=20
- > So I've used an older version of xfig. It works!=20
- > The old version is: xfig 3.2 pl 0 - beta3
- > The new version is: xfig 3.2 pl 0 - beta4
- >
- > Please help
-
-This patch should fix the problem.
-Regards,
-Brian Smith
-
-*** fig2dev/dev/genlatex.c.orig Tue Oct 7 09:34:30 1997
---- fig2dev/dev/genlatex.c Tue Oct 7 09:25:43 1997
-***************
-*** 233,238 ****
---- 233,240 ----
-
- coord_system = objects->nwcorner.y;
- unitlength = mag/objects->nwcorner.x;
-+ if (metric)
-+ unitlength *= 80.0/76.2;
- dash_mag /= unitlength;
-
- switch (coord_system) {
-
-
diff -x CVS -Nur /usr/ports/print/transfig/patches/patch-af print/transfig/patches/patch-af
--- /usr/ports/print/transfig/patches/patch-af Thu Jan 1 09:00:00 1970
+++ print/transfig/patches/patch-af Tue Jan 19 11:05:56 1999
@@ -0,0 +1,13 @@
+--- 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
>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?199901210030.QAA09592>