- Update to 1.5b3

5 files changed, 23 insertions, 59 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 6b26119..bbe0dd6 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	dvdstyler
-PORTVERSION=	1.4
-PORTREVISION=	3
+DISTVERSION=	1.5b3
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dvdstyler
-DISTNAME=	DVDStyler-${PORTVERSION}
+DISTNAME=	DVDStyler-${DISTVERSION}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	WXGTK2 front end to dvd recoding and authoring programs
@@ -22,7 +21,7 @@ BUILD_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm \
 		lavfile-1.8.0:${PORTSDIR}/multimedia/mjpegtools \
-		wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+		wxsvg.0:${PORTSDIR}/graphics/wxsvg
 RUN_DEPENDS=	${BUILD_DEPENDS}
 #RUN_DEPENDS+=	xine:${PORTSDIR}/multimedia/xine
 
@@ -35,8 +34,6 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-wx-config=wxgtk2-2.6-config
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-PORTDOCS=	AUTHORS COPYING INSTALL ChangeLog README
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index af827d8..9ecc2ad 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,3 +1,3 @@
-MD5 (DVDStyler-1.4.tar.gz) = 2e8ee561c56cf968516bc3e7cf20e96f
-SHA256 (DVDStyler-1.4.tar.gz) = a1d53faeb582fd2b79ce2dc74aecc3ffa1aa25823cfd375bf43ea2c80765c67a
-SIZE (DVDStyler-1.4.tar.gz) = 716474
+MD5 (DVDStyler-1.5b3.tar.gz) = 5187935912dc90034e382d88f2d618ce
+SHA256 (DVDStyler-1.5b3.tar.gz) = 78282c80fb1500dd42aee435fbf6486a0a97495fcd2ebf29a703af2f5e5b38a9
+SIZE (DVDStyler-1.5b3.tar.gz) = 656644
diff --git a/multimedia/dvdstyler/files/patch-src::MainWin.cpp b/multimedia/dvdstyler/files/patch-src::MainWin.cpp
deleted file mode 100644
index 4b77f7b..0000000
--- a/multimedia/dvdstyler/files/patch-src::MainWin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/MainWin.cpp.orig	Tue Aug  3 16:02:33 2004
-+++ src/MainWin.cpp	Fri Aug  6 19:43:32 2004
-@@ -403,7 +403,7 @@
-   else
- 	d = m_menuBox->GetScaleValue()*100;
-   //st = wxString::Format(_T("%0.2f"), d); if (d == (int) d)
--  st = wxString::Format(_T("%d"), (int)round(d));
-+  st = wxString::Format(_T("%d"), rint(d));
-   m_scaleCB->SetValue(st + _T("%"));
- }
- 
diff --git a/multimedia/dvdstyler/files/patch-src::MenuBox.cpp b/multimedia/dvdstyler/files/patch-src::MenuBox.cpp
deleted file mode 100644
index e3965eb..0000000
--- a/multimedia/dvdstyler/files/patch-src::MenuBox.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/MenuBox.cpp.orig	Fri Nov 12 13:27:47 2004
-+++ src/MenuBox.cpp	Sat Nov 13 20:49:08 2004
-@@ -16,7 +16,7 @@
- #include <wxVillaLib/ImageProc.h>
- #include <wxVillaLib/utils.h>
- #include <wxXML/xml.h>
--#include "math.h"
-+#include <math.h>
- #include <wx/dnd.h>
- #include <wx/utils.h>
- #include <wx/mstream.h>
-@@ -404,11 +404,11 @@
- 
- bool MenuBox::MoveObject(int& x, int& y)
- {
--  x = (int) round(x/m_scale);
--  y = (int) round(y/m_scale);
-+  x = rint(x/m_scale);
-+  y = rint(y/m_scale);
-   bool res = MoveObjectInt(x,y);
--  x = (int) round(x*m_scale);
--  y = (int) round(y*m_scale);
-+  x = rint(x*m_scale);
-+  y = rint(y*m_scale);
-   return res;
- }
- 
-@@ -444,8 +444,8 @@
- 
- bool MenuBox::ResizeObject(int x, int y, TransformType transformType)
- {
--  x = (int) round(x/m_scale);
--  y = (int) round(y/m_scale);
-+  x = rint(x/m_scale);
-+  y = rint(y/m_scale);
-   return ResizeObjectInt(x, y, transformType);
- }
- 
diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist
index 85e436d..ddc5419 100644
--- a/multimedia/dvdstyler/pkg-plist
+++ b/multimedia/dvdstyler/pkg-plist
@@ -19,8 +19,22 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/backgrounds/23_lava.jpg
 %%DATADIR%%/backgrounds/30_brushed_aluminiun.jpg
 %%DATADIR%%/backgrounds/31_texture_border.jpg
-%%DATADIR%%/buttons/simple.xml
+%%DATADIR%%/buttons/arrow-down.xml
+%%DATADIR%%/buttons/arrow-left.xml
+%%DATADIR%%/buttons/arrow-next.xml
+%%DATADIR%%/buttons/arrow-right.xml
+%%DATADIR%%/buttons/arrow-up.xml
+%%DATADIR%%/buttons/buttons.lst
+%%DATADIR%%/buttons/cancel.xml
+%%DATADIR%%/buttons/ellipse.xml
+%%DATADIR%%/buttons/frame.xml
+%%DATADIR%%/buttons/ok.xml
+%%DATADIR%%/buttons/text.xml
 %%DATADIR%%/data/silence.mp2
+%%DATADIR%%/objects/frame.xml
+%%DATADIR%%/objects/image.xml
+%%DATADIR%%/objects/rectangle.xml
+%%DATADIR%%/objects/text.xml
 %%DATADIR%%/rc/dvdstyler.png
 %%DATADIR%%/rc/files.png
 %%DATADIR%%/rc/folder1.png
@@ -46,9 +60,11 @@ share/locale/it/LC_MESSAGES/dvdstyler.mo
 share/locale/ja/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/sr/LC_MESSAGES/dvdstyler.mo
 @dirrm %%DATADIR%%/rc
+@dirrm %%DATADIR%%/objects
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/buttons
 @dirrm %%DATADIR%%/backgrounds