Update xfig to 3.2.4. Provided in PR pkg/19660 by Jim Bernard

<jbernard@mines.edu>.  Changes include tons of bugfixes plus the following
new features:

	o "Front" and "Back" labels in depth manager to show relative
	  positioning of depths on drawing.
	o The mu (micro) character is now entered using "Compose | u"
          instead of "Compose / u"
	o If you wish to place a library object at the position it was
	  originally created, e.g. for laser printer labels, hold down the
          Shift key and press mouse button 3 (`place at orign posn')
	o New URL for chemtool, a chemical structure editor:
	  http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html
	o The minimum and maximum depth of objects are shown in the edit
          panel for compound objects
	o EMF (Enhanced Metafile) export driver (TransFig/fig2dev)
	o SVG (Scalable Vector Graphics) beta driver
	o The xfig documentation is nearly entirely GIF-free (TM).
	o Xfig reference manual now available in PDF besides html.
	o Dimension lines
	o New Xfig logo courtesy of Marc-Aurele Darche.
	o Can now paste text in text mode using Shift+Middle-mouse-button
          in addition to F20 and Sun's Paste key (F18).
	o If xfig is compiled with #define WHEELMOUSE uncommented in the
	  Imakefile, the wheel may be used for several things
	o New grid/positioning option for inches mode
	o Background (-g to fig2dev) option for tk export honored now.
	o New command-line argument -correct_font_size
	o Added "Stop" button to stop loading library.
	o Much more efficient when copying large imported pictures
	o When changing an attribute of an imported picture that doesn't
          change the picture itself (e.g. depth), the pixmap is not
          regenerated, therefore saving time.  The same is true when
          copying a picture.
	o New X resource Fig.ghostscript and command-line argument
          -ghostscript by which you can tell xfig what your ghostscript
          is called (e.g. "gs" or "gswin32").
	o Can now add ASCII (EPSI) preview to EPS export. See export panel.
	o Can now add monochrome or color TIFF preview to EPS export.
	o Translations of LATEX.AND.XFIG document into two popular Chinese
	  encodings (GB2312 and Big5).
	o When text becomes too small to see (e.g. small zoom), xfig will
	  "Greek" it, meaning it draws a gray line segment for each word
          in the string.
	o When resizing canvas to a smaller height, the number of buttons
          per row of the mode (side) panel increases so that it doesn't
          protrude into the indicator (bottom) panel
	o Smarter redraw when turning on depths from the depth manager.
	o If the user's pointer (mouse) buttons are switched
	  xfig will automatically flip the mouse hints messages.
	o Picture objects are drawn as filled gray boxes when their layer
          is inactive in gray mode.
	o xfig no longer requires fonts that are named "-adobe-..."
	o Updating the attribute panel from a compound object will retrieve
	  (only) the smallest depth from the compound.
	o When scaling an object, the line thickness is no longer scaled
          with it
	o New measuring modes: angle, length, area and tangent.
	o New feature to add tangents and normal lines to curves.
	o Splash screen on startup.
	o New command-line option -grid_color
	o New option to print grid when exporting or printing
	o When drawing an arc by specifying the center point, a circle is
          drawn showing the radius of the arc as the user drags the mouse,
          then when the first end point is clicked an arc is drawn as the
          mouse is dragged.
	o If the Ruler unit is Imperial (in), you may have xfig display
	  measurements using fractions where possible.
	o When opening a compound object, if the middle button us used to
          open the compound, all other objects on the canvas are kept
          visible.
	o When opening a compound object, the "point positioning"
          indicator is enabled, allowing you to set the bounds of the
          compound according to the indicator when you close the compound.
	o Zero-crossing lines on canvas have own command-line parameter
	o Smooth factor when exporting to bitmap format is now a pull-down
          menu with: No smoothing, Some smoothing, More smoothing.
	o Three-D borders for buttons, etc reduced from 2 to 1 pixel
	o Additional JPEG file format (EXIF) added for import.
	o Validation for integer spinners
	o When scaling an object, the scale factor is shown in the message.
	o New url for pstoedit (mentioned in installation.html).
	o When picking points of an object at high zoom, the tolerance has
          been reduced to make it easier to pick the correct point.
	o When "graying" inactive depths, the inactive objects are drawn
          first followed by active objects ensuring visibility of active
          objects.
	o xfig now draws "grayed out" picture objects (inactive depth) as
          a gray box with the filename only.
	o Line style in edit panel now shows graphic of style instead of
	  textual description.
	o Cap style in edit panel was inadvertantly left off open-splines.
	o Popup dialog to edit behavior of spline point now pops up near
          the point being edited.
	o When cancelling drawing a picture object from the popup editor,
          the empty object is removed rather than showing a <empty>
	o Pressing Return or Escape in popup message window will dismiss it
	o In picture browser popup, double clicking or clicking and
          pressing Return will apply the selected picture AND close the
          browser.
	o New popup query if updating the depth in a compound object would
	  result in any depth exceeding the maximum.
	o More consistent placement of Cancel/Ok/Set etc. buttons
	o More meaningful message "Cut buffer is empty"
	o New MetaPost driver for TransFig 3.2.4 supported.
	o New option for binary CGM export (must have TransFig 3.2.4 too).
	o Pressing escape in a popup dialog will dismiss it.
	o Zoom/Unzoom (Shift-Z/z) changes zoom by a factor of 1.5
	o Exporting to JPEG doesn't require compiling with USE_JPEG
	o Minimum and maximum depths of objects in a compound are
          displayed in popup edit panel.
	o Named styles where user can save attributes that are often used
          for quick access.

NEW LIBRARIES and Examples:

	o Poster advertizing German version of "Little Shop of Horrors" in
	  Libraries/Examples/poster.fig.  From Kai-Martin Knaak
	o Three new Examples from Carlo Kopp
	o Many new country flags in the Libraries/Flags directory.
	o New flags of Bosnia and Slovenia with vector coat of arms in
	  Libraries/Flags directory from Roman Maurer
	o New maps of Yugoslavia, Macedonia, Croatia, Bosnia-Herzegovina
          and Slovenia (Libraries/Maps/Europe)
	o New maps of Russia, Kazakstan, Kyrgyzstan, Tajikistan,
          Turkmenistan and Uzbekistan (Libraries/Maps/Asia)
	o New Avery label templates in Libraries/Labels directory,
          including a CD label, Avery_5931, done by William Chimiak.
	o New Avery and PerfectData Corp CD label templates in
          Libraries/Labels directory, done by Len Hickey.
	o New computers and printers in Libraries/Computers library
	o New network library devices
	o New DSP component library from Jakub Stastny (stastnj1@volny.cz)
	o Standard welding bevels library from Erik Engh
	o Canadian map from Seymour Green
	o A Uno hand (card game) drawn by Roland Rosendfeld
This commit is contained in:
rh 2003-01-07 06:30:34 +00:00
parent ede63d5cd2
commit 2c821434df
6 changed files with 1044 additions and 495 deletions

View file

@ -1,19 +1,17 @@
# $NetBSD: Makefile,v 1.32 2002/10/08 13:24:22 jlam Exp $
# $NetBSD: Makefile,v 1.33 2003/01/07 06:30:34 rh Exp $
#
DISTNAME= xfig.3.2.3d.full
PKGNAME= xfig-3.2.3.4
PKGREVISION= 1
WRKSRC= ${WRKDIR}/xfig.3.2.3d
DISTNAME= xfig.3.2.4.full
PKGNAME= xfig-3.2.4
WRKSRC= ${WRKDIR}/xfig.3.2.4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/drawing_tools/xfig/} \
ftp://www-epb.lbl.gov/xfig/
MASTER_SITES= ftp://epb.lbl.gov/xfig/
MAINTAINER= root@garbled.net
HOMEPAGE= http://epb1.lbl.gov/BVSmith/xfig/
HOMEPAGE= http://epb.lbl.gov/BVSmith/xfig/
COMMENT= CAD-like 2D drawing tool, good for colorful scale drawings & ISOs
DEPENDS+= transfig>=3.2.3.4:../../print/transfig
DEPENDS+= transfig>=3.2.4:../../print/transfig
USE_BUILDLINK2= YES
USE_IMAKE= YES
@ -32,16 +30,9 @@ pre-configure:
${SED} 's/#define.XAW3D/XCOMM &/' Imakefile.bak > Imakefile
.endif
XFIGEXAMPLES= ${PREFIX}/share/examples/xfig
XFIGDOCDIR= ${PREFIX}/share/doc/xfig
post-install:
${INSTALL_DATA_DIR} ${XFIGEXAMPLES}
${INSTALL_DATA} ${WRKSRC}/Examples/*.fig ${XFIGEXAMPLES}
${INSTALL_DATA} ${WRKSRC}/Examples/*.gif ${XFIGEXAMPLES}
${INSTALL_DATA} ${WRKSRC}/Examples/*.jpg ${XFIGEXAMPLES}
${INSTALL_DATA} ${WRKSRC}/Examples/*.xbm ${XFIGEXAMPLES}
${INSTALL_DATA} ${WRKSRC}/Examples/*.xpm ${XFIGEXAMPLES}
${INSTALL_DATA} ${WRKSRC}/Doc/FORMAT* ${XFIGDOCDIR}
.include "../../graphics/jpeg/buildlink2.mk"

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.7 2002/10/26 19:45:00 bouyer Exp $
$NetBSD: distinfo,v 1.8 2003/01/07 06:30:35 rh Exp $
SHA1 (xfig.3.2.3d.full.tar.gz) = 49806d4e081c722bb35e335b3d34a8ad9f7d78af
Size (xfig.3.2.3d.full.tar.gz) = 2846844 bytes
SHA1 (patch-aa) = dd528f771d7b30a7f2504d2e9043cdce7a98f0c1
SHA1 (patch-ab) = 98ccdc167efef31438aa016e2e0c4c1671151588
SHA1 (patch-ac) = 1d18e319873a4aa20d60b477318fd05c951c6b16
SHA1 (xfig.3.2.4.full.tar.gz) = 723bf10355a92c079be08cd7be18b75baaccfbdc
Size (xfig.3.2.4.full.tar.gz) = 5163150 bytes
SHA1 (patch-aa) = 3ff914bd2ca913f7c4e2ea2a648a0776cd5098bf
SHA1 (patch-ab) = 7f9006c8ea4151d6811e907eb91b77e1d1a9c7c6
SHA1 (patch-ac) = 2c562f7956700d7382cb3576ecf15473bb750779

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.8 2001/08/09 14:34:57 wiz Exp $
$NetBSD: patch-aa,v 1.9 2003/01/07 06:30:35 rh Exp $
--- Fig.ad.orig Thu May 17 12:59:29 2001
--- Fig.ad.orig Wed Dec 18 17:05:41 2002
+++ Fig.ad
@@ -16,7 +16,7 @@
@@ -24,7 +24,7 @@
! pdfviewer - put your favorite pdf viewer here.
! This is for viewing the xfig how-to guide and man pages

View file

@ -1,31 +1,30 @@
$NetBSD: patch-ab,v 1.7 2002/10/26 19:45:00 bouyer Exp $
$NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
--- Imakefile.orig Tue May 29 20:32:11 2001
+++ Imakefile Tue Oct 22 14:31:10 2002
@@ -47,8 +47,8 @@
--- Imakefile.orig Thu Dec 19 10:57:11 2002
+++ Imakefile
@@ -48,8 +48,8 @@
XCOMM Redefine the following if your PNG library and/or include file
XCOMM are in different places
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGLIBDIR = $(LOCALBASE)/lib
+PNGINC = -I$(LOCALBASE)/include
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
XCOMM Uncomment the #define for USEJPEG if you want to be able to import
@@ -68,8 +68,8 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11
-JPEGINC = -I/usr/include/X11
+JPEGLIBDIR = $(LOCALBASE)/lib
+JPEGINCDIR = $(LOCALBASE)/include
+JPEGINC = -I$(LOCALBASE)/include
#else
JPEGLIBDIR = ../jpeg
JPEGINCDIR = $(JPEGLIBDIR)
@@ -61,6 +61,11 @@
#define USEPNG
+#ifdef USEPNG
+PNGLIBDIR = $(LOCALBASE)/lib
+PNGINC = -I$(LOCALBASE)/include
+#endif
+
XCOMM Uncomment the #define for USEXPM if you want to use the XPM
XCOMM (color pixmap) package.
XCOMM
@@ -72,12 +77,12 @@
JPEGINC = -I$(JPEGLIBDIR)
@@ -87,12 +87,12 @@
XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
@ -42,8 +41,12 @@ $NetBSD: patch-ab,v 1.7 2002/10/26 19:45:00 bouyer Exp $
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -93,7 +98,7 @@
#define XAW3D
@@ -105,10 +105,10 @@
XCOMM Then be sure to change the XAW3DINC to point to the directory where your
XCOMM 3D Athena widget headers are located
-XCOMM #define XAW3D
+#define XAW3D
#ifdef XAW3D
-XAW3DINC = -I/usr/include/X11/Xaw3d
@ -51,16 +54,7 @@ $NetBSD: patch-ab,v 1.7 2002/10/26 19:45:00 bouyer Exp $
DUSEXAW3D = -DXAW3D
XAWLIB = -lXaw3d
#endif
@@ -120,7 +125,7 @@
XCOMM If your setlocale() dosen't support the locale, you should
XCOMM add -DSETLOCALE to I18N_DEFS.
-XCOMM #define I18N
+#define I18N
XCOMM If using an input tablet uncomment the following
@@ -131,7 +136,7 @@
@@ -154,7 +154,7 @@
XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
@ -69,17 +63,17 @@ $NetBSD: patch-ab,v 1.7 2002/10/26 19:45:00 bouyer Exp $
XCOMM use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
@@ -142,7 +147,7 @@
XFIGLIBDIR = $(LIBDIR)/xfig
@@ -166,7 +166,7 @@
XCOMM now you can configure where the documentation should be located
-XFIGDOCDIR = $(LIBDIR)/xfig
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/share/doc/xfig
+XFIGDOCDIR = $(PREFIX)/share/doc/xfig
XCOMM XFIGDOCDIR = /usr/share/doc/xfig-doc
XCOMM If your system doesn't have strstr undefine the following definition
@@ -210,7 +215,7 @@
JPEGINC = -I$(JPEGINCDIR)
XCOMM MANDIR tells where the standard man pages should go (no need to change it
XCOMM if you want the man pages installed in the standard place on your system
@@ -224,7 +224,7 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
-JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
@ -87,16 +81,16 @@ $NetBSD: patch-ab,v 1.7 2002/10/26 19:45:00 bouyer Exp $
#else
JPEGCONF = configure
JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
@@ -255,7 +260,7 @@
@@ -261,7 +261,7 @@
DUSESMALLICONS = -DUSE_SMALL_ICONS
#endif /* USESMALLICONS */
#ifdef USEPNG
DUSEPNG = -DUSE_PNG
-PNGLIBS = -lpng -lz
-PNGLIBS = -L$(PNGLIBDIR) -lpng -lz
+PNGLIBS = -Wl,-R$(LOCALBASE)/lib -L$(PNGLIBDIR) -lpng -lz
READPNGS = f_readpng.c
READPNGO = f_readpng.o
#endif /* USEPNG */
@@ -262,7 +267,7 @@
#ifdef USEJPEG
DUSEJPEG = -DUSE_JPEG
@@ -271,7 +271,7 @@
#ifdef USEXPM
DUSEXPM = -DUSE_XPM
@ -105,30 +99,12 @@ $NetBSD: patch-ab,v 1.7 2002/10/26 19:45:00 bouyer Exp $
READXPMS = f_readxpm.c
READXPMO = f_readxpm.o
#ifdef USEXPM_ICON
@@ -325,7 +330,7 @@
SRCS = $(XFIGSRC)
OBJS = $(XFIGOBJ)
-EXTRA_INCLUDES = $(JPEGINC) $(XPMINC) $(XAW3DINC)
+EXTRA_INCLUDES = $(JPEGINC) $(PNGINC) $(XPMINC) $(XAW3DINC)
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = $(JPEGLIB)
@@ -378,12 +383,16 @@
@$(MAKE) install.html
XCOMM Install the HTML documentation here with "make install.html"
-install.html::
#ifdef I18N
+install.html::
@$(MAKE) install.jhtml
#endif
+
+install.html::
@@ -407,6 +407,8 @@
install.rhtml::
@(cd Doc ; \
echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
+ if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ); fi ; \
$(INSTALL) -m 644 -c xfig.html $(DESTDIR)$(XFIGDOCDIR) ; \
$(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
$(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
$(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ac,v 1.3 2001/08/09 14:34:57 wiz Exp $
$NetBSD: patch-ac,v 1.4 2003/01/07 06:30:36 rh Exp $
--- f_util.c.orig Fri Mar 30 10:22:37 2001
--- f_util.c.orig Mon Dec 2 17:05:47 2002
+++ f_util.c
@@ -102,7 +102,7 @@
@@ -111,15 +111,15 @@
get_directory(direct)
char *direct;
{
@ -11,12 +11,22 @@ $NetBSD: patch-ac,v 1.3 2001/08/09 14:34:57 wiz Exp $
extern char *getcwd();
#else
@@ -110,7 +110,7 @@
extern char *getwd();
#endif
-#endif /* defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) */
+#endif /* defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__NetBSD__) */
-#if defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE)
+#if defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__NetBSD__)
if (getcwd(direct, PATH_MAX) == NULL) { /* get current working dir */
put_msg("Can't get current directory");
beep();
@@ -127,7 +127,7 @@
if (getwd(direct) == NULL) { /* get current working dir */
put_msg("%s", direct); /* err msg is in directory */
beep();
-#endif /* defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) */
+#endif /* defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__NetBSD__) */
*direct = '\0';
return 0;
}