No need a patch for configure, so no need to autoconf.

4 files changed, 5 insertions, 42 deletions

diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile
index bec42d1fbda..b87d6b43b2e 100644
--- a/multimedia/fuppes/Makefile
+++ b/multimedia/fuppes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:04 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/09/27 11:15:22 obache Exp $
 #
 
 DISTNAME=	fuppes-0.640
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
-USE_TOOLS+=	autoconf automake aclocal m4 autoreconf
 USE_LIBTOOL=	yes
 
 CONFIGURE_ARGS+=	--enable-faad
@@ -24,11 +23,6 @@ CONFIGURE_ARGS+=	--enable-lame
 
 .include "options.mk"
 
-pre-configure:
-	cd ${WRKSRC} && autoreconf -i
-
-BUILD_DEPENDS+=		gettext-m4>=0.14.6:../../devel/gettext-m4
-
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
diff --git a/multimedia/fuppes/distinfo b/multimedia/fuppes/distinfo
index 3181ed1c7e0..04f76697285 100644
--- a/multimedia/fuppes/distinfo
+++ b/multimedia/fuppes/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/11/28 19:31:29 kefren Exp $
+$NetBSD: distinfo,v 1.4 2010/09/27 11:15:23 obache Exp $
 
 SHA1 (fuppes-0.640.tar.gz) = 51d7a3491a36969d8cd3d373a20f237600ab60fd
 RMD160 (fuppes-0.640.tar.gz) = 65e76c607056c9e6c975c960cc2aeaec4d37446c
 Size (fuppes-0.640.tar.gz) = 641228 bytes
-SHA1 (patch-aa) = 0956c0f509d6590f9a2c9d2cf1e34600773531c3
 SHA1 (patch-ab) = 884a4130fc15f31a495db69100e1769e2c5c2787
 SHA1 (patch-ac) = 8359d390b4a3d9963240bb6bb3c467382cef6272
 SHA1 (patch-ad) = 8602a0684e2a764810fa667d11f4339adb1bef98
diff --git a/multimedia/fuppes/options.mk b/multimedia/fuppes/options.mk
index d356fabdaa2..108e3d94124 100644
--- a/multimedia/fuppes/options.mk
+++ b/multimedia/fuppes/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/11/28 19:31:29 kefren Exp $
+# $NetBSD: options.mk,v 1.2 2010/09/27 11:15:23 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fuppes
 PKG_SUPPORTED_OPTIONS=	mysql
@@ -9,7 +9,7 @@ PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
 
 .if !empty(PKG_OPTIONS:Mmysql)
 PLIST.mysql=		yes
-CONFIGURE_ARGS+=	--enable-mysql
-
 .include "../../mk/mysql.buildlink3.mk"
+.else
+CONFIGURE_ENV+=		ac_cv_path_MYSQL_CONFIG=no
 .endif
diff --git a/multimedia/fuppes/patches/patch-aa b/multimedia/fuppes/patches/patch-aa
deleted file mode 100644
index 2e548ce1412..00000000000
--- a/multimedia/fuppes/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/11/28 19:31:29 kefren Exp $
---- configure.ac.orig	2009-11-28 21:20:07.000000000 +0200
-+++ configure.ac	2009-11-28 21:20:10.000000000 +0200
-@@ -574,11 +574,15 @@
- MYSQL_CFLAGS=""
- MYSQL_LIBS=""
- have_mysql=no
--if test -z "$MYSQL_CONFIG"; then
-+AC_ARG_ENABLE([mysql], [AC_HELP_STRING([--enable-mysql],
-+    [enable MySQL support [default=no]])],
-+    [enable_mysql=$enableval], [enable_mysql='no'])
-+if test "x$enable_mysql" = "xyes" ; then
-+ if test -z "$MYSQL_CONFIG"; then
-   AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no, $prefix/bin/)
--fi
-+ fi
- 
--if test "$MYSQL_CONFIG" != "no" ; then   
-+ if test "$MYSQL_CONFIG" != "no" ; then   
-   AC_MSG_CHECKING(MYSQL_CFLAGS)
-   MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
-   AC_MSG_RESULT($MYSQL_CFLAGS)
-@@ -588,6 +592,7 @@
-   AC_MSG_RESULT($MYSQL_LIBS)
-   
-   have_mysql=yes
-+ fi
- fi
- AM_CONDITIONAL(MYSQL_DATABASE_PLUGIN, test "x$have_mysql" = "xyes")
- AC_SUBST(MYSQL_CFLAGS)