Upgrade, 3.1.3 -> 3.1.4.

Submitted by:	Cristian Ferretti <cfs@riemann.mat.puc.cl>

12 files changed, 90 insertions, 56 deletions

diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 40ea2aaacc8e..6336ec50210d 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	xfig
-# Version required:	3.1.3
+# Version required:	3.1.4
 # Date created:		4 January 1995
 # Whom:			roberto
 #
-# $Id: Makefile,v 1.9 1995/04/09 07:09:49 asami Exp $
+# $Id$
 #
 
-DISTNAME=	xfig.3.1.3
-PKGNAME=	xfig-3.1.3
+DISTNAME=	xfig.3.1.4
+PKGNAME=	xfig-3.1.4
 CATEGORIES+=	graphics x11
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
 	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/xfig
 USE_IMAKE=	yes
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults  \
diff --git a/graphics/xfig-devel/distinfo b/graphics/xfig-devel/distinfo
index 45325ded0310..80584410e491 100644
--- a/graphics/xfig-devel/distinfo
+++ b/graphics/xfig-devel/distinfo
@@ -1 +1 @@
-MD5 (xfig.3.1.3.tar.gz) = b340933c3e4a4bc5175a907d3f510360
+MD5 (xfig.3.1.4.tar.gz) = 7975c747260e6eb3e2cc9a79d97a77c2
diff --git a/graphics/xfig-devel/files/patch-aa b/graphics/xfig-devel/files/patch-aa
index 43b476f75dff..d10bdb3b9572 100644
--- a/graphics/xfig-devel/files/patch-aa
+++ b/graphics/xfig-devel/files/patch-aa
@@ -1,21 +1,40 @@
-diff -u -r1.1 fig.h
---- 1.1	1995/01/25 19:48:10
-+++ fig.h	1995/01/25 19:58:44
-@@ -20,6 +20,7 @@
- /* For the X stuff, include only Xlib.h and Intrinsic.h here - 
-    use figx.h for widget stuff */
+--- Imakefile.orig	Thu Aug 17 20:24:24 1995
++++ Imakefile	Sun Sep 24 12:52:35 1995
+@@ -42,10 +42,10 @@
+ XCOMM You need XPM version 3.4c or newer.  This is available from ftp.x.org
+ XCOMM   in /contrib/libraries.
  
-+#include <sys/param.h>
- #include <sys/stat.h>
+-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
  
- #if defined(__convex__) && defined(__STDC__)
-@@ -41,7 +42,9 @@
+ 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 for jpeg.
  
- extern int	errno;
- extern int	sys_nerr;
-+#if (! (defined(BSD) && (BSD >= 199306)))
- extern char    *sys_errlist[];
-+#endif
- extern char    *mktemp();
+-XCOMM #define USEINSTALLEDJPEG
++#define USEINSTALLEDJPEG
  
- #include <math.h>	/* for sin(), cos() etc */
+ #ifdef USEINSTALLEDJPEG
+ JPEGLIBDIR = /usr/local/lib
+-JPEGINCDIR = /usr/include/X11
++JPEGINCDIR = /usr/local/include
+ #else
+ JPEGLIBDIR = ../jpeg
+ JPEGINCDIR = $(JPEGLIBDIR)
+@@ -147,7 +147,7 @@
+ 
+ XCOMM *** You shouldn't have to change anything below this point. ***
+ 
+-DEFINES =             $(STRDEFINES) -DGSBIT $(XPMDEFINES)
++DEFINES =             $(STRDEFINES) $(XPMDEFINES)
+ 
+ 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 \
diff --git a/graphics/xfig-devel/pkg-comment b/graphics/xfig-devel/pkg-comment
index 9f90b026a221..b3daa1a2a39f 100644
--- a/graphics/xfig-devel/pkg-comment
+++ b/graphics/xfig-devel/pkg-comment
@@ -1 +1 @@
-Xfig - A drawing program. Version 3.1.3
+Xfig - A drawing program. Version 3.1.4
diff --git a/graphics/xfig-devel/pkg-descr b/graphics/xfig-devel/pkg-descr
index c30f0ee9af8c..5c65a63067dd 100644
--- a/graphics/xfig-devel/pkg-descr
+++ b/graphics/xfig-devel/pkg-descr
@@ -1,4 +1,4 @@
-XFIG 3.1.3 - Facility for Interactive Generation of figures under X11
+XFIG 3.1.4 - 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 --git a/graphics/xfig-devel/pkg-plist b/graphics/xfig-devel/pkg-plist
index dfe9034b12bb..6e68d7b41468 100644
--- a/graphics/xfig-devel/pkg-plist
+++ b/graphics/xfig-devel/pkg-plist
@@ -1,6 +1,4 @@
 @cwd /usr/X11R6
-@comment this doesn't work on 2.0R
-@comment @pkgdep xpm
 @owner bin
 @group bin
 @mode 755
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 40ea2aaacc8e..6336ec50210d 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	xfig
-# Version required:	3.1.3
+# Version required:	3.1.4
 # Date created:		4 January 1995
 # Whom:			roberto
 #
-# $Id: Makefile,v 1.9 1995/04/09 07:09:49 asami Exp $
+# $Id$
 #
 
-DISTNAME=	xfig.3.1.3
-PKGNAME=	xfig-3.1.3
+DISTNAME=	xfig.3.1.4
+PKGNAME=	xfig-3.1.4
 CATEGORIES+=	graphics x11
 MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
 	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/xfig
 USE_IMAKE=	yes
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults  \
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index 45325ded0310..80584410e491 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1 +1 @@
-MD5 (xfig.3.1.3.tar.gz) = b340933c3e4a4bc5175a907d3f510360
+MD5 (xfig.3.1.4.tar.gz) = 7975c747260e6eb3e2cc9a79d97a77c2
diff --git a/graphics/xfig/files/patch-aa b/graphics/xfig/files/patch-aa
index 43b476f75dff..d10bdb3b9572 100644
--- a/graphics/xfig/files/patch-aa
+++ b/graphics/xfig/files/patch-aa
@@ -1,21 +1,40 @@
-diff -u -r1.1 fig.h
---- 1.1	1995/01/25 19:48:10
-+++ fig.h	1995/01/25 19:58:44
-@@ -20,6 +20,7 @@
- /* For the X stuff, include only Xlib.h and Intrinsic.h here - 
-    use figx.h for widget stuff */
+--- Imakefile.orig	Thu Aug 17 20:24:24 1995
++++ Imakefile	Sun Sep 24 12:52:35 1995
+@@ -42,10 +42,10 @@
+ XCOMM You need XPM version 3.4c or newer.  This is available from ftp.x.org
+ XCOMM   in /contrib/libraries.
  
-+#include <sys/param.h>
- #include <sys/stat.h>
+-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
  
- #if defined(__convex__) && defined(__STDC__)
-@@ -41,7 +42,9 @@
+ 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 for jpeg.
  
- extern int	errno;
- extern int	sys_nerr;
-+#if (! (defined(BSD) && (BSD >= 199306)))
- extern char    *sys_errlist[];
-+#endif
- extern char    *mktemp();
+-XCOMM #define USEINSTALLEDJPEG
++#define USEINSTALLEDJPEG
  
- #include <math.h>	/* for sin(), cos() etc */
+ #ifdef USEINSTALLEDJPEG
+ JPEGLIBDIR = /usr/local/lib
+-JPEGINCDIR = /usr/include/X11
++JPEGINCDIR = /usr/local/include
+ #else
+ JPEGLIBDIR = ../jpeg
+ JPEGINCDIR = $(JPEGLIBDIR)
+@@ -147,7 +147,7 @@
+ 
+ XCOMM *** You shouldn't have to change anything below this point. ***
+ 
+-DEFINES =             $(STRDEFINES) -DGSBIT $(XPMDEFINES)
++DEFINES =             $(STRDEFINES) $(XPMDEFINES)
+ 
+ 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 \
diff --git a/graphics/xfig/pkg-comment b/graphics/xfig/pkg-comment
index 9f90b026a221..b3daa1a2a39f 100644
--- a/graphics/xfig/pkg-comment
+++ b/graphics/xfig/pkg-comment
@@ -1 +1 @@
-Xfig - A drawing program. Version 3.1.3
+Xfig - A drawing program. Version 3.1.4
diff --git a/graphics/xfig/pkg-descr b/graphics/xfig/pkg-descr
index c30f0ee9af8c..5c65a63067dd 100644
--- a/graphics/xfig/pkg-descr
+++ b/graphics/xfig/pkg-descr
@@ -1,4 +1,4 @@
-XFIG 3.1.3 - Facility for Interactive Generation of figures under X11
+XFIG 3.1.4 - 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 --git a/graphics/xfig/pkg-plist b/graphics/xfig/pkg-plist
index dfe9034b12bb..6e68d7b41468 100644
--- a/graphics/xfig/pkg-plist
+++ b/graphics/xfig/pkg-plist
@@ -1,6 +1,4 @@
 @cwd /usr/X11R6
-@comment this doesn't work on 2.0R
-@comment @pkgdep xpm
 @owner bin
 @group bin
 @mode 755