Date: Wed, 5 Jan 2000 10:14:57 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15914: Update port: graphics/xfig Message-ID: <20000105181457.49B2615033@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15914
>Category: ports
>Synopsis: Update port: graphics/xfig
>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 5 10:20:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Add message to notice Ghostscript support hook
- /usr/local -> LOCALBASE
- Remove version number from pkg/DESCR
- Sort pkg/PLIST
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/xfig/Makefile graphics/xfig/Makefile
--- /usr/ports/graphics/xfig/Makefile Wed Dec 29 20:17:07 1999
+++ graphics/xfig/Makefile Mon Jan 3 14:54:06 2000
@@ -1,5 +1,5 @@
# New ports collection makefile for: xfig
-# Version required: 3.2
+# Version required: 3.2.2
# Date created: 4 January 1995
# Whom: roberto
#
@@ -26,13 +26,22 @@
USE_IMAKE= yes
MAN1= xfig.1
-MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
- XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults \
- XFIGLIBDIR=${PREFIX}/lib/X11/xfig -f
-
+pre-fetch:
.if !defined(WANT_GS_SUPPORT)
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "If you would like build xfig with Ghostscript support"
+ @${ECHO_MSG} "you must set the variable WANT_GS_SUPPORT"
+ @${ECHO_MSG} ""
+.else
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Building xfig with Ghostscript support"
+ @${ECHO_MSG} ""
+.endif
+
post-patch:
- @( cd ${WRKSRC}; ${PERL} -pi -e 's,-DGSBIT ,,' Imakefile )
+ @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile
+.if !defined(WANT_GS_SUPPORT)
+ @${PERL} -pi -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
.endif
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/xfig/patches/patch-aa graphics/xfig/patches/patch-aa
--- /usr/ports/graphics/xfig/patches/patch-aa Wed Dec 29 20:17:07 1999
+++ graphics/xfig/patches/patch-aa Mon Jan 3 14:56:25 2000
@@ -1,5 +1,14 @@
---- Imakefile.orig Thu Jul 2 12:37:09 1998
-+++ Imakefile Tue Dec 28 16:25:42 1999
+--- Imakefile.orig Fri Jul 3 02:37:09 1998
++++ Imakefile Mon Jan 3 13:19:34 2000
+@@ -40,7 +40,7 @@
+
+ #ifdef USEJPEG
+ #ifdef USEINSTALLEDJPEG
+-JPEGLIBDIR = /usr/local/lib
++JPEGLIBDIR = %%LOCALBASE%%/lib
+ #else
+ JPEGLIBDIR = ../jpeg
+ #endif
@@ -49,12 +49,12 @@
XCOMM Uncomment the following definiton if you want to use the small icons
XCOMM for the panel buttons. Use this if you have a 800x600 or smaller screen.
@@ -45,7 +54,7 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
-JPEGINCDIR = -I/usr/include/X11
-+JPEGINCDIR = -I/usr/local/include
++JPEGINCDIR = -I%%LOCALBASE%%/include
JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
#else
JPEGCONF = configure
diff -urN /usr/ports/graphics/xfig/patches/patch-ab graphics/xfig/patches/patch-ab
--- /usr/ports/graphics/xfig/patches/patch-ab Mon Jul 6 19:48:43 1998
+++ graphics/xfig/patches/patch-ab Mon Jan 3 13:29:41 2000
@@ -1,5 +1,5 @@
---- fig.h.orig Sat Jun 6 06:51:01 1998
-+++ fig.h Mon Jul 6 17:30:02 1998
+--- fig.h.orig Sat Jun 6 05:51:01 1998
++++ fig.h Mon Jan 3 13:29:31 2000
@@ -24,6 +24,8 @@
#if defined(ultrix) || defined(__bsdi__) || defined(Mips)
#include <sys/types.h> /* for stat structure */
@@ -9,3 +9,13 @@
#include <sys/stat.h>
#if defined(__convex__) && defined(__STDC__)
+@@ -294,7 +296,8 @@
+ #endif /* X_NOT_STDC_ENV */
+ #endif /* defined(SYSV) && defined(SYSV386) */
+
+-#if defined(SYSV) || defined(SVR4) || defined(__osf__) || defined(USE_DIRENT)
++#if defined(SYSV) || defined(SVR4) || defined(__osf__) || \
++ defined(__FreeBSD__) || defined(USE_DIRENT)
+ #define u_int uint
+ #define USE_DIRENT
+ #define DIRSTRUCT struct dirent
diff -urN /usr/ports/graphics/xfig/pkg/DESCR graphics/xfig/pkg/DESCR
--- /usr/ports/graphics/xfig/pkg/DESCR Mon Jul 6 19:48:43 1998
+++ graphics/xfig/pkg/DESCR Mon Jan 3 12:41:16 2000
@@ -1,4 +1,4 @@
-XFIG 3.2.2 - Facility for Interactive Generation of figures under X11
+XFIG - Facility for Interactive Generation of figures under X11
Xfig is a menu-driven tool that allows the user to draw and manipulate objects
interactively in an X window. The resulting pictures can be saved, printed
diff -urN /usr/ports/graphics/xfig/pkg/PLIST graphics/xfig/pkg/PLIST
--- /usr/ports/graphics/xfig/pkg/PLIST Mon Oct 5 19:15:56 1998
+++ graphics/xfig/pkg/PLIST Mon Jan 3 14:45:50 2000
@@ -1,7 +1,7 @@
bin/xfig
-lib/X11/xfig/CompKeyDB
lib/X11/app-defaults/Fig
lib/X11/app-defaults/Fig-color
+lib/X11/xfig/CompKeyDB
lib/X11/xfig/Libraries/Buildings/barrack.fig
lib/X11/xfig/Libraries/Buildings/highrise1.fig
lib/X11/xfig/Libraries/Buildings/highrise2.fig
@@ -192,8 +192,8 @@
lib/X11/xfig/Libraries/Music/staff.fig
lib/X11/xfig/Libraries/Music/treble_clef.fig
lib/X11/xfig/Libraries/Music/treble_staff.fig
-lib/X11/xfig/Libraries/Music/whole.fig
lib/X11/xfig/Libraries/Music/whole-dotted.fig
+lib/X11/xfig/Libraries/Music/whole.fig
lib/X11/xfig/Libraries/Networks/at+t_emmi.fig
lib/X11/xfig/Libraries/Networks/concentrator1.fig
lib/X11/xfig/Libraries/Networks/concentrator2.fig
@@ -215,8 +215,6 @@
lib/X11/xfig/Libraries/Networks/transceiver1.fig
lib/X11/xfig/Libraries/Networks/transceiver2.fig
lib/X11/xfig/Libraries/Networks/transceiver3.fig
-lib/X11/xfig/xfig-howto.pdf
-lib/X11/xfig/xfig.pdf
lib/X11/xfig/html/accelerators.html
lib/X11/xfig/html/authors.html
lib/X11/xfig/html/command-panel.html
@@ -226,28 +224,6 @@
lib/X11/xfig/html/features_bugs.html
lib/X11/xfig/html/fig-format.html
lib/X11/xfig/html/i18n.html
-lib/X11/xfig/html/index.html
-lib/X11/xfig/html/indicator-panel.html
-lib/X11/xfig/html/installation.html
-lib/X11/xfig/html/introduction.html
-lib/X11/xfig/html/misc-panel.html
-lib/X11/xfig/html/options.html
-lib/X11/xfig/html/japanese/accelerators.html
-lib/X11/xfig/html/japanese/authors.html
-lib/X11/xfig/html/japanese/command-panel.html
-lib/X11/xfig/html/japanese/drawing-mode.html
-lib/X11/xfig/html/japanese/editing-mode.html
-lib/X11/xfig/html/japanese/faq.html
-lib/X11/xfig/html/japanese/features_bugs.html
-lib/X11/xfig/html/japanese/fig-format.html
-lib/X11/xfig/html/japanese/i18n.html
-lib/X11/xfig/html/japanese/index.html
-lib/X11/xfig/html/japanese/indicator-panel.html
-lib/X11/xfig/html/japanese/installation.html
-lib/X11/xfig/html/japanese/introduction.html
-lib/X11/xfig/html/japanese/japanese.ps
-lib/X11/xfig/html/japanese/misc-panel.html
-lib/X11/xfig/html/japanese/options.html
lib/X11/xfig/html/images/3dhouse-small.gif
lib/X11/xfig/html/images/3dhouse.gif
lib/X11/xfig/html/images/a-umlaut.gif
@@ -263,7 +239,6 @@
lib/X11/xfig/html/images/angle-geom-mounthattan.gif
lib/X11/xfig/html/images/angle-geom-unrestricted.gif
lib/X11/xfig/html/images/anybrowser3.gif
-lib/X11/xfig/html/images/exclaim.gif
lib/X11/xfig/html/images/arc-box-button.gif
lib/X11/xfig/html/images/arc-button.gif
lib/X11/xfig/html/images/arc-examples.gif
@@ -281,7 +256,6 @@
lib/X11/xfig/html/images/arrow-pointed.gif
lib/X11/xfig/html/images/arrow-size-button.gif
lib/X11/xfig/html/images/arrow-size-image.gif
-lib/X11/xfig/html/images/redball.gif
lib/X11/xfig/html/images/arrow-size-panel.gif
lib/X11/xfig/html/images/arrow-type-button.gif
lib/X11/xfig/html/images/arrow-types.gif
@@ -299,7 +273,6 @@
lib/X11/xfig/html/images/cap-style-example.gif
lib/X11/xfig/html/images/cap-style-projecting.gif
lib/X11/xfig/html/images/cap-style-round.gif
-lib/X11/xfig/html/images/ruler.gif
lib/X11/xfig/html/images/circle-diam-button.gif
lib/X11/xfig/html/images/circle-example.gif
lib/X11/xfig/html/images/circle-rad-button.gif
@@ -320,6 +293,7 @@
lib/X11/xfig/html/images/ellipse-diam-button.gif
lib/X11/xfig/html/images/ellipse-example.gif
lib/X11/xfig/html/images/ellipse-rad-button.gif
+lib/X11/xfig/html/images/exclaim.gif
lib/X11/xfig/html/images/export-panel.gif
lib/X11/xfig/html/images/file-panel.gif
lib/X11/xfig/html/images/fill-color-button.gif
@@ -365,7 +339,6 @@
lib/X11/xfig/html/images/open-approx-spline-button.gif
lib/X11/xfig/html/images/open-compound-button.gif
lib/X11/xfig/html/images/open-compound-button.gif.bak
-lib/X11/xfig/html/images/splash.gif
lib/X11/xfig/html/images/open-interp-spline-button.gif
lib/X11/xfig/html/images/pen-color-button.gif
lib/X11/xfig/html/images/pict-button.gif
@@ -378,11 +351,13 @@
lib/X11/xfig/html/images/polyline-example.gif
lib/X11/xfig/html/images/print-panel.gif
lib/X11/xfig/html/images/pull-down.gif
+lib/X11/xfig/html/images/redball.gif
lib/X11/xfig/html/images/redballdot.gif
lib/X11/xfig/html/images/regular-polygon-button.gif
lib/X11/xfig/html/images/rotate-angle-button.gif
lib/X11/xfig/html/images/rotate-ccw-button.gif
lib/X11/xfig/html/images/rotate-cw-button.gif
+lib/X11/xfig/html/images/ruler.gif
lib/X11/xfig/html/images/scale-button.gif
lib/X11/xfig/html/images/screen-image-small.gif
lib/X11/xfig/html/images/screen-image.fig
@@ -394,6 +369,7 @@
lib/X11/xfig/html/images/smart-link-move.gif
lib/X11/xfig/html/images/smart-link-off.gif
lib/X11/xfig/html/images/smart-link-slide.gif
+lib/X11/xfig/html/images/splash.gif
lib/X11/xfig/html/images/spline-curves.gif
lib/X11/xfig/html/images/spline-examples.gif
lib/X11/xfig/html/images/spline-line-button.gif
@@ -438,18 +414,42 @@
lib/X11/xfig/html/images/xim-root.gif
lib/X11/xfig/html/images/zoom-button.gif
lib/X11/xfig/html/images/zoom-panel.gif
-@dirrm lib/X11/xfig/Libraries/Buildings
-@dirrm lib/X11/xfig/Libraries/Computers
-@dirrm lib/X11/xfig/Libraries/Electrical/Physical
+lib/X11/xfig/html/index.html
+lib/X11/xfig/html/indicator-panel.html
+lib/X11/xfig/html/installation.html
+lib/X11/xfig/html/introduction.html
+lib/X11/xfig/html/japanese/accelerators.html
+lib/X11/xfig/html/japanese/authors.html
+lib/X11/xfig/html/japanese/command-panel.html
+lib/X11/xfig/html/japanese/drawing-mode.html
+lib/X11/xfig/html/japanese/editing-mode.html
+lib/X11/xfig/html/japanese/faq.html
+lib/X11/xfig/html/japanese/features_bugs.html
+lib/X11/xfig/html/japanese/fig-format.html
+lib/X11/xfig/html/japanese/i18n.html
+lib/X11/xfig/html/japanese/index.html
+lib/X11/xfig/html/japanese/indicator-panel.html
+lib/X11/xfig/html/japanese/installation.html
+lib/X11/xfig/html/japanese/introduction.html
+lib/X11/xfig/html/japanese/japanese.ps
+lib/X11/xfig/html/japanese/misc-panel.html
+lib/X11/xfig/html/japanese/options.html
+lib/X11/xfig/html/misc-panel.html
+lib/X11/xfig/html/options.html
+lib/X11/xfig/xfig-howto.pdf
+lib/X11/xfig/xfig.pdf
+@dirrm lib/X11/xfig/html/japanese
+@dirrm lib/X11/xfig/html/images
+@dirrm lib/X11/xfig/html
+@dirrm lib/X11/xfig/Libraries/Networks
+@dirrm lib/X11/xfig/Libraries/Music
+@dirrm lib/X11/xfig/Libraries/Logic
+@dirrm lib/X11/xfig/Libraries/Hospital
+@dirrm lib/X11/xfig/Libraries/Flowchart
@dirrm lib/X11/xfig/Libraries/Electrical/Schematic
+@dirrm lib/X11/xfig/Libraries/Electrical/Physical
@dirrm lib/X11/xfig/Libraries/Electrical
-@dirrm lib/X11/xfig/Libraries/Flowchart
-@dirrm lib/X11/xfig/Libraries/Hospital
-@dirrm lib/X11/xfig/Libraries/Logic
-@dirrm lib/X11/xfig/Libraries/Music
-@dirrm lib/X11/xfig/Libraries/Networks
+@dirrm lib/X11/xfig/Libraries/Computers
+@dirrm lib/X11/xfig/Libraries/Buildings
@dirrm lib/X11/xfig/Libraries
-@dirrm lib/X11/xfig/html/images
-@dirrm lib/X11/xfig/html/japanese
-@dirrm lib/X11/xfig/html
@dirrm lib/X11/xfig
>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?20000105181457.49B2615033>