summaryrefslogtreecommitdiff
path: root/graphics/xpm/patches/patch-ab
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-06-09 11:41:36 +0000
committertron <tron@pkgsrc.org>2001-06-09 11:41:36 +0000
commit653d0df5a9ec271ee4103b8bf5b3b1927e1357c4 (patch)
tree8563ffd240a59287712dbe416d8e81e2d6703235 /graphics/xpm/patches/patch-ab
parent2a1bff66d3ec9a124a1e3be6e4012555ef55e9d1 (diff)
downloadpkgsrc-653d0df5a9ec271ee4103b8bf5b3b1927e1357c4.tar.gz
Solve problem caused by "xpkwedge" support showing up under Solaris in a
better way. Patch supplied by Johnny C. Lam in private e-mail.
Diffstat (limited to 'graphics/xpm/patches/patch-ab')
-rw-r--r--graphics/xpm/patches/patch-ab19
1 files changed, 10 insertions, 9 deletions
diff --git a/graphics/xpm/patches/patch-ab b/graphics/xpm/patches/patch-ab
index 29f40855da6..e60cc25b903 100644
--- a/graphics/xpm/patches/patch-ab
+++ b/graphics/xpm/patches/patch-ab
@@ -1,16 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2001/06/08 14:35:39 tron Exp $
+$NetBSD: patch-ab,v 1.3 2001/06/09 11:41:36 tron Exp $
---- sxpm/Imakefile.orig Thu Mar 19 20:51:01 1998
-+++ sxpm/Imakefile Thu Jun 7 17:30:25 2001
-@@ -60,8 +60,10 @@
+--- sxpm/Imakefile.orig Thu Mar 19 14:51:01 1998
++++ sxpm/Imakefile Sat Jun 9 03:33:04 2001
+@@ -60,8 +60,13 @@
#endif
XCOMM try hard to set things so we'll find the shared lib once installed
--LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
--USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
-+#ifndef NetBSDArchitecture
-+LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
-+USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
++#ifdef X11ProjectRoot
++LD_RUN_PATH = $(USRLIBDIR):$(XPROJECTROOT)/lib:$(XPMLIBDIR)
++USRLIBDIRPATH = $(USRLIBDIR):$(XPROJECTROOT)/lib:$(XPMLIBDIR)
++#else
+ LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
+ USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
+#endif
#if ProjectX < 603