* Add missing files.

* Add missing netpbm dependency.
* Add new autoconf flags:

	--enable-kde (to install kde data files)
	--enable-gnome (to install gnome data files)
	--enable-libgnomeui (to use it for rendering of thumbnails)

  These flags are disabled to make this package smaller than in the
  normal distribution (which installs kde/gnome data files and uses
  libgnomeui if present). I've sent the patch to the developers.

Bump PKGREVISION.

5 files changed, 91 insertions, 5 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index b64e74e682d..877045ea7d2 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/01/25 08:10:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/31 02:57:18 xtraeme Exp $
 #
 
 DISTNAME=	DVDStyler-1.5b4
 PKGNAME=	dvdstyler-1.5beta4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 
@@ -15,10 +15,19 @@ DEPENDS+=	dvdauthor>=0.6.10:../../multimedia/dvdauthor
 DEPENDS+=	dvd+rw-tools-[0-9]*:../../sysutils/dvd+rw-tools
 DEPENDS+=	mpgtx-[0-9]*:../../graphics/mpgtx
 
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		autoconf gmake pkg-config
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ARGS+=	--disable-kde
+CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=	--disable-libgnomeui
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
+.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/wxsvg/buildlink3.mk"
 .include "../../multimedia/mjpegtools/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
diff --git a/multimedia/dvdstyler/PLIST b/multimedia/dvdstyler/PLIST
index 48ac8fa7013..2a1666c45ff 100644
--- a/multimedia/dvdstyler/PLIST
+++ b/multimedia/dvdstyler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/24 03:47:44 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/31 02:57:18 xtraeme Exp $
 bin/dvdstyler
 share/doc/dvdstyler/AUTHORS
 share/doc/dvdstyler/COPYING
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index d8d778c4da4..2e3ff622a71 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/01/24 03:47:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2006/01/31 02:57:18 xtraeme Exp $
 
 SHA1 (DVDStyler-1.5b4.tar.gz) = 31d41e71c81bf30f95cb311d59f0acfdf6ed28cc
 RMD160 (DVDStyler-1.5b4.tar.gz) = a5b885dd918b47a6b3a658bfd6b802926a2ed057
 Size (DVDStyler-1.5b4.tar.gz) = 658377 bytes
+SHA1 (patch-aa) = 7158a3d97445b837dcd0b807abe9f47a73d6c56e
+SHA1 (patch-ab) = 2ef45a125f8e816aeec322805b425b2a122bd37c
diff --git a/multimedia/dvdstyler/patches/patch-aa b/multimedia/dvdstyler/patches/patch-aa
new file mode 100644
index 00000000000..eb68282af01
--- /dev/null
+++ b/multimedia/dvdstyler/patches/patch-aa
@@ -0,0 +1,62 @@
+$NetBSD: patch-aa,v 1.1 2006/01/31 02:57:18 xtraeme Exp $
+
+--- configure.in.orig	2005-10-19 11:02:58.000000000 +0200
++++ configure.in	2006-01-31 03:42:46.000000000 +0100
+@@ -57,24 +57,52 @@
+     AM_CONDITIONAL(USE_KDE, test 0 = 1)
+     AM_CONDITIONAL(USE_GNOME, test 0 = 1)
+ else
++	AC_ARG_ENABLE([kde],
++		AS_HELP_STRING([--enable-kde],
++			       [enable kde support (default: yes)]),
++		ac_cv_enable_kde="$enableval", ac_cv_enable_kde="yes")
++	if test x"$ac_cv_enable_kde" = x"yes" ; then
+     FIND_KDE
++	else
++		AC_MSG_WARN([*** kde support disabled ***])
++		USE_KDE_FALSE="yes"
++	fi
++	AC_ARG_ENABLE([gnome],
++		AS_HELP_STRING([--enable-gnome],
++			       [enable gnome support (default: yes)]),
++		ac_cv_enable_gnome="$enableval", ac_cv_enable_gnome="yes")
++	if test x"$ac_cv_enable_gnome" = x"yes" ; then
+     FIND_GNOME
++	else
++		AC_MSG_WARN([*** gnome support disabled ***])
++		USE_GNOME_FALSE="yes"
++	fi
+ fi
+ CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS $WX_CXXFLAGS "
+ LIBS="$LIBS $WX_LIBS "
++AC_SUBST([USE_KDE_FALSE])
++AC_SUBST([USE_GNOME_FALSE])
+ 
+ dnl check for wxSVG
+ AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])])
+ AC_CHECK_HEADER([wxSVG/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])])
+ 
+-dnl check gnomeui-2.0
+ CHECK_WX_BUILT_WITH_GTK2()
+-if test x"$GTK_USEDVERSION" = x"2" ; then
+-  PKG_CHECK_MODULES(GNOMEUI2, libgnomeui-2.0, GNOME2="-DGNOME2",
++
++dnl check for libgnomeui>=2.0
++AC_ARG_ENABLE([libgnomeui],
++	AS_HELP_STRING([--enable-libgnomeui],
++		       [enable libgnomeui to render thumbnails (default: yes)]),
++	ac_cv_enable_libgnomeui="$enableval", ac_cv_enable_libgnomeui="yes")
++
++if test x"$ac_cv_enable_libgnomeui" = x"yes" ; then
++	PKG_CHECK_MODULES(GNOMEUI2, lignomeui-2.0, GNOME2="-DGNOME2",
+     AC_MSG_WARN([libgnomeui will not be used for rendering of thumbnails]))
++	CXXFLAGS="$CXXFLAGS $GNOME2"
++	LIBS="$LIBS $GNOMEUI2_LIBS "
++else
++	AC_MSG_WARN([libgnomeui dependency disabled])
+ fi
+-CXXFLAGS="$CXXFLAGS $GNOME2"
+-LIBS="$LIBS $GNOMEUI2_LIBS "
+ 
+ CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir/$PACKAGE\\\""
+ 
diff --git a/multimedia/dvdstyler/patches/patch-ab b/multimedia/dvdstyler/patches/patch-ab
new file mode 100644
index 00000000000..19ca93637db
--- /dev/null
+++ b/multimedia/dvdstyler/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/01/31 02:57:18 xtraeme Exp $
+
+--- Makefile.in.orig	2006-01-31 03:38:30.000000000 +0100
++++ Makefile.in	2006-01-31 03:38:43.000000000 +0100
+@@ -146,7 +146,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = wxVillaLib src locale backgrounds buttons objects data install.win32
++SUBDIRS = wxVillaLib src locale backgrounds buttons objects data
+ 
+ ACLOCAL_AMFLAGS = -I.
+ pkgdata_DATA = AUTHORS COPYING INSTALL README ChangeLog