diff options
| author | tron <tron@pkgsrc.org> | 2001-06-09 11:41:36 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-06-09 11:41:36 +0000 |
| commit | 653d0df5a9ec271ee4103b8bf5b3b1927e1357c4 (patch) | |
| tree | 8563ffd240a59287712dbe416d8e81e2d6703235 /graphics/xpm | |
| parent | 2a1bff66d3ec9a124a1e3be6e4012555ef55e9d1 (diff) | |
| download | pkgsrc-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')
| -rw-r--r-- | graphics/xpm/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xpm/patches/patch-ab | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo index 38baf10c75b..2174fec926e 100644 --- a/graphics/xpm/distinfo +++ b/graphics/xpm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/06/08 14:35:38 tron Exp $ +$NetBSD: distinfo,v 1.4 2001/06/09 11:41:36 tron Exp $ SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd Size (xpm-3.4k.tar.gz) = 148887 bytes SHA1 (patch-aa) = 86264a0d832382eef43af740f16bcdf9448f4573 -SHA1 (patch-ab) = 55950141356ac5b674753de9b583be79506c4244 +SHA1 (patch-ab) = 0c8f317cdbde27929790e46d1711ada5e454b79d SHA1 (patch-ac) = 7c64179038a819bd21b0571a7f923cea96cf0afe 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 |