Fix obvious automake-1.13 issues.

This still doesn't build for me, in xvidcore if I read correctly,
but I don't understand why not.

4 files changed, 67 insertions, 3 deletions

diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 485c5e5bc1f..7eedef94426 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/12/21 05:33:47 dholland Exp $
+# $NetBSD: Makefile,v 1.25 2013/01/26 23:26:19 wiz Exp $
 #
 
 DISTNAME=	HandBrake-0.9.3
@@ -52,6 +52,7 @@ USE_LANGUAGES=	c c++
 BUILD_DEPENDS+=	jam>=2.5.2:../../devel/jam
 BUILD_DEPENDS+=	nasm>=2.05.01:../../devel/nasm
 BUILD_DEPENDS+=	yasm>=0.6.1:../../devel/yasm
+BUILD_DEPENDS+=	gettext-m4-[0-9]*:../../devel/gettext-m4
 
 CLI_CONFIGURE_ARGS=	--release
 
@@ -74,7 +75,7 @@ post-extract:
 .endfor
 
 pre-configure:
-	cd ${WRKSRC}/gtk && ./autogen.sh
+	cd ${WRKSRC}/gtk && autoreconf -fi
 
 do-configure:
 	cd ${WRKSRC} && ./configure ${CLI_CONFIGURE_ARGS}
diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo
index aad3942c61a..37baece34b2 100644
--- a/multimedia/handbrake/distinfo
+++ b/multimedia/handbrake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/05/03 14:25:43 abs Exp $
+$NetBSD: distinfo,v 1.4 2013/01/26 23:26:19 wiz Exp $
 
 SHA1 (handbrake/HandBrake-0.9.3.tar.gz) = f52389b1226bf81ba58bca67f3a1aa468cfee624
 RMD160 (handbrake/HandBrake-0.9.3.tar.gz) = 50085816875439ee82bc213252f683352bbdbbb0
@@ -73,3 +73,5 @@ SHA1 (patch-ag) = b5a6882280b9f907334618be5ab617d5596fe360
 SHA1 (patch-ah) = c6c050245b990429751c6fe243fb488028253af4
 SHA1 (patch-ai) = d1a77b07ca338f522f7eaec3c2a4a71dacd61268
 SHA1 (patch-aj) = 3855b048017581adac91c8a4d146d41a27840486
+SHA1 (patch-gtk_Makefile.am) = 2cdf94f006fe1fc57b1ebcb4371454ac55cf7da9
+SHA1 (patch-gtk_configure.ac) = d707c95b24dc670ad6788b441caaedc8132b6d92
diff --git a/multimedia/handbrake/patches/patch-gtk_Makefile.am b/multimedia/handbrake/patches/patch-gtk_Makefile.am
new file mode 100644
index 00000000000..78eee3d334e
--- /dev/null
+++ b/multimedia/handbrake/patches/patch-gtk_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtk_Makefile.am,v 1.1 2013/01/26 23:26:19 wiz Exp $
+
+Disable empty po directory.
+
+--- gtk/Makefile.am.orig	2008-06-17 22:32:05.000000000 +0000
++++ gtk/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ## Created by Anjuta
+ 
+-SUBDIRS = src po
++SUBDIRS = src
+ 
+ ghbdocdir = ${prefix}/share/doc/ghb
+ ghbdoc_DATA = \
diff --git a/multimedia/handbrake/patches/patch-gtk_configure.ac b/multimedia/handbrake/patches/patch-gtk_configure.ac
new file mode 100644
index 00000000000..b510166fd55
--- /dev/null
+++ b/multimedia/handbrake/patches/patch-gtk_configure.ac
@@ -0,0 +1,46 @@
+$NetBSD: patch-gtk_configure.ac,v 1.1 2013/01/26 23:26:19 wiz Exp $
+
+automake-1.13 compat.
+
+--- gtk/configure.ac.orig	2008-11-09 19:12:00.000000000 +0000
++++ gtk/configure.ac
+@@ -3,14 +3,13 @@ dnl Created by Anjuta application wizard
+ 
+ AC_INIT(ghb, 0.1)
+ 
+-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+-AM_CONFIG_HEADER(config.h)
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AC_PROG_CXX
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ # introduce the optional configure parameter for the path of libXXX.a
+@@ -51,16 +50,6 @@ AC_SUBST(GLOBALLDFLAGS, $LDFLAGS )
+ 
+ 
+ 
+-dnl ***************************************************************************
+-dnl Internatinalization
+-dnl ***************************************************************************
+-GETTEXT_PACKAGE=ghb
+-AC_SUBST(GETTEXT_PACKAGE)
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
+-AM_GLIB_GNU_GETTEXT
+-IT_PROG_INTLTOOL([0.35.0])
+-
+-
+ 
+ AM_PROG_LIBTOOL
+ 
+@@ -80,5 +69,4 @@ AC_SUBST(GHB_LIBS)
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+-po/Makefile.in
+ ])