summaryrefslogtreecommitdiff
path: root/x11/gtk2
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2009-11-27 16:54:29 +0000
committertnn <tnn@pkgsrc.org>2009-11-27 16:54:29 +0000
commit5c276d8f744f3519c0d5f42bb9d808956f62832f (patch)
treef136b521009d6e3654cb4f747daa4af272f854b1 /x11/gtk2
parent35c74fc5095589d110e9b0e2a49c53ddc5ec957f (diff)
downloadpkgsrc-5c276d8f744f3519c0d5f42bb9d808956f62832f.tar.gz
Use ${COMPILER_RPATH_FLAG} instead of -R for X_LIBS in pkg-config files.
This fixes firefox run-time breakage with native X11 on netbsd-4 caused by pkgsrc wrappers not dealing with -R. Bump PKGREVISION.
Diffstat (limited to 'x11/gtk2')
-rw-r--r--x11/gtk2/Makefile3
-rw-r--r--x11/gtk2/distinfo3
-rw-r--r--x11/gtk2/patches/patch-af13
3 files changed, 17 insertions, 2 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index bea904c5b4b..bda2e23a726 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.190 2009/11/18 08:11:08 wiz Exp $
+# $NetBSD: Makefile,v 1.191 2009/11/27 16:54:29 tnn Exp $
DISTNAME= gtk+-2.18.3
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.18/ \
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 7a806f4a1ad..e62e78d027c 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2009/10/21 15:34:06 drochner Exp $
+$NetBSD: distinfo,v 1.118 2009/11/27 16:54:30 tnn Exp $
SHA1 (gtk+-2.18.3.tar.bz2) = a5432017a3116cb66460150d089e8aedbe756641
RMD160 (gtk+-2.18.3.tar.bz2) = 44b44501d8ef3490787964200b52965d9d282d5c
@@ -8,6 +8,7 @@ SHA1 (patch-ab) = 075dcdceeeea06d93802643b9bd2c23f0ee32a64
SHA1 (patch-ac) = 81765fc056a25c5b53a7223ea62f6f98a6da6104
SHA1 (patch-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15
SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863
+SHA1 (patch-af) = 372a21cdb884e7c62852680d0029ded12c706efd
SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
SHA1 (patch-iojpeg) = 0042e773df5ed24abea22fa4b15469db0457d88d
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
new file mode 100644
index 00000000000..53fa5216a76
--- /dev/null
+++ b/x11/gtk2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.16 2009/11/27 16:54:30 tnn Exp $
+
+--- configure.orig 2009-10-17 03:53:05.000000000 +0200
++++ configure
+@@ -28849,7 +28849,7 @@ $as_echo "$ac_try_echo") >&5
+ }; then
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+- X_LIBS="$X_LIBS -R$x_libraries"
++ X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5