summaryrefslogtreecommitdiff
path: root/graphics/xpm
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2005-08-11 22:46:05 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2005-08-11 22:46:05 +0000
commit512941eabffb0610452c68d96f6e8aab5d4a2f74 (patch)
treedda6ec0dd89af15844d0f7e5f4dcd1e5492fd7ec /graphics/xpm
parent8bb9ee90abd466d7a8f67586359d98228c86dbd0 (diff)
downloadpkgsrc-512941eabffb0610452c68d96f6e8aab5d4a2f74.tar.gz
make sure that we put -L../lib at the beginning so we find our
local libXpm. Fixes linking problems on solaris.
Diffstat (limited to 'graphics/xpm')
-rw-r--r--graphics/xpm/Makefile4
-rw-r--r--graphics/xpm/distinfo4
-rw-r--r--graphics/xpm/patches/patch-ab12
3 files changed, 11 insertions, 9 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index c0c7ced254f..2d7fb87dd05 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2005/06/14 18:10:37 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/11 22:46:05 dmcmahill Exp $
DISTNAME= xpm-3.4k
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics x11
MASTER_SITES= http://koala.ilog.fr/ftp/pub/xpm/ \
${MASTER_SITE_XCONTRIB:=libraries/}
diff --git a/graphics/xpm/distinfo b/graphics/xpm/distinfo
index 9c8d825fcdd..27bc756dd35 100644
--- a/graphics/xpm/distinfo
+++ b/graphics/xpm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2005/06/14 18:10:37 jlam Exp $
+$NetBSD: distinfo,v 1.14 2005/08/11 22:46:05 dmcmahill Exp $
SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd
RMD160 (xpm-3.4k.tar.gz) = 65a2e58f97724a48a6834aab991341771c5a1faf
Size (xpm-3.4k.tar.gz) = 148887 bytes
SHA1 (patch-aa) = 33725beb53dc01b022e5110dbffab4c6a3ae65dc
-SHA1 (patch-ab) = 0c8f317cdbde27929790e46d1711ada5e454b79d
+SHA1 (patch-ab) = ac9e69f618788d78a024b55c58c46c302f66ec99
SHA1 (patch-ac) = 80c8c58a526ccc8651862d87cc5cd92d8aa9fb2d
SHA1 (patch-ad) = d352c47831955845e5805ac737031f2ff179b0df
SHA1 (patch-ae) = 9b11253041212c8e43c426be4729363e4f8e122a
diff --git a/graphics/xpm/patches/patch-ab b/graphics/xpm/patches/patch-ab
index e60cc25b903..d13a56bf3e3 100644
--- a/graphics/xpm/patches/patch-ab
+++ b/graphics/xpm/patches/patch-ab
@@ -1,8 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2001/06/09 11:41:36 tron Exp $
+$NetBSD: patch-ab,v 1.4 2005/08/11 22:46:05 dmcmahill Exp $
---- sxpm/Imakefile.orig Thu Mar 19 14:51:01 1998
-+++ sxpm/Imakefile Sat Jun 9 03:33:04 2001
-@@ -60,8 +60,13 @@
+--- sxpm/Imakefile.orig 1998-03-19 14:51:01.000000000 -0500
++++ sxpm/Imakefile 2005-08-11 14:46:16.678675000 -0400
+@@ -58,9 +58,15 @@
+ #else
+ LOCAL_LIBRARIES = -L../lib -L$(XPMLIBDIR) $(XPMLIB) $(XTOOLLIB) $(XLIB)
++EXTRA_LDOPTIONS = -L../lib
#endif
XCOMM try hard to set things so we'll find the shared lib once installed
@@ -15,4 +18,3 @@ $NetBSD: patch-ab,v 1.3 2001/06/09 11:41:36 tron Exp $
+#endif
#if ProjectX < 603
- # ifdef HPArchitecture