Fix buildling on DragonflyBSD and FreeBSD; courtesy of Steve O'Hara-Smith

3 files changed, 18 insertions, 12 deletions

diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 480ebb28afc..688f80fb09b 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.15 2005/09/06 14:53:36 adam Exp $
+$NetBSD: distinfo,v 1.16 2005/09/07 14:10:16 adam Exp $
 
 SHA1 (xpaint-2.7.8.tar.bz2) = 5573996f293838abd892faaa73a31239c03f9b9a
 RMD160 (xpaint-2.7.8.tar.bz2) = edf4cdd5ee3f2af1d49eb4bb6618fc2dc3c138ff
 Size (xpaint-2.7.8.tar.bz2) = 415855 bytes
-SHA1 (patch-aa) = 87ddea42b6497f0c38a56f2915b9896d2858b63d
+SHA1 (patch-aa) = c0f7d49081c3440b836754966527e39ee1bcabec
 SHA1 (patch-ab) = 653a8873434093b4fc27e57a26e850ca23ec3556
 SHA1 (patch-ac) = 78ba5e1c2b0bb5e9abfd12783454d5b30499d5f0
 SHA1 (patch-ad) = dc12b553353bb5f8e70251ace8bf874c13aaa24f
 SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263
-SHA1 (patch-af) = 7742b1c2e56ae8d3797765b3c477c8c46c9a0b07
+SHA1 (patch-af) = b2338fb83ef693a02645012a9d2a2b0eb46daa52
 SHA1 (patch-ag) = 5191cb57084a746fec33dec105a8fe1750c6d8ae
diff --git a/graphics/xpaint/patches/patch-aa b/graphics/xpaint/patches/patch-aa
index 2519888d7db..aaadd4f8497 100644
--- a/graphics/xpaint/patches/patch-aa
+++ b/graphics/xpaint/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2005/01/31 09:24:07 adam Exp $
+$NetBSD: patch-aa,v 1.6 2005/09/07 14:10:16 adam Exp $
 
 --- misc.h.orig	2004-09-22 14:20:24.000000000 +0000
 +++ misc.h
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.5 2005/01/31 09:24:07 adam Exp $
  #endif
  
 -#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__)
-+#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__) & !defined(__NetBSD__)
++#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__) & !defined(__NetBSD__) & !defined(__DragonFly__)
  #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
  void srandom(unsigned int);
  #else
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index 65593e4cb89..5c6c2f7a0a0 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.10 2005/09/06 14:53:36 adam Exp $
+$NetBSD: patch-af,v 1.11 2005/09/07 14:10:16 adam Exp $
 
---- Local.config.orig	2004-09-05 08:14:53.000000000 +0000
+--- Local.config.orig	2005-04-30 21:33:14.000000000 +0000
 +++ Local.config
-@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.29 2004/09/0
+@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2
  XCOMM Local customization
  
  DESTDIR = 
@@ -35,7 +35,7 @@ $NetBSD: patch-af,v 1.10 2005/09/06 14:53:36 adam Exp $
  
  
  DEPENDFLAGS = -I./bitmaps
-@@ -162,14 +165,14 @@ XCOMM CDEBUGFLAGS =
+@@ -162,20 +165,11 @@ XCOMM CDEBUGFLAGS =
  
  XCOMM This should take care of everything needed for BSD.
  
@@ -47,6 +47,15 @@ $NetBSD: patch-af,v 1.10 2005/09/06 14:53:36 adam Exp $
 -JPEG_LIB     = -L/usr/local/lib -ljpeg
 -XPM_INCLUDE = -I/usr/X11R6/include/X11
 -#endif
+-
+-#if defined(FreeBSDArchitecture)
+-ARCH_DEFINES = -DHAVE_PARAM_H
+-TIFF_INCLUDE = -I/usr/local/include/tiff34
+-TIFF_LIB     = -L/usr/local/lib -ltiff34
+-JPEG_INCLUDE = -I/usr/local/include
+-JPEG_LIB     = -L/usr/local/lib -ljpeg
+-XPM_INCLUDE = -I/usr/X11R6/include/X11
+-#endif
 +TIFF_INCLUDE = -I@LOCALBASE@/include
 +TIFF_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff
 +JPEG_INCLUDE = -I@LOCALBASE@/include
@@ -54,6 +63,3 @@ $NetBSD: patch-af,v 1.10 2005/09/06 14:53:36 adam Exp $
 +PNG_INCLUDE = -I@LOCALBASE@/include/png
 +PNG_LIB     = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -lpng -lz
 +XPM_INCLUDE = -I@XPMDIR@/include/X11
- 
- #if defined(FreeBSDArchitecture)
- ARCH_DEFINES = -DHAVE_PARAM_H