Sat Nov 14 22:07:07 2009 UTC ()
Make this build.
  * Replace /bin/bash
  * Don't override LDFLAGS to use pkgsrc linker flags
  * Bump pkg revision


(yyamano)
diff -r1.3 -r1.4 pkgsrc/multimedia/goggles/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/goggles/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/goggles/patches/patch-ab
diff -r0 -r1.1 pkgsrc/multimedia/goggles/patches/patch-ac
diff -r0 -r1.1 pkgsrc/multimedia/goggles/patches/patch-ad
diff -r0 -r1.1 pkgsrc/multimedia/goggles/patches/patch-ae
diff -r0 -r1.1 pkgsrc/multimedia/goggles/patches/patch-af
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/goggles/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/goggles/Makefile 2009/08/26 19:58:05 1.3
+++ pkgsrc/multimedia/goggles/Makefile 2009/11/14 22:07:07 1.4
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.3 2009/08/26 19:58:05 sno Exp $ 1# $NetBSD: Makefile,v 1.4 2009/11/14 22:07:07 yyamano Exp $
2# 2#
3 3
4DISTNAME= goggles-0.9.1 4DISTNAME= goggles-0.9.1
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.fifthplanet.net/files/ 7MASTER_SITES= http://www.fifthplanet.net/files/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fifthplanet.net/goggles.html 11HOMEPAGE= http://www.fifthplanet.net/goggles.html
12COMMENT= Easy to use frontend for Ogle DVD Player 12COMMENT= Easy to use frontend for Ogle DVD Player
13 13
14USE_LANGUAGES+= c c++ # c for configure script 14USE_LANGUAGES+= c c++ # c for configure script
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake bash:run
 16
 17REPLACE_BASH= gb
16 18
17do-build: 19do-build:
18 cd ${WRKSRC} && ${MAKE_ENV} ./gb --prefix=${PREFIX} \ 20 cd ${WRKSRC} && ${MAKE_ENV} ./gb --prefix=${PREFIX} \
19 --fox-prefix=${BUILDLINK_PREFIX.fox} \ 21 --fox-prefix=${BUILDLINK_PREFIX.fox} \
20 --ogle-prefix=${BUILDLINK_PREFIX.ogle} \ 22 --ogle-prefix=${BUILDLINK_PREFIX.ogle} \
21 --use-config=build/config.generic 23 --use-config=build/config.generic
22 24
23do-install: 25do-install:
24 cd ${WRKSRC} && ${MAKE_ENV} ./gb --prefix=${PREFIX} install 26 cd ${WRKSRC} && ${MAKE_ENV} ./gb --prefix=${PREFIX} install
25 27
26.include "../../x11/fox/buildlink3.mk" 28.include "../../x11/fox/buildlink3.mk"
27.include "../../multimedia/ogle/buildlink3.mk" 29.include "../../multimedia/ogle/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/multimedia/goggles/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/goggles/distinfo 2008/03/12 20:52:02 1.1.1.1
+++ pkgsrc/multimedia/goggles/distinfo 2009/11/14 22:07:07 1.2
@@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/03/12 20:52:02 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2009/11/14 22:07:07 yyamano Exp $
2 2
3SHA1 (goggles-0.9.1.tar.bz2) = 2e464e1bcf699a18f6190f5571877356388c778a 3SHA1 (goggles-0.9.1.tar.bz2) = 2e464e1bcf699a18f6190f5571877356388c778a
4RMD160 (goggles-0.9.1.tar.bz2) = 6a15a365b1b4bfaba1b6d294d2e7379b4f0fb560 4RMD160 (goggles-0.9.1.tar.bz2) = 6a15a365b1b4bfaba1b6d294d2e7379b4f0fb560
5Size (goggles-0.9.1.tar.bz2) = 486290 bytes 5Size (goggles-0.9.1.tar.bz2) = 486290 bytes
6SHA1 (patch-aa) = 8c03ccd0f8d9e8b72753b16b2c0cbd7e66833dd1 6SHA1 (patch-aa) = 8c03ccd0f8d9e8b72753b16b2c0cbd7e66833dd1
 7SHA1 (patch-ab) = fa92fa5d3d1430f77b32b28e8911d25bdc85a8d2
 8SHA1 (patch-ac) = de988af6dc662358ed3571095035dbf95160d9b8
 9SHA1 (patch-ad) = b32a9dd9590318171473488142c873a819e99c7c
 10SHA1 (patch-ae) = 1a45cee64e5bff7dd0c3ebc9c3b7ac201104a221
 11SHA1 (patch-af) = f64d26c857b09db2fe56aa10a974ca6f5af31213
File Added: pkgsrc/multimedia/goggles/patches/patch-ab
$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}"
File Added: pkgsrc/multimedia/goggles/patches/patch-ac
$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=""
File Added: pkgsrc/multimedia/goggles/patches/patch-ad
$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}"
File Added: pkgsrc/multimedia/goggles/patches/patch-ae
$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}"
File Added: pkgsrc/multimedia/goggles/patches/patch-af
$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=""