summaryrefslogtreecommitdiff
path: root/graphics/xpaint
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2002-10-26 19:43:45 +0000
committerbouyer <bouyer@pkgsrc.org>2002-10-26 19:43:45 +0000
commit44e5874a7e86a5887400b8684d2acd505b46d928 (patch)
tree8d80910227506a419ba930ff86c5df0af58f265d /graphics/xpaint
parentc85bb6ed17eb6ffb86279c4b2e56a5451b9f5991 (diff)
downloadpkgsrc-44e5874a7e86a5887400b8684d2acd505b46d928.tar.gz
Remove a NetBSD-specific check, all systems use ${LOCALBASE} in pkgsrc world.
Diffstat (limited to 'graphics/xpaint')
-rw-r--r--graphics/xpaint/distinfo4
-rw-r--r--graphics/xpaint/patches/patch-af22
2 files changed, 15 insertions, 11 deletions
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 487f375cc4a..070357fe889 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/02/05 22:08:26 drochner Exp $
+$NetBSD: distinfo,v 1.4 2002/10/26 19:43:45 bouyer Exp $
SHA1 (xpaint-2.6.2.tar.gz) = 33afbb8360e9654fc1ddb04dc739388d3b8584c5
Size (xpaint-2.6.2.tar.gz) = 265319 bytes
@@ -7,4 +7,4 @@ SHA1 (patch-ab) = a0644e605edd5c1769b5b11a6004c4b512960b46
SHA1 (patch-ac) = dbdf4d975268f3cc9f9d3e8c4526a61505e4d7e5
SHA1 (patch-ad) = 694cd49256c0dc6330e5538427d69f486de45006
SHA1 (patch-ae) = daae6772cac1b2ab2fc6b024661f2f22cdee588d
-SHA1 (patch-af) = 715457d4efb5bddcfd956f0c31965fd9602e42f2
+SHA1 (patch-af) = df0ab99a312e1d982bf16a90adf3776c734fb8ed
diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af
index 92ce5e94212..b8cba411a9c 100644
--- a/graphics/xpaint/patches/patch-af
+++ b/graphics/xpaint/patches/patch-af
@@ -1,18 +1,19 @@
-$NetBSD: patch-af,v 1.4 2000/09/01 13:43:38 hubertf Exp $
+$NetBSD: patch-af,v 1.5 2002/10/26 19:43:46 bouyer Exp $
---- Local.config.orig Sat Jun 27 19:43:56 1998
-+++ Local.config Fri Sep 1 11:32:05 2000
-@@ -39,6 +39,9 @@
+--- Local.config.orig Tue Jun 12 21:26:45 2001
++++ Local.config Tue Oct 22 13:03:07 2002
+@@ -43,7 +43,10 @@
#ifdef NetBSDArchitecture
ARCH_DEFINES = -DHAVE_PARAM_H
+#ifdef arm32Architecture
+CDEBUGFLAGS =
-+#endif
#endif
++#endif
#ifdef OS2Architecture
-@@ -101,11 +104,11 @@
+ ARCH_DEFINES = -DMISSING_STRCASECMP
+@@ -105,11 +108,11 @@
XCOMM You must have the XPM library.
XCOMM Make sure the path name to the library is correct.
@@ -26,15 +27,18 @@ $NetBSD: patch-af,v 1.4 2000/09/01 13:43:38 hubertf Exp $
DEPENDFLAGS = -I./bitmaps
-@@ -133,11 +136,13 @@
+@@ -135,14 +138,14 @@
+
+ XCOMM This should take care of everything needed for BSD.
- #if defined(NetBSDArchitecture) || defined(BSD386Architecture)
+-#if defined(NetBSDArchitecture) || 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
+-#endif
+TIFF_INCLUDE = -I${LOCALBASE}/include
+TIFF_LIB = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltiff
+JPEG_INCLUDE = -I${LOCALBASE}/include
@@ -42,6 +46,6 @@ $NetBSD: patch-af,v 1.4 2000/09/01 13:43:38 hubertf Exp $
+PNG_INCLUDE = -I${LOCALBASE}/include/png
+PNG_LIB = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpng -lz
+XPM_INCLUDE = -I${XPMDIR}/include/X11
- #endif
#if defined(FreeBSDArchitecture)
+ ARCH_DEFINES = -DHAVE_PARAM_H