From 664df755ed308a925ae05477c227f094ee3ee14e Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 27 Jun 2006 22:11:43 +0000
Subject: Set USE_LIBTOOL=yes, since it does use libtool. Remove CPU specific
 optimizations that were set by configure script. Optimiziations should be set
 by the user, not by a specific package.

This also fixes the build with gcc4.
---
 multimedia/gopchop/Makefile         |  3 ++-
 multimedia/gopchop/distinfo         |  3 ++-
 multimedia/gopchop/patches/patch-ab | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 multimedia/gopchop/patches/patch-ab

(limited to 'multimedia/gopchop')

diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 99488e15797..d85c0422f3f 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/06/12 16:28:12 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/06/27 22:11:43 wiz Exp $
 #
 
 DISTNAME=		gopchop-1.1.7
@@ -13,6 +13,7 @@ COMMENT=		MPEG2 GOP-accurate editor
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config msgfmt
diff --git a/multimedia/gopchop/distinfo b/multimedia/gopchop/distinfo
index 0b41523557f..346af30be90 100644
--- a/multimedia/gopchop/distinfo
+++ b/multimedia/gopchop/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/06/06 15:12:07 wiz Exp $
+$NetBSD: distinfo,v 1.5 2006/06/27 22:11:43 wiz Exp $
 
 SHA1 (gopchop-1.1.7.tar.gz) = d7e110d0e12aeb6ae6b6b90c9a3cf1f9222f30e4
 RMD160 (gopchop-1.1.7.tar.gz) = 31e9cf6934099dcda3025ec62e6d84714171809d
 Size (gopchop-1.1.7.tar.gz) = 556083 bytes
 SHA1 (patch-aa) = 560d87bf80a877b39acee9430b10d14e5363c82a
+SHA1 (patch-ab) = d4ea7c7828f3403f29ff493f707767f245204e71
diff --git a/multimedia/gopchop/patches/patch-ab b/multimedia/gopchop/patches/patch-ab
new file mode 100644
index 00000000000..081e0ad4df5
--- /dev/null
+++ b/multimedia/gopchop/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.3 2006/06/27 22:11:43 wiz Exp $
+
+--- configure.orig	2006-06-27 21:59:36.000000000 +0000
++++ configure
+@@ -24815,13 +24815,6 @@ cat >>confdefs.h <<\_ACEOF
+ #define ARCH_X86
+ _ACEOF
+ 
+-        case "$host" in
+-        i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
+-        i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
+-        i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
+-        i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
+-        k6-*)   OPT_CFLAGS="$CFLAGS -mcpu=k6";;
+-        esac
+         echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+ echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+     SAVE_CFLAGS="$CFLAGS"
-- 
cgit v1.2.3