12 files changed, 70 insertions, 408 deletions

diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 505da00bd020..f76408747c0e 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -1,8 +1,19 @@
-#This is xfig Version 2.1.8
-#By mr
-DISTNAME=	xfig
-DISTFILES=	xfig.2.1.8.tar.Z
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/
-USE_IMAKE=	YES
-.include <bsd.port.mk>
+# New ports collection makefile for:	xfig
+# Version required:	3.0
+# Date created:		4 January 1995
+# Whom:			asami
+# Original by:		roberto
+#
+# $Id:$
+#
+
+DISTNAME=	xfig.3.0
+EXTRACT_SUFX=	.tar.Z
+WRKSRC=		${WRKDIR}/xfig
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
+	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
+DEPENDS=	${PORTSDIR}/x11/xpm
+USE_IMAKE=	yes
+INSTALL_MANPAGES=	yes
 
+.include <bsd.port.mk>
diff --git a/graphics/xfig-devel/distinfo b/graphics/xfig-devel/distinfo
new file mode 100644
index 000000000000..d33484dcc1a9
--- /dev/null
+++ b/graphics/xfig-devel/distinfo
@@ -0,0 +1 @@
+MD5 (xfig.3.0.tar.Z) = 8ec14fdde8bb1d528435d615ab4c7e96
diff --git a/graphics/xfig-devel/files/patch-aa b/graphics/xfig-devel/files/patch-aa
index f01e258267c1..d69247aaa89b 100644
--- a/graphics/xfig-devel/files/patch-aa
+++ b/graphics/xfig-devel/files/patch-aa
@@ -1,8 +1,12 @@
-*** fig.h.orig	Wed Nov 23 02:13:41 1994
---- fig.h	Wed Nov 23 02:19:18 1994
+*** fig.h.orig	Wed Jun  1 23:35:23 1994
+--- fig.h	Wed Jan  4 20:58:06 1995
 ***************
-*** 223,225 ****
+*** 228,234 ****
+  
+  extern int	errno;
   extern int	sys_nerr;
 - extern char    *sys_errlist[];
+  extern char    *mktemp();
   
---- 223,224 ----
+  #include <math.h>	/* for sin(), cos() etc */
+--- 228,233 ----
diff --git a/graphics/xfig-devel/pkg-comment b/graphics/xfig-devel/pkg-comment
index 936b1594e6cb..6a4b7bebd8ca 100644
--- a/graphics/xfig-devel/pkg-comment
+++ b/graphics/xfig-devel/pkg-comment
@@ -1 +1 @@
-Xfig - A drwing program. Version 2.1.8
+Xfig - A drawing program. Version 3.0
diff --git a/graphics/xfig-devel/pkg-descr b/graphics/xfig-devel/pkg-descr
index 247888c89449..3966945dc5e2 100644
--- a/graphics/xfig-devel/pkg-descr
+++ b/graphics/xfig-devel/pkg-descr
@@ -1,197 +1,9 @@
-===============================================================
-XFIG - Facility for Interactive Generation of figures under X11
-===============================================================
-
+XFIG 3.0 - 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
 on postscript printers or converted to a variety of other formats (e.g. to
 allow inclusion in LaTeX documents).
 
-This file contains some notes about installing xfig, the directory
-'Examples' contains some example figures and the 'Doc' directory contains
-some further documentation including the manual in troff -man format.
-
-Please report any bugs, fixes, contributions, etc. to:
-
-Brian V. Smith (bvsmith@lbl.gov)
-
-
-===================
-INSTALLATION NOTES:
-===================
-
-1. Edit the Imakefile if you need to customize it (see following notes)
-2. Type "make Makefile" or "xmkmf" if you have xmkmf
-3. Type "make install" (if you don't do this step, be sure to install resources)
-4. Type "make install.man"
-5. For X11R5 color implementations, specify "*customization: -color" in your 
-	.Xdefaults or .Xresources file.
-	NOTE: this only works under X11R5.
-
-If your system doesn't have strstr(), add the flag -DNOSTRSTR in the Imakefile
-   in the DEFINES line.
-If your system doesn't have strtol(), add the flag -DNOSTRTOL in the Imakefile
-   in the DEFINES line.
-If you are running on an IBM RS/6000 with AIX 3.2, add the flag -DDPS in the
-   Imakefile and uncomment the line that says 
-	LOCAL_LIBRARIES = -ldps XawClientLibs
-   and you will see the full PostScript object when using EPS objects.
- 
-The maximum width of the top ruler is set to 1020 pixels and the height of the
-side ruler to 860 pixels.  If your server can handle pixmaps larger than this
-and you need longer/taller rulers, you may set the maximum allowed in your
-Imakefile with -DMAX_TOPRULER_WD=1160 (or whatever value you wish) and 
--DMAX_SIDERULER_HT=1024 (or whatever value you wish).
-
-The SMOOTHMOTION option toggles between two methods for tracking the
-cursor.  The first way (SMOOTHMOTION) just uses the (x,y) information given
-in the X pointer motion event.  If your display server doesn't implement
-motion compression this is very slow for large movements of the mouse
-pointer because X sends back lots of small movement events, each of which
-causes the rubberband box to be erased and redrawn.  The alternative
-way (not SMOOTHMOTION) queries the position of the X cursor whenever
-a motion event is received and if you make a large movement and then
-stop actually turns out to involve less work even though the XQueryPointer
-call is quite slow.
-
-The SMOOTHMOTION flag MIGHT be necessary for older versions of OpenWindows on
-certain machines if the performance is slow when moving or drawing objects.
-
-----------------------
-Printing your figures:
-----------------------
-
-The program to translate your figure into one of many printer languages
-(Postscript, LaTex, etc) is called fig2dev and is part of the TransFig
-package by Micah Beck.
-It is available from export.lcs.mit.edu in /contrib/transfig.tar.Z or
-ftp.cs.cornell.edu in the directory /pub/fig.
-See the man pages for more information.
-
-If you have a SYSV system but use BSD-style printing (lpr instead of lp) you
-must define -DBSDLPR in the Imakefile/Makefile.
-
------------------
-OpenWindows users
------------------
-
-Xfig now automatically looks for the OpenWindows style of font names
-(e.g. times-roman-13) and uses those when available so the -DOPENWIN flag
-is no longer necessary 
-
-There is no need to compile with the -DOPENWIN_BUG flag anymore for 
-OpenWindows 2.0 (or any version of OpenWindows for that matter).
-
-----------------------------------------------
-Possible problems encountered installing xfig:
-----------------------------------------------
-
-PROBLEM:
-	When using LaTeX fonts in Xfig I always end up with postscript
-	fonts instead rather than, say, Computer Modern. 
-
-POSSIBLE CAUSE AND SOLUTION:
-	To put fonts under the control of LaTeX when generating PS, you must
-	tag the text object as "special" and then use the pstex output mode.
-	This mode forces special text objects to be passed through to LaTeX,
-	allowing the use of Math mode and CM fonts among other things.
-
-PROBLEM:
-	xfig hangs when pressing the Text or Update button.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Increase the height of the indicator panel by changing init_ind_panel()
-	where it says:
-
-        i = DEF_IND_SW_HT+4*INTERNAL_BW+14;   /* allow for thickness of scrollbar */
-
-	Try increasing the 14 to 16 or 20 and see if that fixes it.  Please
-	send me email if you have to do this and tell me the value you used.
-________________________________________________________________________________
-PROBLEM:
-	On a DEC Alpha the compiler may complain about something like: ".mask
-	must have pcreg from .frame set if any bits are set in .mask or .fmask"
-	in the file u_bound.c.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Set the optimization level to -O1 at least for that file.
-________________________________________________________________________________
-PROBLEM:
-	On Sun machines the linker may give erroneous error messages about 
-	the following symbols being undefined:
-
-	ld: Undefined symbol
-	   _get_applicationShellWidgetClass
-	   _get_wmShellWidgetClass
-
-	This may be ignored as it is a problem with the Sun shared libraries
-	and the way X11 builds the shared Xmu library.  It doesn't affect the
-	operation of xfig.
-________________________________________________________________________________
-PROBLEM:
-	The window oscillates and fights with the window manager when
-	I click on a mode button or try to resize the xfig window.
-
-POSSIBLE CAUSE AND SOLUTION:
- 	Perhaps the following resource has been set
- 		*allowShellResize: true
-	because another program requires it to be true.
-	Change the resource to be specific to the programs which need it,
-	or set the following resource:
- 		Fig*allowShellResize: false
-	Note: this is in the Fig.ad file that comes with xfig, which is 
-	      installed when you do a "make install".
-________________________________________________________________________________
-PROBLEM:
-	Openwindows sometimes loses track of xfig's icon.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Cause unknown, here is a temporary kludge. Place the line:
-		Fig*iconPixmap:               ..../your_lib_area/fig.icon.X
-	in your .Xdefaults file and copy fig.icon.X into your lib area.
-________________________________________________________________________________
-PROBLEM:
-	When compiling on an HP 750 running HP-UX 8.05, the compiler dies with
-	a bus error in the file u_undo.c.
-
-POSSIBLE CAUSE AND SOLUTION:
-	There is a bug in the HP compiler.  Workaround the problem by adding
-	an extra statement between two statements in u_undo.c:
-
-	Original:
-
-	undo_glue()
-	{
-	    list_delete_compound(&objects.compounds, saved_objects.compounds);
-	    tail(&objects, &object_tails);
-
-	New:
-
-	undo_glue()
-	{
-	    list_delete_compound(&objects.compounds, saved_objects.compounds);
->>>	    /* HP-UX 8.05 compiler bug fix -- don't ask */
->>>	    last_action = last_action;
-	    tail(&objects, &object_tails);
-________________________________________________________________________________
-PROBLEMS:
-	o Ellipses are rotated in the wrong direction when printing.
-
-	o When exporting a figure to Encapsulated Postscript, it always
-	  comes out in Portrait mode even if you select Landscape.
-
-	o When batching together several figures and printing as one file, 
-	  only the first one prints.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Get the newest version of TransFig (version 2.1.5 or later).
-________________________________________________________________________________
-PROBLEMS:
-	On HP machines, the capitalization of some letters in the text window 
-	in the edit popup for text objects are wrong.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Make sure that the CompKeyDB file has the lowercase letter definitions
-	BEFORE the uppercase definitions.  This should be the case for the 
-	CompKeyDB file shipped with xfig 2.1.5 and later.
+To enjoy the beautiful colors, specify "*customization: -color" in your 
+.Xdefaults or .Xresources file.
diff --git a/graphics/xfig-devel/pkg-plist b/graphics/xfig-devel/pkg-plist
index 3e25ec68850c..dfe9034b12bb 100644
--- a/graphics/xfig-devel/pkg-plist
+++ b/graphics/xfig-devel/pkg-plist
@@ -1,9 +1,12 @@
 @cwd /usr/X11R6
+@comment this doesn't work on 2.0R
+@comment @pkgdep xpm
 @owner bin
 @group bin
 @mode 755
-/bin/xfig
+bin/xfig
 @mode 644
 lib/X11/xfig/CompKeyDB
 lib/X11/app-defaults/Fig
 lib/X11/app-defaults/Fig-color
+man/man1/xfig.1.gz
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 505da00bd020..f76408747c0e 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,8 +1,19 @@
-#This is xfig Version 2.1.8
-#By mr
-DISTNAME=	xfig
-DISTFILES=	xfig.2.1.8.tar.Z
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/
-USE_IMAKE=	YES
-.include <bsd.port.mk>
+# New ports collection makefile for:	xfig
+# Version required:	3.0
+# Date created:		4 January 1995
+# Whom:			asami
+# Original by:		roberto
+#
+# $Id:$
+#
+
+DISTNAME=	xfig.3.0
+EXTRACT_SUFX=	.tar.Z
+WRKSRC=		${WRKDIR}/xfig
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
+	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
+DEPENDS=	${PORTSDIR}/x11/xpm
+USE_IMAKE=	yes
+INSTALL_MANPAGES=	yes
 
+.include <bsd.port.mk>
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
new file mode 100644
index 000000000000..d33484dcc1a9
--- /dev/null
+++ b/graphics/xfig/distinfo
@@ -0,0 +1 @@
+MD5 (xfig.3.0.tar.Z) = 8ec14fdde8bb1d528435d615ab4c7e96
diff --git a/graphics/xfig/files/patch-aa b/graphics/xfig/files/patch-aa
index f01e258267c1..d69247aaa89b 100644
--- a/graphics/xfig/files/patch-aa
+++ b/graphics/xfig/files/patch-aa
@@ -1,8 +1,12 @@
-*** fig.h.orig	Wed Nov 23 02:13:41 1994
---- fig.h	Wed Nov 23 02:19:18 1994
+*** fig.h.orig	Wed Jun  1 23:35:23 1994
+--- fig.h	Wed Jan  4 20:58:06 1995
 ***************
-*** 223,225 ****
+*** 228,234 ****
+  
+  extern int	errno;
   extern int	sys_nerr;
 - extern char    *sys_errlist[];
+  extern char    *mktemp();
   
---- 223,224 ----
+  #include <math.h>	/* for sin(), cos() etc */
+--- 228,233 ----
diff --git a/graphics/xfig/pkg-comment b/graphics/xfig/pkg-comment
index 936b1594e6cb..6a4b7bebd8ca 100644
--- a/graphics/xfig/pkg-comment
+++ b/graphics/xfig/pkg-comment
@@ -1 +1 @@
-Xfig - A drwing program. Version 2.1.8
+Xfig - A drawing program. Version 3.0
diff --git a/graphics/xfig/pkg-descr b/graphics/xfig/pkg-descr
index 247888c89449..3966945dc5e2 100644
--- a/graphics/xfig/pkg-descr
+++ b/graphics/xfig/pkg-descr
@@ -1,197 +1,9 @@
-===============================================================
-XFIG - Facility for Interactive Generation of figures under X11
-===============================================================
-
+XFIG 3.0 - 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
 on postscript printers or converted to a variety of other formats (e.g. to
 allow inclusion in LaTeX documents).
 
-This file contains some notes about installing xfig, the directory
-'Examples' contains some example figures and the 'Doc' directory contains
-some further documentation including the manual in troff -man format.
-
-Please report any bugs, fixes, contributions, etc. to:
-
-Brian V. Smith (bvsmith@lbl.gov)
-
-
-===================
-INSTALLATION NOTES:
-===================
-
-1. Edit the Imakefile if you need to customize it (see following notes)
-2. Type "make Makefile" or "xmkmf" if you have xmkmf
-3. Type "make install" (if you don't do this step, be sure to install resources)
-4. Type "make install.man"
-5. For X11R5 color implementations, specify "*customization: -color" in your 
-	.Xdefaults or .Xresources file.
-	NOTE: this only works under X11R5.
-
-If your system doesn't have strstr(), add the flag -DNOSTRSTR in the Imakefile
-   in the DEFINES line.
-If your system doesn't have strtol(), add the flag -DNOSTRTOL in the Imakefile
-   in the DEFINES line.
-If you are running on an IBM RS/6000 with AIX 3.2, add the flag -DDPS in the
-   Imakefile and uncomment the line that says 
-	LOCAL_LIBRARIES = -ldps XawClientLibs
-   and you will see the full PostScript object when using EPS objects.
- 
-The maximum width of the top ruler is set to 1020 pixels and the height of the
-side ruler to 860 pixels.  If your server can handle pixmaps larger than this
-and you need longer/taller rulers, you may set the maximum allowed in your
-Imakefile with -DMAX_TOPRULER_WD=1160 (or whatever value you wish) and 
--DMAX_SIDERULER_HT=1024 (or whatever value you wish).
-
-The SMOOTHMOTION option toggles between two methods for tracking the
-cursor.  The first way (SMOOTHMOTION) just uses the (x,y) information given
-in the X pointer motion event.  If your display server doesn't implement
-motion compression this is very slow for large movements of the mouse
-pointer because X sends back lots of small movement events, each of which
-causes the rubberband box to be erased and redrawn.  The alternative
-way (not SMOOTHMOTION) queries the position of the X cursor whenever
-a motion event is received and if you make a large movement and then
-stop actually turns out to involve less work even though the XQueryPointer
-call is quite slow.
-
-The SMOOTHMOTION flag MIGHT be necessary for older versions of OpenWindows on
-certain machines if the performance is slow when moving or drawing objects.
-
-----------------------
-Printing your figures:
-----------------------
-
-The program to translate your figure into one of many printer languages
-(Postscript, LaTex, etc) is called fig2dev and is part of the TransFig
-package by Micah Beck.
-It is available from export.lcs.mit.edu in /contrib/transfig.tar.Z or
-ftp.cs.cornell.edu in the directory /pub/fig.
-See the man pages for more information.
-
-If you have a SYSV system but use BSD-style printing (lpr instead of lp) you
-must define -DBSDLPR in the Imakefile/Makefile.
-
------------------
-OpenWindows users
------------------
-
-Xfig now automatically looks for the OpenWindows style of font names
-(e.g. times-roman-13) and uses those when available so the -DOPENWIN flag
-is no longer necessary 
-
-There is no need to compile with the -DOPENWIN_BUG flag anymore for 
-OpenWindows 2.0 (or any version of OpenWindows for that matter).
-
-----------------------------------------------
-Possible problems encountered installing xfig:
-----------------------------------------------
-
-PROBLEM:
-	When using LaTeX fonts in Xfig I always end up with postscript
-	fonts instead rather than, say, Computer Modern. 
-
-POSSIBLE CAUSE AND SOLUTION:
-	To put fonts under the control of LaTeX when generating PS, you must
-	tag the text object as "special" and then use the pstex output mode.
-	This mode forces special text objects to be passed through to LaTeX,
-	allowing the use of Math mode and CM fonts among other things.
-
-PROBLEM:
-	xfig hangs when pressing the Text or Update button.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Increase the height of the indicator panel by changing init_ind_panel()
-	where it says:
-
-        i = DEF_IND_SW_HT+4*INTERNAL_BW+14;   /* allow for thickness of scrollbar */
-
-	Try increasing the 14 to 16 or 20 and see if that fixes it.  Please
-	send me email if you have to do this and tell me the value you used.
-________________________________________________________________________________
-PROBLEM:
-	On a DEC Alpha the compiler may complain about something like: ".mask
-	must have pcreg from .frame set if any bits are set in .mask or .fmask"
-	in the file u_bound.c.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Set the optimization level to -O1 at least for that file.
-________________________________________________________________________________
-PROBLEM:
-	On Sun machines the linker may give erroneous error messages about 
-	the following symbols being undefined:
-
-	ld: Undefined symbol
-	   _get_applicationShellWidgetClass
-	   _get_wmShellWidgetClass
-
-	This may be ignored as it is a problem with the Sun shared libraries
-	and the way X11 builds the shared Xmu library.  It doesn't affect the
-	operation of xfig.
-________________________________________________________________________________
-PROBLEM:
-	The window oscillates and fights with the window manager when
-	I click on a mode button or try to resize the xfig window.
-
-POSSIBLE CAUSE AND SOLUTION:
- 	Perhaps the following resource has been set
- 		*allowShellResize: true
-	because another program requires it to be true.
-	Change the resource to be specific to the programs which need it,
-	or set the following resource:
- 		Fig*allowShellResize: false
-	Note: this is in the Fig.ad file that comes with xfig, which is 
-	      installed when you do a "make install".
-________________________________________________________________________________
-PROBLEM:
-	Openwindows sometimes loses track of xfig's icon.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Cause unknown, here is a temporary kludge. Place the line:
-		Fig*iconPixmap:               ..../your_lib_area/fig.icon.X
-	in your .Xdefaults file and copy fig.icon.X into your lib area.
-________________________________________________________________________________
-PROBLEM:
-	When compiling on an HP 750 running HP-UX 8.05, the compiler dies with
-	a bus error in the file u_undo.c.
-
-POSSIBLE CAUSE AND SOLUTION:
-	There is a bug in the HP compiler.  Workaround the problem by adding
-	an extra statement between two statements in u_undo.c:
-
-	Original:
-
-	undo_glue()
-	{
-	    list_delete_compound(&objects.compounds, saved_objects.compounds);
-	    tail(&objects, &object_tails);
-
-	New:
-
-	undo_glue()
-	{
-	    list_delete_compound(&objects.compounds, saved_objects.compounds);
->>>	    /* HP-UX 8.05 compiler bug fix -- don't ask */
->>>	    last_action = last_action;
-	    tail(&objects, &object_tails);
-________________________________________________________________________________
-PROBLEMS:
-	o Ellipses are rotated in the wrong direction when printing.
-
-	o When exporting a figure to Encapsulated Postscript, it always
-	  comes out in Portrait mode even if you select Landscape.
-
-	o When batching together several figures and printing as one file, 
-	  only the first one prints.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Get the newest version of TransFig (version 2.1.5 or later).
-________________________________________________________________________________
-PROBLEMS:
-	On HP machines, the capitalization of some letters in the text window 
-	in the edit popup for text objects are wrong.
-
-POSSIBLE CAUSE AND SOLUTION:
-	Make sure that the CompKeyDB file has the lowercase letter definitions
-	BEFORE the uppercase definitions.  This should be the case for the 
-	CompKeyDB file shipped with xfig 2.1.5 and later.
+To enjoy the beautiful colors, specify "*customization: -color" in your 
+.Xdefaults or .Xresources file.
diff --git a/graphics/xfig/pkg-plist b/graphics/xfig/pkg-plist
index 3e25ec68850c..dfe9034b12bb 100644
--- a/graphics/xfig/pkg-plist
+++ b/graphics/xfig/pkg-plist
@@ -1,9 +1,12 @@
 @cwd /usr/X11R6
+@comment this doesn't work on 2.0R
+@comment @pkgdep xpm
 @owner bin
 @group bin
 @mode 755
-/bin/xfig
+bin/xfig
 @mode 644
 lib/X11/xfig/CompKeyDB
 lib/X11/app-defaults/Fig
 lib/X11/app-defaults/Fig-color
+man/man1/xfig.1.gz