Build with new jpeg lib now

Some misc cleanup

5 files changed, 86 insertions, 21 deletions

diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 770bdbde2ab3..b4de147a21c9 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -3,15 +3,17 @@
 # Date created:		30 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.11 1996/03/06 12:53:01 asami Exp $
+# $Id: Makefile,v 1.12 1996/09/22 08:56:34 andreas Exp $
 #
 
 DISTNAME=	xv-3.10a
-CATEGORIES+=	graphics x11
+CATEGORIES=     graphics x11
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/
+PATCH_SITES=    ${MASTER_SITES}
+PATCHFILES=     xv-3.10a.JPEG-patch # xv-3.10a.TIFF-patch (for tiff3.4)
 
-LIB_DEPENDS=    jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \
-		tiff\\.3\\.:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=    jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
+		tiff\\.3\\.3:${PORTSDIR}/graphics/tiff
 
 USE_IMAKE=	yes
 
@@ -22,8 +24,4 @@ post-install:
 	cp ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
 .endif
 
-pre-clean:
-	@(cd ${PORTSDIR}/graphics/jpeg ; ${MAKE} clean)
-	@(cd ${PORTSDIR}/graphics/tiff ; ${MAKE} clean)
-
 .include <bsd.port.mk>
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index 04340667c4af..73a353f612a5 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1 +1,2 @@
 MD5 (xv-3.10a.tar.gz) = 2d4fbeec1561304362781cc8e2f7f72d
+MD5 (xv-3.10a.JPEG-patch) = bd3ac79fa805319f583ccd382bdc825d
diff --git a/graphics/xv/files/patch-ab b/graphics/xv/files/patch-ab
new file mode 100644
index 000000000000..f3b6231fc185
--- /dev/null
+++ b/graphics/xv/files/patch-ab
@@ -0,0 +1,79 @@
+*** vdcomp.c.orig	Fri Dec 23 01:34:47 1994
+--- vdcomp.c	Mon Nov 18 02:52:59 1996
+***************
+*** 108,114 ****
+       !defined(bsd43)                     && \
+       !defined(aux)                       && \
+       !defined(__bsdi__)                  && \
+!      !defined(sequent)
+  
+  #  if defined(hp300) || defined(hp800) || defined(NeXT)
+  #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
+--- 108,115 ----
+       !defined(bsd43)                     && \
+       !defined(aux)                       && \
+       !defined(__bsdi__)                  && \
+!      !defined(sequent)			 && \
+!      !defined(__FreeBSD__)
+  
+  #  if defined(hp300) || defined(hp800) || defined(NeXT)
+  #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
+***************
+*** 429,438 ****
+  {
+    short   shortint;
+    typedef long    off_t;
+  
+    if (inname[0] == ' ') {
+      printf("\nEnter name of file to be decompressed: ");
+!     gets (inname);
+    }
+  
+    if (host == 1 | host == 2) {
+--- 430,442 ----
+  {
+    short   shortint;
+    typedef long    off_t;
++   char *s;
+  
+    if (inname[0] == ' ') {
+      printf("\nEnter name of file to be decompressed: ");
+!     fgets (inname, sizeof(inname), stdin);
+!     if ((s = strchr(inname, '\n')) != NULL)
+! 	*s = '\0';
+    }
+  
+    if (host == 1 | host == 2) {
+***************
+*** 474,486 ****
+        printf("\n  3.  VICAR format.");
+        printf("\n  4.  Unlabelled binary array.\n");
+        printf("\n  Enter format number:");
+!       gets(inname);
+        output_format = atoi(inname);
+      } while (output_format < 1 || output_format > 4);
+  
+    if (outname[0] == ' ') {
+      printf("\nEnter name of uncompressed output file: ");
+!     gets (outname);
+    }
+  
+    return(host);
+--- 478,494 ----
+        printf("\n  3.  VICAR format.");
+        printf("\n  4.  Unlabelled binary array.\n");
+        printf("\n  Enter format number:");
+!       fgets (inname, sizeof(inname), stdin);
+!       if ((s = strchr(inname, '\n')) != NULL)
+! 	  *s = '\0';
+        output_format = atoi(inname);
+      } while (output_format < 1 || output_format > 4);
+  
+    if (outname[0] == ' ') {
+      printf("\nEnter name of uncompressed output file: ");
+!     fgets (outname, sizeof(outname), stdin);
+!     if ((s = strchr(outname, '\n')) != NULL)
+! 	*s = '\0';
+    }
+  
+    return(host);
diff --git a/graphics/xv/files/patch-ad b/graphics/xv/files/patch-ad
index 07030201c063..bdfa852aad21 100644
--- a/graphics/xv/files/patch-ad
+++ b/graphics/xv/files/patch-ad
@@ -60,15 +60,3 @@
  
  DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
  	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
---- ./vdcomp.c.org	Thu Dec 22 14:34:47 1994
-+++ ./vdcomp.c	Wed Jul  5 03:39:26 1995
-@@ -108,7 +108,8 @@
-      !defined(bsd43)                     && \
-      !defined(aux)                       && \
-      !defined(__bsdi__)                  && \
--     !defined(sequent)
-+     !defined(sequent)			 && \
-+     !defined(__FreeBSD__)
- 
- #  if defined(hp300) || defined(hp800) || defined(NeXT)
- #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
diff --git a/graphics/xv/pkg-plist b/graphics/xv/pkg-plist
index 4f5a3159b750..3c88fa2c3471 100644
--- a/graphics/xv/pkg-plist
+++ b/graphics/xv/pkg-plist
@@ -1,4 +1,3 @@
-@cwd /usr/X11R6
 bin/xv
 bin/bggen
 bin/vdcomp