The path name for -Wl,-rpath as a linker option, so don't split it off

without also prefixing it with -Wl, accordingly.

4 files changed, 35 insertions, 8 deletions

diff --git a/multimedia/goggles/patches/patch-ab b/multimedia/goggles/patches/patch-ab
index 0706ec7383a..0fa90516e6c 100644
--- a/multimedia/goggles/patches/patch-ab
+++ b/multimedia/goggles/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+$NetBSD: patch-ab,v 1.2 2010/01/04 15:20:45 joerg Exp $
 
---- build/config.generic.orig	2006-11-26 14:19:17.000000000 -0800
+--- build/config.generic.orig	2006-11-26 22:19:17.000000000 +0000
 +++ build/config.generic
+@@ -13,7 +13,7 @@ export CXX="g++"                      # 
+ export LINK=$CXX                      # Executable Linker
+ export DLLLINK="$CXX -shared"         # Dynamic Library Linker
+ export LIBLINK="ar cru"               # Static Library Linker
+-export DLLRPATH="-Wl,-rpath "         # Search Path for Dynamic Libs
++export DLLRPATH="-Wl,-rpath,"         # Search Path for Dynamic Libs
+ 
+ # Compiler and Linker Flags
+ export OUTPUTOBJ="-o"                 # Compiler flag to specify output object filename
 @@ -23,15 +23,12 @@ export PICFLAG=""                     # 
  if [ $DEFS == "-DDEBUG" ] ; then
    export CFLAGS="${CFLAGS:--Wall -g -pipe }"
diff --git a/multimedia/goggles/patches/patch-ac b/multimedia/goggles/patches/patch-ac
index f94db6283f3..345ce38fe69 100644
--- a/multimedia/goggles/patches/patch-ac
+++ b/multimedia/goggles/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+$NetBSD: patch-ac,v 1.2 2010/01/04 15:20:45 joerg Exp $
 
---- build/config.hpux.orig	2006-11-26 14:19:18.000000000 -0800
+--- build/config.hpux.orig	2006-11-26 22:19:18.000000000 +0000
 +++ build/config.hpux
 @@ -24,16 +24,13 @@ export PICFLAG=""                     # 
  if [ $DEFS == "-DDEBUG" ] ; then
diff --git a/multimedia/goggles/patches/patch-ad b/multimedia/goggles/patches/patch-ad
index a9fc1183f57..ac6fe71c8f4 100644
--- a/multimedia/goggles/patches/patch-ad
+++ b/multimedia/goggles/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+$NetBSD: patch-ad,v 1.2 2010/01/04 15:20:45 joerg Exp $
 
---- build/config.linux.orig	2006-11-26 14:19:18.000000000 -0800
+--- build/config.linux.orig	2006-11-26 22:19:18.000000000 +0000
 +++ build/config.linux
+@@ -13,7 +13,7 @@ export CXX="g++"                      # 
+ export LINK=$CXX                      # Executable Linker
+ export DLLLINK="$CXX -shared"         # Dynamic Library Linker
+ export LIBLINK="ar cru"               # Static Library Linker
+-export DLLRPATH="-Wl,-rpath "         # Search Path for Dynamic Libs
++export DLLRPATH="-Wl,-rpath,"         # Search Path for Dynamic Libs
+ 
+ # Compiler and Linker Flags
+ export OUTPUTOBJ="-o"                 # Compiler flag to specify output object filename
 @@ -23,15 +23,12 @@ export PICFLAG=""                     # 
  if [ $DEFS == "-DDEBUG" ] ; then
    export CFLAGS="${CFLAGS:--Wall -g -pipe -Wextra}"
diff --git a/multimedia/goggles/patches/patch-ae b/multimedia/goggles/patches/patch-ae
index 52d51ea7f6f..921c1231800 100644
--- a/multimedia/goggles/patches/patch-ae
+++ b/multimedia/goggles/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+$NetBSD: patch-ae,v 1.2 2010/01/04 15:20:45 joerg Exp $
 
---- build/config.linux_x86_64.orig	2006-11-26 14:19:18.000000000 -0800
+--- build/config.linux_x86_64.orig	2006-11-26 22:19:18.000000000 +0000
 +++ build/config.linux_x86_64
+@@ -13,7 +13,7 @@ export CXX="g++"                      # 
+ export LINK=$CXX                      # Executable Linker
+ export DLLLINK="$CXX -shared"         # Dynamic Library Linker
+ export LIBLINK="ar cru"               # Static Library Linker
+-export DLLRPATH="-Wl,-rpath "         # Search Path for Dynamic Libs
++export DLLRPATH="-Wl,-rpath,"         # Search Path for Dynamic Libs
+ 
+ # Compiler and Linker Flags
+ export OUTPUTOBJ="-o"                 # Compiler flag to specify output object filename
 @@ -23,15 +23,12 @@ export PICFLAG=""                     # 
  if [ $DEFS == "-DDEBUG" ] ; then
    export CFLAGS="${CFLAGS:--Wall -g -pipe }"