update to 1.7.3

This is a major update, many feature additions and fixes, see the
bundled README file for details.

7 files changed, 59 insertions, 237 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 1a679d2f14b..13c2b7026e3 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2009/08/10 16:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2009/08/17 17:32:09 drochner Exp $
 #
 
-DISTNAME=	DVDStyler-1.5.1
-PKGREVISION=	1
+DISTNAME=	DVDStyler-1.7.3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dvdstyler.de/
@@ -21,12 +21,11 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config msgfmt
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--disable-kde
-CONFIGURE_ARGS+=	--disable-gnome
-CONFIGURE_ARGS+=	--disable-libgnomeui
-
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/wxsvg/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/mjpegtools/buildlink3.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdstyler/PLIST b/multimedia/dvdstyler/PLIST
index 5997fe20aee..98e21012243 100644
--- a/multimedia/dvdstyler/PLIST
+++ b/multimedia/dvdstyler/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:08:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/08/17 17:32:09 drochner Exp $
 bin/dvdstyler
+man/man1/dvdstyler.1
+share/applications/dvdstyler.desktop
 share/doc/dvdstyler/AUTHORS
 share/doc/dvdstyler/COPYING
 share/doc/dvdstyler/ChangeLog
 share/doc/dvdstyler/INSTALL
 share/doc/dvdstyler/README
-share/dvdstyler/backgrounds/01_autobahn.jpg
 share/dvdstyler/backgrounds/02_bi_domrep.jpg
 share/dvdstyler/backgrounds/03_creta.jpg
 share/dvdstyler/backgrounds/04_kiel_kanal.jpg
+share/dvdstyler/backgrounds/05_easyblue.jpg
 share/dvdstyler/backgrounds/10_turbulence_blue.jpg
 share/dvdstyler/backgrounds/11_turbulence_green.jpg
 share/dvdstyler/backgrounds/15_bordes_blue.jpg
@@ -19,64 +21,74 @@ share/dvdstyler/backgrounds/22_gold.jpg
 share/dvdstyler/backgrounds/23_lava.jpg
 share/dvdstyler/backgrounds/30_brushed_aluminiun.jpg
 share/dvdstyler/backgrounds/31_texture_border.jpg
-share/dvdstyler/buttons/arrow-down.xml
-share/dvdstyler/buttons/arrow-left.xml
-share/dvdstyler/buttons/arrow-next.xml
-share/dvdstyler/buttons/arrow-right.xml
-share/dvdstyler/buttons/arrow-up.xml
+share/dvdstyler/backgrounds/32_blue_fractal.jpg
+share/dvdstyler/backgrounds/40_swans.jpg
+share/dvdstyler/backgrounds/45_nevado.jpg
+share/dvdstyler/backgrounds/46_paisaje.jpg
+share/dvdstyler/buttons/arrow-star.xml
 share/dvdstyler/buttons/arrow.xml
-share/dvdstyler/buttons/arrow2-down.xml
-share/dvdstyler/buttons/arrow2-left.xml
-share/dvdstyler/buttons/arrow2-right.xml
-share/dvdstyler/buttons/arrow2-up.xml
+share/dvdstyler/buttons/arrow2.xml
+share/dvdstyler/buttons/arrow3.xml
 share/dvdstyler/buttons/buttons.lst
 share/dvdstyler/buttons/cancel.xml
+share/dvdstyler/buttons/deprecated/arrow-down.xml
+share/dvdstyler/buttons/deprecated/arrow-left.xml
+share/dvdstyler/buttons/deprecated/arrow-next.xml
+share/dvdstyler/buttons/deprecated/arrow-right.xml
+share/dvdstyler/buttons/deprecated/arrow-up.xml
+share/dvdstyler/buttons/deprecated/arrow2-down.xml
+share/dvdstyler/buttons/deprecated/arrow2-left.xml
+share/dvdstyler/buttons/deprecated/arrow2-right.xml
+share/dvdstyler/buttons/deprecated/arrow2-up.xml
+share/dvdstyler/buttons/deprecated/text-shadow.xml
+share/dvdstyler/buttons/deprecated/text.xml
 share/dvdstyler/buttons/ellipse.xml
 share/dvdstyler/buttons/frame.xml
 share/dvdstyler/buttons/ok.xml
 share/dvdstyler/buttons/pill.xml
 share/dvdstyler/buttons/text-shadow.xml
-share/dvdstyler/buttons/text.xml
+share/dvdstyler/buttons/text-v2.xml
 share/dvdstyler/data/empty_ntsc_ac3.mpg
 share/dvdstyler/data/empty_ntsc_mp2.mpg
 share/dvdstyler/data/empty_pal_ac3.mpg
 share/dvdstyler/data/empty_pal_mp2.mpg
-share/dvdstyler/data/silence.ac3
-share/dvdstyler/data/silence.mp2
+share/dvdstyler/data/subtitles.rgb
+share/dvdstyler/docs/help.zip
 share/dvdstyler/objects/ellipse.xml
 share/dvdstyler/objects/frame.xml
 share/dvdstyler/objects/image.xml
 share/dvdstyler/objects/rectangle.xml
 share/dvdstyler/objects/text-shadow.xml
 share/dvdstyler/objects/text.xml
+share/dvdstyler/rc/add.png
 share/dvdstyler/rc/dvdstyler.png
 share/dvdstyler/rc/files.png
-share/dvdstyler/rc/folder1.png
-share/dvdstyler/rc/folder2.png
 share/dvdstyler/rc/logo.png
 share/dvdstyler/rc/minus.png
 share/dvdstyler/rc/move.cur
 share/dvdstyler/rc/nesw.cur
 share/dvdstyler/rc/new.png
+share/dvdstyler/rc/noaudio.png
 share/dvdstyler/rc/nwse.cur
 share/dvdstyler/rc/open.png
 share/dvdstyler/rc/plus.png
 share/dvdstyler/rc/run.png
 share/dvdstyler/rc/save.png
-share/locale/ca/LC_MESSAGES/dvdstyler.mo
 share/locale/cs/LC_MESSAGES/dvdstyler.mo
+share/locale/da/LC_MESSAGES/dvdstyler.mo
 share/locale/de/LC_MESSAGES/dvdstyler.mo
+share/locale/el/LC_MESSAGES/dvdstyler.mo
 share/locale/es/LC_MESSAGES/dvdstyler.mo
-share/locale/eu/LC_MESSAGES/dvdstyler.mo
 share/locale/fr/LC_MESSAGES/dvdstyler.mo
-share/locale/hu/LC_MESSAGES/dvdstyler.mo
 share/locale/it/LC_MESSAGES/dvdstyler.mo
-share/locale/ja/LC_MESSAGES/dvdstyler.mo
-share/locale/nl/LC_MESSAGES/dvdstyler.mo
+share/locale/ko/LC_MESSAGES/dvdstyler.mo
+share/locale/mk/LC_MESSAGES/dvdstyler.mo
 share/locale/pl/LC_MESSAGES/dvdstyler.mo
 share/locale/pt/LC_MESSAGES/dvdstyler.mo
 share/locale/pt_BR/LC_MESSAGES/dvdstyler.mo
 share/locale/ru/LC_MESSAGES/dvdstyler.mo
-share/locale/sk/LC_MESSAGES/dvdstyler.mo
+share/locale/sl/LC_MESSAGES/dvdstyler.mo
 share/locale/sr/LC_MESSAGES/dvdstyler.mo
-share/locale/sv/LC_MESSAGES/dvdstyler.mo
+share/locale/vi/LC_MESSAGES/dvdstyler.mo
+share/locale/zh_TW/LC_MESSAGES/dvdstyler.mo
+share/pixmaps/dvdstyler.png
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index 6356c27e0c7..f0e1175f883 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/10/25 00:02:02 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/08/17 17:32:09 drochner Exp $
 
-SHA1 (DVDStyler-1.5.1.tar.gz) = c466dca9a5ff318dd43eb73d1acd0a360a68efd4
-RMD160 (DVDStyler-1.5.1.tar.gz) = 9fe9821f4fdd44464148397968d042c2d54cb1e0
-Size (DVDStyler-1.5.1.tar.gz) = 824171 bytes
-SHA1 (patch-aa) = 39bb3d66c036d19bf9c544ea92910c781750aacc
-SHA1 (patch-ab) = bb6dc7ba07ff838c57760a3c5a80dc155f2d00b3
-SHA1 (patch-ac) = 389301ea4479249824f5cb24d73c88241cbe66c1
+SHA1 (DVDStyler-1.7.3.tar.bz2) = c91ef7f029676be0c70b67323a3e49c68d0eca5a
+RMD160 (DVDStyler-1.7.3.tar.bz2) = 1f11283cf771d855b09f56a046892fb2d54cae7d
+Size (DVDStyler-1.7.3.tar.bz2) = 1632182 bytes
+SHA1 (patch-ad) = cd1c7982ad1f8a341f340b3566d9458b21d16e8c
diff --git a/multimedia/dvdstyler/patches/patch-aa b/multimedia/dvdstyler/patches/patch-aa
deleted file mode 100644
index 2e7b03e7fe6..00000000000
--- a/multimedia/dvdstyler/patches/patch-aa
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/10/25 00:02:02 wiz Exp $
-
---- configure.in.orig	2007-02-22 18:34:46.000000000 +0000
-+++ configure.in
-@@ -57,24 +57,52 @@ if $WX_CONFIG_NAME --cxxflags | grep -q 
-     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, libgnomeui-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\\\""
- 
-@@ -148,5 +176,4 @@ AC_OUTPUT([
-   buttons/Makefile
-   objects/Makefile
-   data/Makefile
--  install.win32/Makefile
- ])
diff --git a/multimedia/dvdstyler/patches/patch-ab b/multimedia/dvdstyler/patches/patch-ab
deleted file mode 100644
index b26d4e96d2e..00000000000
--- a/multimedia/dvdstyler/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/10/25 00:02:02 wiz Exp $
-
---- Makefile.in.orig	2006-10-29 15:53:56.000000000 +0000
-+++ Makefile.in
-@@ -151,7 +151,7 @@ sharedstatedir = @sharedstatedir@
- 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
diff --git a/multimedia/dvdstyler/patches/patch-ac b/multimedia/dvdstyler/patches/patch-ac
deleted file mode 100644
index f1645f27767..00000000000
--- a/multimedia/dvdstyler/patches/patch-ac
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/10/25 00:02:02 wiz Exp $
-
---- configure.orig	2007-03-19 17:18:01.000000000 +0000
-+++ configure
-@@ -1325,6 +1325,10 @@ Optional Features:
-   --enable-debug          Enable debugging information
-   --disable-dependency-tracking Speeds up one-time builds
-   --enable-dependency-tracking  Do not reject slow dependency extractors
-+  --enable-kde            enable kde support (default: yes)
-+  --enable-gnome          enable gnome support (default: yes)
-+  --enable-libgnomeui     enable libgnomeui to render thumbnails (default:
-+                          yes)
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -4505,6 +4509,14 @@ else
- fi
- 
- else
-+	# Check whether --enable-kde was given.
-+if test "${enable_kde+set}" = set; then
-+  enableval=$enable_kde; ac_cv_enable_kde="$enableval"
-+else
-+  ac_cv_enable_kde="yes"
-+fi
-+
-+	if test x"$ac_cv_enable_kde" = x"yes" ; then
- 
-   # Extract the first word of "kde-config", so it can be a program name with args.
- set dummy kde-config; ac_word=$2
-@@ -4574,6 +4586,19 @@ else
- fi
- 
- 
-+	else
-+		{ echo "$as_me:$LINENO: WARNING: *** kde support disabled ***" >&5
-+echo "$as_me: WARNING: *** kde support disabled ***" >&2;}
-+		USE_KDE_FALSE="yes"
-+	fi
-+	# Check whether --enable-gnome was given.
-+if test "${enable_gnome+set}" = set; then
-+  enableval=$enable_gnome; ac_cv_enable_gnome="$enableval"
-+else
-+  ac_cv_enable_gnome="yes"
-+fi
-+
-+	if test x"$ac_cv_enable_gnome" = x"yes" ; then
- 
-   { echo "$as_me:$LINENO: checking for GNOME data directory" >&5
- echo $ECHO_N "checking for GNOME data directory... $ECHO_C" >&6; }
-@@ -4597,11 +4622,18 @@ else
- fi
- 
- 
-+	else
-+		{ echo "$as_me:$LINENO: WARNING: *** gnome support disabled ***" >&5
-+echo "$as_me: WARNING: *** gnome support disabled ***" >&2;}
-+		USE_GNOME_FALSE="yes"
-+	fi
- fi
- CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS $WX_CXXFLAGS "
- LIBS="$LIBS $WX_LIBS "
- 
- 
-+
-+
- { echo "$as_me:$LINENO: checking for main in -lwxsvg" >&5
- echo $ECHO_N "checking for main in -lwxsvg... $ECHO_C" >&6; }
- if test "${ac_cv_lib_wxsvg_main+set}" = set; then
-@@ -5225,7 +5257,16 @@ echo "${ECHO_T}no" >&6; }
- 
- 
- 
--if test x"$GTK_USEDVERSION" = x"2" ; then
-+
-+# Check whether --enable-libgnomeui was given.
-+if test "${enable_libgnomeui+set}" = set; then
-+  enableval=$enable_libgnomeui; ac_cv_enable_libgnomeui="$enableval"
-+else
-+  ac_cv_enable_libgnomeui="yes"
-+fi
-+
-+
-+if test x"$ac_cv_enable_libgnomeui" = x"yes" ; then
- 
- 
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-@@ -5417,9 +5458,12 @@ else
- echo "${ECHO_T}yes" >&6; }
- 	GNOME2="-DGNOME2"
- fi
-+	CXXFLAGS="$CXXFLAGS $GNOME2"
-+	LIBS="$LIBS $GNOMEUI2_LIBS "
-+else
-+	{ echo "$as_me:$LINENO: WARNING: libgnomeui dependency disabled" >&5
-+echo "$as_me: WARNING: libgnomeui dependency disabled" >&2;}
- fi
--CXXFLAGS="$CXXFLAGS $GNOME2"
--LIBS="$LIBS $GNOMEUI2_LIBS "
- 
- CXXFLAGS="$CXXFLAGS -DDATADIR=\\\"$datadir/$PACKAGE\\\""
- 
-@@ -5787,7 +5831,7 @@ echo "$as_me: error:
-    { (exit 1); exit 1; }; }
- fi
- 
--ac_config_files="$ac_config_files Makefile src/Makefile src/rc/Makefile wxVillaLib/Makefile locale/Makefile backgrounds/Makefile buttons/Makefile objects/Makefile data/Makefile install.win32/Makefile"
-+ac_config_files="$ac_config_files Makefile src/Makefile src/rc/Makefile wxVillaLib/Makefile locale/Makefile backgrounds/Makefile buttons/Makefile objects/Makefile data/Makefile"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -6432,7 +6476,6 @@ do
-     "buttons/Makefile") CONFIG_FILES="$CONFIG_FILES buttons/Makefile" ;;
-     "objects/Makefile") CONFIG_FILES="$CONFIG_FILES objects/Makefile" ;;
-     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
--    "install.win32/Makefile") CONFIG_FILES="$CONFIG_FILES install.win32/Makefile" ;;
- 
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/multimedia/dvdstyler/patches/patch-ad b/multimedia/dvdstyler/patches/patch-ad
new file mode 100644
index 00000000000..e42b1a80ae2
--- /dev/null
+++ b/multimedia/dvdstyler/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/08/17 17:32:09 drochner Exp $
+
+--- docs/Makefile.in.orig	2009-08-10 20:50:48.000000000 +0200
++++ docs/Makefile.in
+@@ -51,7 +51,7 @@ docDATA_INSTALL = $(INSTALL_DATA)
+ pkgdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(doc_DATA) $(pkgdata_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-pkgdatadir = @datadir@/man/man1
++pkgdatadir = @mandir@/man1
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AUTOCONF = @AUTOCONF@