update LIB_DEPENDS for new jpeg library;

use tiff 3.4 instead of the older tiff

graphics/xpaint/Makefile

@@ -3,7 +3,7 @@
 # Date created:         December 2, 1997
 # Whom:                 Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.2 1998/04/25 23:16:55 angelos Exp $
+# $OpenBSD: Makefile,v 1.3 1998/05/06 02:54:46 marc Exp $
 #
 
 DISTNAME=       xpaint-2.5
@@ -12,8 +12,8 @@ MASTER_SITES=	http://www.danbbs.dk/~torsten/xpaint/
 
 MAINTAINER=	angelos@openbsd.org
 
-LIB_DEPENDS=    jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
-		tiff\\.3\\.:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=    jpeg\\.62\\.:${PORTSDIR}/graphics/jpeg \
+		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm   \
 		png\\.1\\.:${PORTSDIR}/graphics/png
 

graphics/xpaint/patches/patch-ac

@@ -1,25 +1,24 @@
-*** misc.h.orig	Tue Dec  2 22:17:09 1997
---- misc.h	Tue Dec  2 22:18:41 1997
-***************
-*** 23,31 ****
-  
-  #ifndef linux
-  #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX)
-! void srandom(unsigned int);
-  #else
-  int srandom(unsigned int);
-  #endif	/* BSD4_4 */
-  #endif	/* linux */
-  #endif
---- 23,33 ----
-  
-  #ifndef linux
-  #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX)
-! #endif
-  #else
-+ #if !defined(__OpenBSD__)
-  int srandom(unsigned int);
-+ void srandom(unsigned int);
-  #endif	/* BSD4_4 */
-  #endif	/* linux */
-  #endif
+--- misc.h.orig	Wed Aug 13 11:36:39 1997
++++ misc.h	Tue May  5 12:28:51 1998
+@@ -23,9 +23,11 @@
+ 
+ #ifndef linux
+ #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX)
+-void srandom(unsigned int);
++#endif
+ #else
++#if !defined(__OpenBSD__)
+ int srandom(unsigned int);
++void srandom(unsigned int);
+ #endif	/* BSD4_4 */
+ #endif	/* linux */
+ #endif
+@@ -96,7 +98,7 @@
+ void GetDefaultWH(int *w, int *h);
+ char *GetDefaultRC(void);
+ void SetIconImage(Widget w);
+-void main(int argc, char *argv[]);
++int main(int argc, char *argv[]);
+ 
+ /* misc.c */
+ Widget GetToplevel(Widget w);

graphics/xpaint/patches/patch-ad

@@ -1,19 +1,30 @@
-*** Local.config.orig	Tue Dec  2 22:39:58 1997
---- Local.config	Tue Dec  2 22:40:43 1997
-***************
-*** 80,86 ****
-  
-  #ifdef HavePNG
-  PNG_LIB     = -L/usr/local/lib -lpng -lz
-! PNG_INCLUDE = -I/usr/local/include/png
-  #endif
-  
-  XCOMM  If you are running SunOS and get an error with the following undefined
---- 80,86 ----
-  
-  #ifdef HavePNG
-  PNG_LIB     = -L/usr/local/lib -lpng -lz
-! PNG_INCLUDE = -I/usr/local/include -I/usr/local/include/png
-  #endif
-  
-  XCOMM  If you are running SunOS and get an error with the following undefined
+--- Local.config.orig	Wed Aug 13 11:36:11 1997
++++ Local.config	Tue May  5 12:20:50 1998
+@@ -57,8 +57,8 @@
+ #define HaveTIFF
+ 
+ #ifdef HaveTIFF
+-TIFF_LIB     = -L/usr/local/lib -ltiff
+-TIFF_INCLUDE = -I/usr/local/include/tiff
++TIFF_LIB     = -L/usr/local/lib -ltiff34
++TIFF_INCLUDE = -I/usr/local/include
+ #endif
+ 
+ XCOMM  If you have the JPEG library, make HaveJPEG defined
+@@ -80,7 +80,7 @@
+ 
+ #ifdef HavePNG
+ PNG_LIB     = -L/usr/local/lib -lpng -lz
+-PNG_INCLUDE = -I/usr/local/include/png
++PNG_INCLUDE = -I/usr/local/include -I/usr/local/include/png
+ #endif
+ 
+ XCOMM  If you are running SunOS and get an error with the following undefined
+@@ -131,7 +131,6 @@
+     defined(BSD386Architecture)
+ ARCH_DEFINES = -DHAVE_PARAM_H
+ TIFF_INCLUDE = -I/usr/local/include
+-TIFF_LIB     = -L/usr/local/lib -ltiff
+ JPEG_INCLUDE = -I/usr/local/include
+ JPEG_LIB     = -L/usr/local/lib -ljpeg
+ XPM_INCLUDE = -I/usr/X11R6/include/X11

graphics/xpaint/patches/patch-af

@@ -0,0 +1,11 @@
+--- rw/readTIFF.c.~1~	Tue Jun 25 01:50:41 1996
++++ rw/readTIFF.c	Tue May  5 12:37:21 1998
+@@ -16,7 +16,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include "tiffio.h"
++#include <tiffio34.h>
+ #include "image.h"
+ #include "rwTable.h"
+ 

graphics/xpaint/patches/patch-ag

@@ -0,0 +1,11 @@
+--- rw/writeTIFF.c.~1~	Tue Jun 25 01:50:41 1996
++++ rw/writeTIFF.c	Tue May  5 12:37:30 1998
+@@ -16,7 +16,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <tiffio.h>
++#include <tiffio34.h>
+ #include "image.h"
+ 
+ #undef howmany

graphics/xpaint/patches/patch-ah

@@ -0,0 +1,17 @@
+--- main.c.~1~	Wed Aug 13 11:36:28 1997
++++ main.c	Tue May  5 12:44:49 1998
+@@ -197,7 +197,7 @@
+ }
+ 
+ 
+-void 
++int
+ main(int argc, char *argv[])
+ {
+     Display *dpy;
+@@ -369,4 +369,5 @@
+ 	XtDispatchEvent(&event);
+     }
+     while (!Global.timeToDie);
++    return 0;
+ }