Make this build.

  * Replace /bin/bash
  * Don't override LDFLAGS to use pkgsrc linker flags
  * Bump pkg revision

7 files changed, 115 insertions, 4 deletions

diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile
index 9b673aaabdf..5fd171f2d61 100644
--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:58:05 sno Exp $
+# $NetBSD: Makefile,v 1.4 2009/11/14 22:07:07 yyamano Exp $
 #
 
 DISTNAME=		goggles-0.9.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		http://www.fifthplanet.net/files/
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,9 @@ HOMEPAGE=		http://www.fifthplanet.net/goggles.html
 COMMENT=		Easy to use frontend for Ogle DVD Player
 
 USE_LANGUAGES+=		c c++ # c for configure script
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake bash:run
+
+REPLACE_BASH=		gb
 
 do-build:
 	cd ${WRKSRC} && ${MAKE_ENV} ./gb --prefix=${PREFIX} \
diff --git a/multimedia/goggles/distinfo b/multimedia/goggles/distinfo
index 2d956481507..eab8fc189fd 100644
--- a/multimedia/goggles/distinfo
+++ b/multimedia/goggles/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/12 20:52:02 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/11/14 22:07:07 yyamano 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-af) = f64d26c857b09db2fe56aa10a974ca6f5af31213
diff --git a/multimedia/goggles/patches/patch-ab b/multimedia/goggles/patches/patch-ab
new file mode 100644
index 00000000000..0706ec7383a
--- /dev/null
+++ b/multimedia/goggles/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+
+--- build/config.generic.orig	2006-11-26 14:19:17.000000000 -0800
++++ build/config.generic
+@@ -23,15 +23,12 @@ export PICFLAG=""                     # 
+ if [ $DEFS == "-DDEBUG" ] ; then
+   export CFLAGS="${CFLAGS:--Wall -g -pipe }"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -g -pipe}"
+-	export LDFLAGS=""
+ elif [ $DEFS == "-DNDEBUG" ] ; then
+ 	export CFLAGS="${CFLAGS:--Wall -O3 -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -O3 -pipe}"
+-	export LDFLAGS="-s"
+ else
+ 	export CFLAGS="${CFLAGS:--Wall -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -pipe}"
+-	export LDFLAGS=""
+ fi
+ 
+ export CPPFLAGS="-I./include ${CPPFLAGS}"
diff --git a/multimedia/goggles/patches/patch-ac b/multimedia/goggles/patches/patch-ac
new file mode 100644
index 00000000000..f94db6283f3
--- /dev/null
+++ b/multimedia/goggles/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+
+--- build/config.hpux.orig	2006-11-26 14:19:18.000000000 -0800
++++ build/config.hpux
+@@ -24,16 +24,13 @@ export PICFLAG=""                     # 
+ if [ $DEFS == "-DDEBUG" ] ; then
+   export CFLAGS="${CFLAGS:--Wall -g -pipe }"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -g -pipe}"
+-	export LDFLAGS=""
+ elif [ $DEFS == "-DNDEBUG" ] ; then
+ 	export CFLAGS="${CFLAGS:--Wall -O3 -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -O3 -pipe}"
+-	export LDFLAGS="-s"
+ else
+ 	export CFLAGS="${CFLAGS:--Wall -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -pipe}"
+-	export LDFLAGS=""
+-	fi
++fi
+ 
+ export CPPFLAGS="-I./include ${CPPFLAGS}"
+ export LIBS=""
diff --git a/multimedia/goggles/patches/patch-ad b/multimedia/goggles/patches/patch-ad
new file mode 100644
index 00000000000..a9fc1183f57
--- /dev/null
+++ b/multimedia/goggles/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+
+--- build/config.linux.orig	2006-11-26 14:19:18.000000000 -0800
++++ build/config.linux
+@@ -23,15 +23,12 @@ export PICFLAG=""                     # 
+ if [ $DEFS == "-DDEBUG" ] ; then
+   export CFLAGS="${CFLAGS:--Wall -g -pipe -Wextra}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -g -pipe -Wextra}"
+-	export LDFLAGS=""
+ elif [ $DEFS == "-DNDEBUG" ] ; then
+ 	export CFLAGS="${CFLAGS:--Wall -O3 -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -O3 -pipe}"
+-	export LDFLAGS="-s"
+ else
+ 	export CFLAGS="${CFLAGS:--Wall -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -pipe}"
+-	export LDFLAGS=""
+ fi
+ 
+ export CPPFLAGS="-I./include ${CPPFLAGS}"
diff --git a/multimedia/goggles/patches/patch-ae b/multimedia/goggles/patches/patch-ae
new file mode 100644
index 00000000000..52d51ea7f6f
--- /dev/null
+++ b/multimedia/goggles/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+
+--- build/config.linux_x86_64.orig	2006-11-26 14:19:18.000000000 -0800
++++ build/config.linux_x86_64
+@@ -23,15 +23,12 @@ export PICFLAG=""                     # 
+ if [ $DEFS == "-DDEBUG" ] ; then
+   export CFLAGS="${CFLAGS:--Wall -g -pipe }"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -g -pipe}"
+-	export LDFLAGS=""
+ elif [ $DEFS == "-DNDEBUG" ] ; then
+ 	export CFLAGS="${CFLAGS:--Wall -O3 -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -O3 -pipe}"
+-	export LDFLAGS="-s"
+ else
+ 	export CFLAGS="${CFLAGS:--Wall -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -pipe}"
+-	export LDFLAGS=""
+ fi
+ 
+ export CPPFLAGS="-I./include ${CPPFLAGS}"
diff --git a/multimedia/goggles/patches/patch-af b/multimedia/goggles/patches/patch-af
new file mode 100644
index 00000000000..0d3676d1814
--- /dev/null
+++ b/multimedia/goggles/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2009/11/14 22:07:07 yyamano Exp $
+
+--- build/config.solaris.orig	2006-11-26 14:19:18.000000000 -0800
++++ build/config.solaris
+@@ -23,16 +23,13 @@ export PICFLAG=""                     # 
+ if [ $DEFS == "-DDEBUG" ] ; then
+   export CFLAGS="${CFLAGS:--Wall -g -pipe }"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -g -pipe}"
+-	export LDFLAGS=""
+ elif [ $DEFS == "-DNDEBUG" ] ; then
+ 	export CFLAGS="${CFLAGS:--Wall -O3 -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -O3 -pipe}"
+-	export LDFLAGS="-s"
+ else
+ 	export CFLAGS="${CFLAGS:--Wall -pipe}"
+ 	export CXXFLAGS="${CXXFLAGS:--Wall -pipe}"
+-	export LDFLAGS=""
+-	fi
++fi
+ 
+ export CPPFLAGS="-I./include ${CPPFLAGS}"
+ export LIBS=""