Upgrade to version 4.1

8 files changed, 82 insertions, 40 deletions

diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 502c691e0266..a31ff6fd6502 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -1,25 +1,29 @@
 # New ports collection makefile for:    xloadimage
-# Version required:     3.03
+# Version required:     4.1
 # Date created:         9 January 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.6 1995/04/12 20:32:08 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/18 11:44:23 asami Exp $
 #
 
-DISTNAME=	xloadimage
-PKGNAME=	xloadimage-3.03
+DISTNAME=	xloadimage.4.1
+PKGNAME=	xloadimage-4.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11-contrib/
-DISTFILES=	xloadimage.3.03.tar.Z
+MASTER_SITES=	ftp://ftp.cdrom.com/pub/X11/R5contrib/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-NO_WRKSUBDIR=	yes
-USE_IMAKE=	yes
-MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
-		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
+USE_X11=	yes
 
-pre-install:
-	@mkdir -p ${PREFIX}/lib/X11/app-defaults
+ALL_TARGET=
+
+do-configure:
+	cd ${WRKSRC} && make configure </dev/null
+	cd ${WRKSRC} && ${ECHO} SYSPATHFILE=${X11BASE}/lib/X11/app-defaults/Xloadimage >> Makefile
+
+do-install:
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} xloadimage uufilter ${X11BASE}/bin
+	cd ${WRKSRC} && ${INSTALL_DATA} xloadimage uufilter ${X11BASE}/bin
+	cd ${WRKSRC} && ${GZIP_CMD} < xloadimage.man >${X11BASE}/man/man1/xloadimage.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/xloadimage/distinfo b/x11/xloadimage/distinfo
index fd9808b18da9..1dab3bfe5828 100644
--- a/x11/xloadimage/distinfo
+++ b/x11/xloadimage/distinfo
@@ -1 +1 @@
-MD5 (xloadimage.3.03.tar.Z) = abccaa1f38a2f18721943bb16ea3b920
+MD5 (xloadimage.4.1.tar.gz) = 7331850fc04056ab8ae6b5725d1fb3d2
diff --git a/x11/xloadimage/files/patch-1 b/x11/xloadimage/files/patch-1
new file mode 100644
index 000000000000..29b9b9e7635f
--- /dev/null
+++ b/x11/xloadimage/files/patch-1
@@ -0,0 +1,10 @@
+--- window.c~	Mon Nov  8 22:06:02 1993
++++ window.c	Tue Jun  9 01:51:46 1998
+@@ -9,7 +9,6 @@
+  */
+ 
+ #include "copyright.h"
+-#include <ctype.h>
+ #include "xloadimage.h"
+ #include <X11/cursorfont.h>
+ #include <X11/Xatom.h>
diff --git a/x11/xloadimage/files/patch-2 b/x11/xloadimage/files/patch-2
new file mode 100644
index 000000000000..3787fc43c9b3
--- /dev/null
+++ b/x11/xloadimage/files/patch-2
@@ -0,0 +1,12 @@
+--- config.c~	Thu Oct 28 17:37:46 1993
++++ config.c	Tue Jun  9 01:51:08 1998
+@@ -9,8 +9,8 @@
+  */
+ 
+ #include "copyright.h"
+-#include <ctype.h> /* must here for debugging version under AIX */
+ #include "xloadimage.h"
++#undef X_NOT_STDC_ENV
+ #include <X11/Xos.h>
+ #include <sys/stat.h>
+ #ifndef VMS
diff --git a/x11/xloadimage/files/patch-3 b/x11/xloadimage/files/patch-3
new file mode 100644
index 000000000000..c6e9850fd417
--- /dev/null
+++ b/x11/xloadimage/files/patch-3
@@ -0,0 +1,10 @@
+--- image.h~	Thu Oct 28 19:14:56 1993
++++ image.h	Tue Jun  9 01:45:59 1998
+@@ -20,7 +20,6 @@
+ #define _ArgProto(ARGS) ARGS
+ #endif
+ 
+-#include <stdlib.h>
+ 
+ #else /* !__STDC__ */
+ 
diff --git a/x11/xloadimage/files/patch-4 b/x11/xloadimage/files/patch-4
new file mode 100644
index 000000000000..e1f4c33e2d55
--- /dev/null
+++ b/x11/xloadimage/files/patch-4
@@ -0,0 +1,11 @@
+--- tiff/tiffcompat.h~	Tue Nov  2 22:31:40 1993
++++ tiff/tiffcompat.h	Tue Jun  9 02:06:32 1998
+@@ -151,8 +151,6 @@
+ #ifdef applec
+ #define	lseek	mpw_lseek
+ extern long mpw_lseek(int, long, int);
+-#else
+-extern	long lseek();
+ #endif
+ 
+ /*
diff --git a/x11/xloadimage/pkg-descr b/x11/xloadimage/pkg-descr
index d34f0eb0e244..96ee07c82790 100644
--- a/x11/xloadimage/pkg-descr
+++ b/x11/xloadimage/pkg-descr
@@ -1,28 +1,24 @@
 This utility will view several types of images under X11, or load
 images onto the root window.  The current version supports:
-
-	CMU Window Manager raster files
-	Faces Project images
-	Fuzzy Bitmap (FBM) images
-	GEM bit images
-	GIF images
-	G3 FAX images
-	JFIF-style JPEG images
-	McIDAS areafiles
-	MacPaint images
-	PC Paintbrush (PCX) images
-	Portable Bitmap (PBM, PGM, PPM) images
-	Sun monochrome rasterfiles
-	Sun color RGB rasterfiles
-	Utah Raster Toolkit (RLE) files
-	X pixmap files
-	X10 bitmap files
-	X11 bitmap files
-	X Window Dump (except XYPixmap, TrueColor and DirectColor)
-
+     Native Image File Format (NIFF)
+     Sun Rasterfile
+     GIF Image
+     JFIF-style JPEG Image
+     TIFF image
+     FBM Image
+     CMU WM Raster
+     Portable Bit Map (PBM, PGM, PPM)
+     Faces Project
+     Utah RLE Image
+     X Window Dump
+     Sun Visualization File Format
+     McIDAS areafile
+     VICAR Image
+     PC Paintbrush Image
+     GEM Bit Image
+     MacPaint Image
+     X Pixmap
+     X Bitmap
 A variety of options are available to modify images prior to viewing.
-These options include clipping, dithering, depth reduction, zoom
-(either X or Y axis independently or both at once), brightening or
-darkening, and image merging.  When applicable, these options are done
-automatically (eg a color image to be displayed on a monochrome screen
-will be dithered automatically).
+These options include clipping, dithering, depth reduction, zoom,
+brightening or darkening, and image merging. 
diff --git a/x11/xloadimage/pkg-plist b/x11/xloadimage/pkg-plist
index 0f78005cdaa2..258d465ee3e1 100644
--- a/x11/xloadimage/pkg-plist
+++ b/x11/xloadimage/pkg-plist
@@ -1,5 +1,4 @@
+bin/uufilter
 bin/xloadimage
-bin/xview
-bin/xsetbg
 lib/X11/app-defaults/Xloadimage
 man/man1/xloadimage.1.gz