Upgrade Xfig to the 3.2 level. Accompanied by the transfig upgrade

at the same time (see ports/print/transfig).
Submitted by:	Brian N. Handy <handy@sag.space.lockheed.com>
This commit is contained in:
Chuck Robey 1997-08-28 04:27:57 +00:00
parent 487ef124a6
commit 31279b7761
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=7711
6 changed files with 106 additions and 64 deletions

View file

@ -1,13 +1,13 @@
# New ports collection makefile for: xfig # New ports collection makefile for: xfig
# Version required: 3.1.4 # Version required: 3.2
# Date created: 4 January 1995 # Date created: 4 January 1995
# Whom: roberto # Whom: roberto
# #
# $Id: Makefile,v 1.14 1996/11/19 04:18:46 asami Exp $ # $Id: Makefile,v 1.15 1997/05/02 04:12:10 asami Exp $
# #
DISTNAME= xfig.3.1.4 DISTNAME= xfig.3.2
PKGNAME= xfig-3.1.4 PKGNAME= xfig-3.2
CATEGORIES= graphics x11 CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/drawing_tools/xfig MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
MAINTAINER= asami@FreeBSD.ORG MAINTAINER= asami@FreeBSD.ORG
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \ LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig
USE_IMAKE= yes USE_IMAKE= yes

View file

@ -1 +1 @@
MD5 (xfig.3.1.4.tar.gz) = 7975c747260e6eb3e2cc9a79d97a77c2 MD5 (xfig.3.2.tar.gz) = d16c4662b96e3f9d0735b7612c7d016b

View file

@ -1,40 +1,60 @@
--- Imakefile.orig Thu Aug 17 20:24:24 1995 --- Imakefile.orig Fri Aug 22 16:59:16 1997
+++ Imakefile Sun Sep 24 12:52:35 1995 +++ Imakefile Tue Aug 26 13:14:52 1997
@@ -42,10 +42,10 @@ @@ -46,12 +46,12 @@
XCOMM You need XPM version 3.4c or newer. This is available from ftp.x.org
XCOMM in /contrib/libraries.
-XCOMM XPMDEFINES = -DUSE_XPM -DUSE_XPM_ICON
-XCOMM XPMLIBDIR = /usr/lib
-XCOMM XPMINCDIR = /usr/include/X11
-XCOMM XPMLIB = -L$(XPMLIBDIR) -lXpm
+XPMDEFINES = -DUSE_XPM -DUSE_XPM_ICON
+XPMLIBDIR = $(USRLIBDIR)
+XPMINCDIR = $(INCROOT)/X11
+XPMLIB = -L$(XPMLIBDIR) -lXpm
XCOMM If you have installed the jpeg library on your system, uncomment the
XCOMM USEINSTALLEDJPEG variable, change the JPEGLIBDIR variable to the directory
@@ -56,11 +56,11 @@
XCOMM set JPEGLIBDIR after the #else to the directory where you have the source XCOMM set JPEGLIBDIR after the #else to the directory where you have the source
XCOMM for jpeg. XCOMM for jpeg.
-XCOMM #define USEINSTALLEDJPEG -XCOMM #define USEINSTALLEDJPEG
+#define USEINSTALLEDJPEG +#define USEINSTALLEDJPEG
XCOMM Uncomment the following definition for XAWLIB if you want to use
XCOMM the 3d Athena Widget Set (highly recommended!)
-XCOMM XAWLIB = -lXaw3d
+XAWLIB = -lXaw3d
XCOMM Uncomment the following if needed for DECstations running older X11R4
XCOMM INCROOT=/usr/include/mit
@@ -66,12 +66,12 @@
XCOMM Change XPMLIB if necessary to point to the xpm library (libXpm)
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
#ifdef USEXPM
XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I$(INCDIR)
+XPMINC = -I$(INCDIR)/X11
XPMLIB = -L$(XPMLIBDIR) -lXpm
#endif
@@ -79,7 +79,7 @@
#ifdef USEINSTALLEDJPEG #ifdef USEINSTALLEDJPEG
JPEGLIBDIR = /usr/local/lib JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11 -JPEGINCDIR = -I/usr/include/X11
+JPEGINCDIR = /usr/local/include +JPEGINCDIR = -I/usr/local/include
JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
#else #else
JPEGLIBDIR = ../jpeg JPEGLIBDIR = ../jpeg
JPEGINCDIR = $(JPEGLIBDIR) @@ -112,7 +112,7 @@
@@ -147,7 +147,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
XCOMM *** You shouldn't have to change anything below this point. *** -XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
-DEFINES = $(STRDEFINES) -DGSBIT $(XPMDEFINES) XCOMM use (and change) the following if you want the multi-key data base file
+DEFINES = $(STRDEFINES) $(XPMDEFINES) XCOMM somewhere other than the standard X11 library directory
@@ -213,7 +213,7 @@
#endif
#endif
-DEFINES = $(STRDEFINES) -DGSBIT $(USEINLINE) $(DUSEXPM) \
+DEFINES = $(STRDEFINES) $(USEINLINE) $(DUSEXPM) \
$(DUSEXPMICON) $(DUSEGIF) $(DUSEJPEG) $(I18N_DEFS)
XFIGSRC = d_arc.c d_arcbox.c d_box.c d_ellipse.c d_picobj.c \ XFIGSRC = d_arc.c d_arcbox.c d_box.c d_ellipse.c d_picobj.c \
d_intspline.c d_line.c d_regpoly.c d_spline.c d_text.c \

View file

@ -1,13 +1,13 @@
# New ports collection makefile for: xfig # New ports collection makefile for: xfig
# Version required: 3.1.4 # Version required: 3.2
# Date created: 4 January 1995 # Date created: 4 January 1995
# Whom: roberto # Whom: roberto
# #
# $Id: Makefile,v 1.14 1996/11/19 04:18:46 asami Exp $ # $Id: Makefile,v 1.15 1997/05/02 04:12:10 asami Exp $
# #
DISTNAME= xfig.3.1.4 DISTNAME= xfig.3.2
PKGNAME= xfig-3.1.4 PKGNAME= xfig-3.2
CATEGORIES= graphics x11 CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/drawing_tools/xfig MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
MAINTAINER= asami@FreeBSD.ORG MAINTAINER= asami@FreeBSD.ORG
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \ LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d
RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig
USE_IMAKE= yes USE_IMAKE= yes

View file

@ -1 +1 @@
MD5 (xfig.3.1.4.tar.gz) = 7975c747260e6eb3e2cc9a79d97a77c2 MD5 (xfig.3.2.tar.gz) = d16c4662b96e3f9d0735b7612c7d016b

View file

@ -1,40 +1,60 @@
--- Imakefile.orig Thu Aug 17 20:24:24 1995 --- Imakefile.orig Fri Aug 22 16:59:16 1997
+++ Imakefile Sun Sep 24 12:52:35 1995 +++ Imakefile Tue Aug 26 13:14:52 1997
@@ -42,10 +42,10 @@ @@ -46,12 +46,12 @@
XCOMM You need XPM version 3.4c or newer. This is available from ftp.x.org
XCOMM in /contrib/libraries.
-XCOMM XPMDEFINES = -DUSE_XPM -DUSE_XPM_ICON
-XCOMM XPMLIBDIR = /usr/lib
-XCOMM XPMINCDIR = /usr/include/X11
-XCOMM XPMLIB = -L$(XPMLIBDIR) -lXpm
+XPMDEFINES = -DUSE_XPM -DUSE_XPM_ICON
+XPMLIBDIR = $(USRLIBDIR)
+XPMINCDIR = $(INCROOT)/X11
+XPMLIB = -L$(XPMLIBDIR) -lXpm
XCOMM If you have installed the jpeg library on your system, uncomment the
XCOMM USEINSTALLEDJPEG variable, change the JPEGLIBDIR variable to the directory
@@ -56,11 +56,11 @@
XCOMM set JPEGLIBDIR after the #else to the directory where you have the source XCOMM set JPEGLIBDIR after the #else to the directory where you have the source
XCOMM for jpeg. XCOMM for jpeg.
-XCOMM #define USEINSTALLEDJPEG -XCOMM #define USEINSTALLEDJPEG
+#define USEINSTALLEDJPEG +#define USEINSTALLEDJPEG
XCOMM Uncomment the following definition for XAWLIB if you want to use
XCOMM the 3d Athena Widget Set (highly recommended!)
-XCOMM XAWLIB = -lXaw3d
+XAWLIB = -lXaw3d
XCOMM Uncomment the following if needed for DECstations running older X11R4
XCOMM INCROOT=/usr/include/mit
@@ -66,12 +66,12 @@
XCOMM Change XPMLIB if necessary to point to the xpm library (libXpm)
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
#ifdef USEXPM
XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I$(INCDIR)
+XPMINC = -I$(INCDIR)/X11
XPMLIB = -L$(XPMLIBDIR) -lXpm
#endif
@@ -79,7 +79,7 @@
#ifdef USEINSTALLEDJPEG #ifdef USEINSTALLEDJPEG
JPEGLIBDIR = /usr/local/lib JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11 -JPEGINCDIR = -I/usr/include/X11
+JPEGINCDIR = /usr/local/include +JPEGINCDIR = -I/usr/local/include
JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
#else #else
JPEGLIBDIR = ../jpeg JPEGLIBDIR = ../jpeg
JPEGINCDIR = $(JPEGLIBDIR) @@ -112,7 +112,7 @@
@@ -147,7 +147,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
XCOMM *** You shouldn't have to change anything below this point. *** -XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
-DEFINES = $(STRDEFINES) -DGSBIT $(XPMDEFINES) XCOMM use (and change) the following if you want the multi-key data base file
+DEFINES = $(STRDEFINES) $(XPMDEFINES) XCOMM somewhere other than the standard X11 library directory
@@ -213,7 +213,7 @@
#endif
#endif
-DEFINES = $(STRDEFINES) -DGSBIT $(USEINLINE) $(DUSEXPM) \
+DEFINES = $(STRDEFINES) $(USEINLINE) $(DUSEXPM) \
$(DUSEXPMICON) $(DUSEGIF) $(DUSEJPEG) $(I18N_DEFS)
XFIGSRC = d_arc.c d_arcbox.c d_box.c d_ellipse.c d_picobj.c \ XFIGSRC = d_arc.c d_arcbox.c d_box.c d_ellipse.c d_picobj.c \
d_intspline.c d_line.c d_regpoly.c d_spline.c d_text.c \