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

without also prefixing it with -Wl, accordingly.

5 files changed, 40 insertions, 13 deletions

diff --git a/multimedia/goggles/distinfo b/multimedia/goggles/distinfo
index eab8fc189fd..a9f9c5fff39 100644
--- a/multimedia/goggles/distinfo
+++ b/multimedia/goggles/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2009/11/14 22:07:07 yyamano Exp $
+$NetBSD: distinfo,v 1.3 2010/01/04 15:20:44 joerg Exp $
 
 SHA1 (goggles-0.9.1.tar.bz2) = 2e464e1bcf699a18f6190f5571877356388c778a
 RMD160 (goggles-0.9.1.tar.bz2) = 6a15a365b1b4bfaba1b6d294d2e7379b4f0fb560
 Size (goggles-0.9.1.tar.bz2) = 486290 bytes
 SHA1 (patch-aa) = 8c03ccd0f8d9e8b72753b16b2c0cbd7e66833dd1
-SHA1 (patch-ab) = fa92fa5d3d1430f77b32b28e8911d25bdc85a8d2
-SHA1 (patch-ac) = de988af6dc662358ed3571095035dbf95160d9b8
-SHA1 (patch-ad) = b32a9dd9590318171473488142c873a819e99c7c
-SHA1 (patch-ae) = 1a45cee64e5bff7dd0c3ebc9c3b7ac201104a221
+SHA1 (patch-ab) = 9ecc34603dfebf6040ac08865591c6f86d932fcd
+SHA1 (patch-ac) = 7e72d97bf1037185d0248d9ed0dd7701cd24f95b
+SHA1 (patch-ad) = decff802990aeabe6afc57eda05a9ebb30020c78
+SHA1 (patch-ae) = cf0289b01dc9893f3fcb11b0ed0b7051d728cfbf
 SHA1 (patch-af) = f64d26c857b09db2fe56aa10a974ca6f5af31213
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 }"