5 files changed, 44 insertions, 63 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index a34e47e2ae08..d1a62d92000a 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dvdstyler
-DISTVERSION=	1.5b5
-PORTREVISION=	2
+PORTVERSION=	1.5
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,40 +17,39 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	WXGTK2 front end to dvd recoding and authoring programs
 
 BUILD_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		mpgcat:${PORTSDIR}/multimedia/mpgtx \
+		mplex:${PORTSDIR}/multimedia/mjpegtools \
+		jpegtopnm:${PORTSDIR}/graphics/netpbm \
+		mpgtx:${PORTSDIR}/multimedia/mpgtx \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
-LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm \
-		lavfile-1.8.0:${PORTSDIR}/multimedia/mjpegtools \
-		wxsvg.0:${PORTSDIR}/graphics/wxsvg
 RUN_DEPENDS=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		mpgcat:${PORTSDIR}/multimedia/mpgtx \
+		mplex:${PORTSDIR}/multimedia/mjpegtools \
+		jpegtopnm:${PORTSDIR}/graphics/netpbm \
+		mpgtx:${PORTSDIR}/multimedia/mpgtx \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
-#RUN_DEPENDS+=	xine:${PORTSDIR}/multimedia/xine
 
-DVDSTYLER_ICON=	${DATADIR}/rc/dvdstyler.png
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_WX=		2.6
+WX_COMPS=	wx svg
+WX_CONF_ARGS=	absolute
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget desktopfileutils
+WANT_GNOME=	yes
 USE_GETTEXT=	yes
-CONFIGURE_ARGS=	--with-wx-config=wxgtk2-2.6-config
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+USE_CDRTOOLS=	yes	# dvdstyler needs mkisofs
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	Does not build.
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	libgnomeui
 .endif
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
-.if ${OSVERSION} < 500000
-DEFAULT_DVD_DEVICE=/dev/cd0c
-.else
 DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
-.endif
 
 pre-everything::
 .if !defined(WITH_DVD_DEVICE)
@@ -60,28 +58,20 @@ pre-everything::
 	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
 .endif
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} "===>"
-	@${ECHO_MSG} "===> Define WITH_OPTIMIZED_CFLAGS to enable optimized cflags"
-.endif
 
 post-patch:
-	@${SED} -e 's|%%COMMENT%%|${COMMENT}|; \
-		s|%%DVDSTYLER_ICON%%|${DVDSTYLER_ICON}|' \
-		< ${FILESDIR}/dvdstyler.desktop.in > ${WRKDIR}/dvdstyler.desktop
-	@${REINPLACE_CMD} -e 's|$$prefix/dvdstyler|${DATADIR}|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|@datadir@/docs/@PACKAGE@|${DOCSDIR}|' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \
-		${WRKSRC}/src/Config.h
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} -e 's|-O3||' \
-		${WRKSRC}/configure
-.endif
+		${WRKSRC}/src/BurnDlg.cpp ${WRKSRC}/src/Config.h
+	@${REINPLACE_CMD} -e 's|gnome-config|disable-config|g ;  \
+		s|kde-config|disable-config|g' ${WRKSRC}/configure
 
 post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/dvdstyler.desktop ${PREFIX}/share/applications
+	@${MKDIR} ${PREFIX}/share/applications
+	@${INSTALL_DATA} ${WRKSRC}/install.win32/dvdstyler.desktop \
+		${PREFIX}/share/applications/
+	@${MKDIR} ${PREFIX}/share/pixmaps
+	@${INSTALL_DATA} ${WRKSRC}/src/rc/dvdstyler.png \
+		${PREFIX}/share/pixmaps/
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index 7a90314b76ad..ca47f2501530 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,3 +1,3 @@
-MD5 (DVDStyler-1.5b5.tar.gz) = c60eb6ae9aefcbc4951be2dedf3daed5
-SHA256 (DVDStyler-1.5b5.tar.gz) = f0b09d236ec6c1209f475534728953fa62555d1d739d9af43b70d08c905bcd48
-SIZE (DVDStyler-1.5b5.tar.gz) = 769257
+MD5 (DVDStyler-1.5.tar.gz) = 3ad1203b403acb40af7c63968f4d4278
+SHA256 (DVDStyler-1.5.tar.gz) = 76271ed542951a06c69e10ca7d9567608949f8d166fe5c82a59d59dbf4d741f3
+SIZE (DVDStyler-1.5.tar.gz) = 813069
diff --git a/multimedia/dvdstyler/files/dvdstyler.desktop.in b/multimedia/dvdstyler/files/dvdstyler.desktop.in
deleted file mode 100644
index 317d0a407b93..000000000000
--- a/multimedia/dvdstyler/files/dvdstyler.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-[Desktop Entry]
-Encoding=UTF-8
-Name=DVDStyler
-Comment=%%COMMENT%%
-Icon=%%DVDSTYLER_ICON%%
-Exec=dvdstyler
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
diff --git a/multimedia/dvdstyler/files/patch-data_Makefile.in b/multimedia/dvdstyler/files/patch-data_Makefile.in
deleted file mode 100644
index b4cfda42a353..000000000000
--- a/multimedia/dvdstyler/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig	Mon Jul 17 10:32:01 2006
-+++ data/Makefile.in	Mon Jul 17 10:35:23 2006
-@@ -145,7 +145,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--pkgdata_DATA = silence.mp2
-+pkgdata_DATA = silence.mp2 empty.mpg
- subdir = data
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist
index e25c7918f841..419033b42b18 100644
--- a/multimedia/dvdstyler/pkg-plist
+++ b/multimedia/dvdstyler/pkg-plist
@@ -34,14 +34,20 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/buttons/ellipse.xml
 %%DATADIR%%/buttons/frame.xml
 %%DATADIR%%/buttons/ok.xml
+%%DATADIR%%/buttons/pill.xml
 %%DATADIR%%/buttons/text-shadow.xml
 %%DATADIR%%/buttons/text.xml
+%%DATADIR%%/data/empty_ntsc_ac3.mpg
+%%DATADIR%%/data/empty_ntsc_mp2.mpg
+%%DATADIR%%/data/empty_pal_ac3.mpg
+%%DATADIR%%/data/empty_pal_mp2.mpg
+%%DATADIR%%/data/silence.ac3
 %%DATADIR%%/data/silence.mp2
-%%DATADIR%%/data/empty.mpg
 %%DATADIR%%/objects/ellipse.xml
 %%DATADIR%%/objects/frame.xml
 %%DATADIR%%/objects/image.xml
 %%DATADIR%%/objects/rectangle.xml
+%%DATADIR%%/objects/text-shadow.xml
 %%DATADIR%%/objects/text.xml
 %%DATADIR%%/rc/dvdstyler.png
 %%DATADIR%%/rc/files.png
@@ -58,6 +64,7 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/rc/run.png
 %%DATADIR%%/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
@@ -65,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/pixmaps/dvdstyler.png
 @dirrm %%DATADIR%%/rc
 @dirrm %%DATADIR%%/objects
 @dirrm %%DATADIR%%/data
@@ -78,3 +88,5 @@ share/locale/sr/LC_MESSAGES/dvdstyler.mo
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true