Update to 1.5.1:

Version 1.5.1 <2007.07.07>
--------------------------

  * added burning under Windows
  * added support of dvdisaster (thanks to Torsten Rupp)
  * added Czech translation (thanks to Vlastimil Skacel)
  * added Dutch translation (thanks to Patrick Vijgeboom)
  * added Swedish translation (thanks to Daniel Nylander)

Version 1.5 final <2007.05.16>
------------------------------

  * new stable release
  * fixed some bugs

Version 1.5 beta 7 <2006.11.10>
-------------------------------

  * added selection of video and audio format for DVD
  * fixed spumux error

Version 1.5 beta 6 <2006.10.12>
-------------------------------

  * new logo (thanks to Alejandro Slocker Escarpa)
  * added play all flag to button action
  * added displaying of safe tv area
  * added displaying of grid
  * now buttons are always over objects
  * fixed error when generating dvd with text based buttons
  * added new button based upon a picture by Benji Park (thanks to Fgoset)

Version 1.5 beta 5 <2006.03.15>
-------------------------------

  * added possibility to arrange menu objects/buttons
  * added possibility to specify volume name
  * added two new buttons
  * fixed some bugs

6 files changed, 70 insertions, 76 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 82c1eecf62d..dca7e57865c 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/10/15 06:07:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/10/25 00:02:02 wiz Exp $
 #
 
-DISTNAME=	DVDStyler-1.5b4
-PKGNAME=	dvdstyler-1.5beta4
-PKGREVISION=	7
+DISTNAME=	DVDStyler-1.5.1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 
diff --git a/multimedia/dvdstyler/PLIST b/multimedia/dvdstyler/PLIST
index 29a858a4c42..0bb7d56e5e9 100644
--- a/multimedia/dvdstyler/PLIST
+++ b/multimedia/dvdstyler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/10/25 00:02:02 wiz Exp $
 bin/dvdstyler
 share/doc/dvdstyler/AUTHORS
 share/doc/dvdstyler/COPYING
@@ -24,6 +24,7 @@ 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/buttons/arrow.xml
 share/dvdstyler/buttons/arrow2-down.xml
 share/dvdstyler/buttons/arrow2-left.xml
 share/dvdstyler/buttons/arrow2-right.xml
@@ -33,18 +34,26 @@ share/dvdstyler/buttons/cancel.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/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/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/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/logo_big.png
 share/dvdstyler/rc/minus.png
 share/dvdstyler/rc/move.cur
 share/dvdstyler/rc/nesw.cur
@@ -55,6 +64,7 @@ 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/de/LC_MESSAGES/dvdstyler.mo
 share/locale/es/LC_MESSAGES/dvdstyler.mo
 share/locale/eu/LC_MESSAGES/dvdstyler.mo
@@ -62,11 +72,14 @@ 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/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/sr/LC_MESSAGES/dvdstyler.mo
+share/locale/sv/LC_MESSAGES/dvdstyler.mo
 @dirrm share/dvdstyler/rc
 @dirrm share/dvdstyler/objects
 @dirrm share/dvdstyler/data
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index 5d54ccb4b94..6356c27e0c7 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/10/15 06:07:19 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/10/25 00:02:02 wiz 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) = 19c43c10825692be1545847a3d6018f010ce423f
-SHA1 (patch-ab) = 2ef45a125f8e816aeec322805b425b2a122bd37c
-SHA1 (patch-ac) = 0635447d049bcde67cd6320e2f48c142a08f80f7
+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
diff --git a/multimedia/dvdstyler/patches/patch-aa b/multimedia/dvdstyler/patches/patch-aa
index 33fcd3ff53e..2e7b03e7fe6 100644
--- a/multimedia/dvdstyler/patches/patch-aa
+++ b/multimedia/dvdstyler/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2007/10/15 06:07:19 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2007/10/25 00:02:02 wiz 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 @@
+--- 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
@@ -60,3 +60,9 @@ $NetBSD: patch-aa,v 1.2 2007/10/15 06:07:19 wiz Exp $
  
  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
index 19ca93637db..b26d4e96d2e 100644
--- a/multimedia/dvdstyler/patches/patch-ab
+++ b/multimedia/dvdstyler/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/01/31 02:57:18 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2007/10/25 00:02:02 wiz 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 @@
+--- 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@
  
diff --git a/multimedia/dvdstyler/patches/patch-ac b/multimedia/dvdstyler/patches/patch-ac
index 2a08d3c95e0..f1645f27767 100644
--- a/multimedia/dvdstyler/patches/patch-ac
+++ b/multimedia/dvdstyler/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2007/10/25 00:02:02 wiz Exp $
 
---- configure.orig	2005-10-19 09:02:58.000000000 +0000
+--- configure.orig	2007-03-19 17:18:01.000000000 +0000
 +++ configure
-@@ -873,6 +1325,10 @@ Optional Features:
+@@ -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
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -4047,11 +4524,19 @@ else
+@@ -4505,6 +4509,14 @@ else
  fi
  
  else
@@ -28,12 +28,7 @@ $NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $
  
    # Extract the first word of "kde-config", so it can be a program name with args.
  set dummy kde-config; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_KDE_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4115,16 +4601,29 @@ else
+@@ -4574,6 +4586,19 @@ else
  fi
  
  
@@ -51,19 +46,9 @@ $NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $
 +
 +	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
-   GNOME_DATA_DIR=`gnome-config --datadir 2>/dev/null`
-   if test x$GNOME_DATA_DIR = x ; then
-      echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-   else
-      echo "$as_me:$LINENO: result: $GNOME_DATA_DIR" >&5
- echo "${ECHO_T}$GNOME_DATA_DIR" >&6
-   fi
- 
- 
-@@ -4138,13 +4637,18 @@ else
+   { 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
  
  
@@ -77,25 +62,12 @@ $NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $
  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
++
++
+ { 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4611,28 +5259,37 @@ fi
- 
- 
- 
-   echo "$as_me:$LINENO: checking if wxWindows was linked with GTK2" >&5
- echo $ECHO_N "checking if wxWindows was linked with GTK2... $ECHO_C" >&6
-   if $WX_CONFIG_NAME --libs | grep 'gtk2' > /dev/null ; then
-      GTK_USEDVERSION=2
-      echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   else
-      echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-   fi
+@@ -5225,7 +5257,16 @@ echo "${ECHO_T}no" >&6; }
  
  
  
@@ -113,20 +85,8 @@ $NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $
  
  
  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- 	if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4777,13 +5449,16 @@ echo "$as_me: WARNING: libgnomeui will n
- else
- 	GNOMEUI2_CFLAGS=$pkg_cv_GNOMEUI2_CFLAGS
- 	GNOMEUI2_LIBS=$pkg_cv_GNOMEUI2_LIBS
-         echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+@@ -5417,9 +5458,12 @@ else
+ echo "${ECHO_T}yes" >&6; }
  	GNOME2="-DGNOME2"
  fi
 +	CXXFLAGS="$CXXFLAGS $GNOME2"
@@ -140,3 +100,20 @@ $NetBSD: patch-ac,v 1.1 2007/10/15 06:07:19 wiz Exp $
  
  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;}