From owner-freebsd-ports Mon Oct 23 11:50:15 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AEF5B37B4E5 for ; Mon, 23 Oct 2000 11:50:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id LAA28601; Mon, 23 Oct 2000 11:50:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A872837B4C5; Mon, 23 Oct 2000 11:43:52 -0700 (PDT) Message-Id: <20001023184352.A872837B4C5@hub.freebsd.org> Date: Mon, 23 Oct 2000 11:43:52 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/22255: Update port: print/transfig to 3.2.3c (fix ports/20267) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22255 >Category: ports >Synopsis: Update port: print/transfig to 3.2.3c (fix ports/20267) >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: Mon Oct 23 11:50:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.2.3c Remove file: files/patch-ag This PR supersedes ports/20267(left alone for about 3 months). >How-To-Repeat: >Fix: diff -urN /usr/ports/print/transfig/Makefile print/transfig/Makefile --- /usr/ports/print/transfig/Makefile Thu Aug 3 21:28:33 2000 +++ print/transfig/Makefile Tue Oct 24 03:21:00 2000 @@ -6,10 +6,10 @@ # PORTNAME= transfig -PORTVERSION= 3.2.3 +PORTVERSION= 3.2.3c CATEGORIES= print MASTER_SITES= ${MASTER_SITE_XCONTRIB} \ - ftp://www-epb.lbl.gov/xfig/ + ftp://www-epb.lbl.gov/xfig/libraries/ MASTER_SITE_SUBDIR= applications/drawing_tools/transfig DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -21,8 +21,5 @@ USE_IMAKE= yes USE_XPM= yes MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1 - -post-patch: - @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/fig2dev/Imakefile .include diff -urN /usr/ports/print/transfig/distinfo print/transfig/distinfo --- /usr/ports/print/transfig/distinfo Thu Jan 27 11:58:55 2000 +++ print/transfig/distinfo Sat Jul 29 00:50:06 2000 @@ -1 +1 @@ -MD5 (transfig.3.2.3.tar.gz) = 1cd02e931b9cf7dfb955694369e72c8c +MD5 (transfig.3.2.3c.tar.gz) = cefd377ff3c4ec9aa38a42e98944d9b3 diff -urN /usr/ports/print/transfig/files/patch-ac print/transfig/files/patch-ac --- /usr/ports/print/transfig/files/patch-ac Thu Jan 27 11:58:56 2000 +++ print/transfig/files/patch-ac Sat Jul 29 00:55:44 2000 @@ -1,24 +1,24 @@ ---- fig2dev/Imakefile.orig Fri Jan 14 12:59:04 2000 -+++ fig2dev/Imakefile Sat Jan 22 09:16:13 2000 -@@ -27,7 +27,7 @@ +--- fig2dev/Imakefile.orig Fri Jul 21 01:38:53 2000 ++++ fig2dev/Imakefile Sat Jul 29 00:55:31 2000 +@@ -28,7 +28,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 = $(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. -@@ -38,7 +38,7 @@ +@@ -47,7 +47,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 **************** 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 @@ +@@ -67,11 +67,11 @@ XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) XCOMM @@ -31,20 +31,20 @@ +XPMINC = -I$(INCDIR)/X11 #endif - XCOMM For Linux machines or any machines that have a separate library for -@@ -87,8 +87,8 @@ + XCOMM **************** +@@ -91,8 +91,8 @@ #ifdef USEJPEG #ifdef USEINSTALLEDJPEG -JPEGLIBDIR = /usr/local/lib -JPEGINCDIR = /usr/include/X11 -+JPEGLIBDIR = %%LOCALBASE%%/lib -+JPEGINCDIR = %%LOCALBASE%%/include ++JPEGLIBDIR = ${LOCALBASE}/lib ++JPEGINCDIR = ${LOCALBASE}/include #else JPEGLIBDIR = ../jpeg JPEGINCDIR = $(JPEGLIBDIR) -@@ -127,12 +127,12 @@ - +@@ -141,11 +141,11 @@ + XCOMM **************** XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig. -XCOMM #define I18N @@ -53,18 +53,7 @@ #ifdef I18N I18N_DEFS = -DI18N -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev --I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"' +FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev -+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(FIG2DEV_LIBDIR)\"' + I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\" install:: - [ -d $(FIG2DEV_LIBDIR) ] || mkdir $(FIG2DEV_LIBDIR) -@@ -177,7 +177,7 @@ - DUSEJPEG = -DUSE_JPEG - - #ifdef USEINSTALLEDJPEG --JPEGLIBDIR = /usr/local/lib -+JPEGLIBDIR = %%LOCALBASE%%/lib - JPEGLIB = -L$(JPEGLIBDIR) -ljpeg - #else - XCOMM this is relative to this directory (transfig/fig2dev) diff -urN /usr/ports/print/transfig/files/patch-ag print/transfig/files/patch-ag --- /usr/ports/print/transfig/files/patch-ag Thu Jan 27 11:58:57 2000 +++ print/transfig/files/patch-ag Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- 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 - >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message