From 847c329d0d3f70664310c0fe0f1f0ecacf6f8262 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 10 Feb 2004 23:58:36 +0000
Subject: Simplify last commit by just passing LDFLAGS to the compiler when
 linking the shared library.  This automatically puts the LDFLAGS for any
 dependencies, including the gcc3-* packages, into the link command.

---
 graphics/OpenRM/distinfo         |  4 ++--
 graphics/OpenRM/patches/patch-ad | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'graphics/OpenRM')

diff --git a/graphics/OpenRM/distinfo b/graphics/OpenRM/distinfo
index 8dd68e0d196..6d6cd0589db 100644
--- a/graphics/OpenRM/distinfo
+++ b/graphics/OpenRM/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2004/02/10 21:54:32 garbled Exp $
+$NetBSD: distinfo,v 1.3 2004/02/10 23:58:36 jlam Exp $
 
 SHA1 (openrm-devel-1.5.1.tar.gz) = 33a3a2942a57b15da3459efef6b9f2942f9c4ffd
 Size (openrm-devel-1.5.1.tar.gz) = 628213 bytes
 SHA1 (patch-aa) = 45caa6f9d0117e98f707ba7c7e071e1f9dae4d1f
 SHA1 (patch-ab) = c8ad68eb88b9ff557d15f1c3e358dbee828c5605
 SHA1 (patch-ac) = 1288d0d5fa8de3484859f75b9b94554a5ebd1643
-SHA1 (patch-ad) = d96a2c2fffade7395e044f8af7cc3021ec569197
+SHA1 (patch-ad) = 94c69540e804cc5550cd62fd4f125a3fa14a1ba9
diff --git a/graphics/OpenRM/patches/patch-ad b/graphics/OpenRM/patches/patch-ad
index 0ec10728f6f..ab1d86aeb2c 100644
--- a/graphics/OpenRM/patches/patch-ad
+++ b/graphics/OpenRM/patches/patch-ad
@@ -1,12 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2004/02/10 21:54:32 garbled Exp $
---- bin/mklib.freebsd.orig	Thu Dec 11 17:24:35 2003
-+++ bin/mklib.freebsd	Tue Feb 10 14:30:35 2004
-@@ -37,7 +37,7 @@
- 
- OBJECTS=$*
- 
--DEPLIBS="-lGL -lGLU -L${X11BASE}/lib -lXmu"
-+DEPLIBS="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lGL -lGLU -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXmu"
- 
- #--platform------------------------------------------------------------
- 
+$NetBSD: patch-ad,v 1.2 2004/02/10 23:58:36 jlam Exp $
+
+--- bin/mklib.freebsd.orig	Thu Dec 11 16:24:35 2003
++++ bin/mklib.freebsd
+@@ -47,7 +47,7 @@ ${RM} -f ${LIBRARY}.a ${LIBRARY}.so.${VE
+ ${AR} qv ${LIBRARY}.a ${OBJECTS}
+ 
+ # FreeBSD specific build
+-${CC} -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS} ${DEPLIBS}
++${CC} -shared -Wl,-soname,${LIBRARY}.so.${VERSION} -o ${LIBRARY}.so.${VERSION} ${OBJECTS} ${LDFLAGS} ${DEPLIBS}
+ if [ ${ARCHFLAGS##*-} != "debug" ]; then
+     ${STRIP_CMD} ${LIBRARY}.so.${VERSION}
+     ${ECHO_CMD} "library has been stripped (non-debug build)."
-- 
cgit v1.2.3