From 94dd8a2a9accd67c66586bb705f7d3bd4505afdc Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Sun, 1 Jun 2008 14:36:37 +0000
Subject: commit my fix for PR pkg/37128 Ensure Linux shared libraries get the
 correct rpath built in. ok joerg. Bump rev.

---
 x11/xorg-cf-files/Makefile         |  4 ++--
 x11/xorg-cf-files/distinfo         |  4 ++--
 x11/xorg-cf-files/patches/patch-aj | 11 ++++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'x11/xorg-cf-files')

diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 3382d09ed95..e52be77628d 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/05/24 21:45:18 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/01 14:36:37 tnn Exp $
 #
 
 DISTNAME=		xorg-cf-files-1.0.2
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index 141bb6cc1c1..72e2975123d 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/01/25 18:55:02 joerg Exp $
+$NetBSD: distinfo,v 1.6 2008/06/01 14:36:37 tnn Exp $
 
 SHA1 (xorg-cf-files-1.0.2.tar.bz2) = a1182e1fd05a648e6282598a355b7c4be9339755
 RMD160 (xorg-cf-files-1.0.2.tar.bz2) = dc42aa06d7fb5bc073d51958763bf1bfcfd22926
@@ -12,4 +12,4 @@ SHA1 (patch-af) = 6fdcbcb8858bd82d260d00563980e80e314b899c
 SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729
 SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
 SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
-SHA1 (patch-aj) = 5060968a789b0cf2568e4b3eb71d9e988d7f3d9e
+SHA1 (patch-aj) = 6fd05a766895c06b940e28cd5cadde48365790c3
diff --git a/x11/xorg-cf-files/patches/patch-aj b/x11/xorg-cf-files/patches/patch-aj
index 186f26f953e..47b8f557e3c 100644
--- a/x11/xorg-cf-files/patches/patch-aj
+++ b/x11/xorg-cf-files/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2008/01/25 18:55:02 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2008/06/01 14:36:37 tnn Exp $
 
 Force Rpath usage on Linux. For reasons analysed in details,
 the binutils detection seems to fail.
@@ -14,6 +14,15 @@ the binutils detection seems to fail.
  #endif
  
  #ifndef SharedOldX
+@@ -78,7 +78,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+ #define LibraryRpathLoadFlags RpathLoadFlags
+ #endif
+ # ifndef SharedLibraryLoadFlags
+-#  define SharedLibraryLoadFlags -shared
++#  define SharedLibraryLoadFlags -shared RpathLoadFlags
+ # endif
+ # ifndef PositionIndependentCFlags
+ #  define PositionIndependentCFlags -fPIC
 @@ -87,17 +87,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
  #  define PositionIndependentCplusplusFlags -fPIC
  # endif
-- 
cgit v1.2.3