summaryrefslogtreecommitdiff
path: root/graphics/xpm
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-06-08 14:35:38 +0000
committertron <tron@pkgsrc.org>2001-06-08 14:35:38 +0000
commit856132aa53934dd3df40629941b65fb8eca88819 (patch)
tree72d53f4c35a64f25b96262d85af5ce6303592a92 /graphics/xpm
parent156d1db9c7a841afb3188be88ace2d9cd338c588 (diff)
downloadpkgsrc-856132aa53934dd3df40629941b65fb8eca88819.tar.gz
Fix broken "xpkwedge" patch which unconditionally modifies
"USRLIBDIRPATH" causing build problems under Solaris.
Diffstat (limited to 'graphics/xpm')
-rw-r--r--graphics/xpm/distinfo4
-rw-r--r--graphics/xpm/patches/patch-ab14
2 files changed, 10 insertions, 8 deletions
diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo
index 3d6b73ef4cc..38baf10c75b 100644
--- a/graphics/xpm/distinfo
+++ b/graphics/xpm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/08 14:35:38 tron Exp $
SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd
Size (xpm-3.4k.tar.gz) = 148887 bytes
SHA1 (patch-aa) = 86264a0d832382eef43af740f16bcdf9448f4573
-SHA1 (patch-ab) = d5e1561580a9c14e9f37b6cc40df7708d9472292
+SHA1 (patch-ab) = 55950141356ac5b674753de9b583be79506c4244
SHA1 (patch-ac) = 7c64179038a819bd21b0571a7f923cea96cf0afe
diff --git a/graphics/xpm/patches/patch-ab b/graphics/xpm/patches/patch-ab
index fdd10ad547c..29f40855da6 100644
--- a/graphics/xpm/patches/patch-ab
+++ b/graphics/xpm/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.1 1999/10/05 06:15:57 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/06/08 14:35:39 tron Exp $
---- sxpm/Imakefile.orig Thu Mar 19 14:51:01 1998
-+++ sxpm/Imakefile Tue Oct 5 01:10:19 1999
-@@ -60,8 +60,8 @@
+--- sxpm/Imakefile.orig Thu Mar 19 20:51:01 1998
++++ sxpm/Imakefile Thu Jun 7 17:30:25 2001
+@@ -60,8 +60,10 @@
#endif
XCOMM try hard to set things so we'll find the shared lib once installed
-LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
-USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
-+XCOMM LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
-+XCOMM USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
++#ifndef NetBSDArchitecture
++LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
++USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
++#endif
#if ProjectX < 603
# ifdef HPArchitecture