4 files changed, 51 insertions, 35 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index c0d8411072d4..5d15827cc494 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dvdstyler
-PORTVERSION=	2.4.3
-PORTREVISION=	3
+PORTVERSION=	2.6.1
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
@@ -15,7 +14,7 @@ COMMENT=	WxWidgets frontend to dvd recoding and authoring programs
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		wxsvg>=1.1.14:${PORTSDIR}/graphics/wxsvg \
+		wxsvg>=1.2:${PORTSDIR}/graphics/wxsvg \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		mplex:${PORTSDIR}/multimedia/mjpegtools \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
@@ -24,32 +23,31 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		wxsvg>=1.1.14:${PORTSDIR}/graphics/wxsvg \
+		wxsvg>=1.2:${PORTSDIR}/graphics/wxsvg \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		mplex:${PORTSDIR}/multimedia/mjpegtools \
 		mkisofs:${PORTSDIR}/sysutils/cdrtools \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 
-OPTIONS_DEFINE=	GNOME DOCS
-
 USE_BZIP2=	yes
-USES=		desktop-file-utils gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig
 USE_WX=		2.8
 WX_COMPS=	wx svg
 WX_CONF_ARGS=	absolute
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	aclocal automake autoconf
+ACLOCAL_ARGS=	-I ${WRKSRC}
+AUTOMAKE_ARGS=	--add-missing --copy --force-missing --foreign
+CONFIGURE_ENV=	ac_cv_path_AVCONV_PATH=no
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS GNOME
 
-.if ${PORT_OPTIONS:MGNOME}
-USE_GNOME+=	libgnomeui
-GNOMEUI_PC=	libgnomeui-2.0
-.else
-GNOMEUI_PC=	_libgnomeui-2.0_
-.endif
+GNOME_USE=		GNOME=libgnomeui
+GNOME_CONFIGURE_WITH=	gnome
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
@@ -66,28 +64,16 @@ pre-everything::
 .endif
 
 post-extract:
-.for i in configure install-sh
-	@${CHMOD} ${BINMODE} ${WRKSRC}/${i}
-.endfor
+	@${ECHO_CMD} -n > ${WRKSRC}/NEWS
 
 post-patch:
-	@${REINPLACE_CMD} -e '/GNOMEUI2/s|"libgnomeui-2.0"|"${GNOMEUI_PC}"|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^install-data-am:/s|install-docDATA||g' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/doc_DATA/s|COPYING||' \
+		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|=\(dvdstyler.png\)|=${PREFIX}/share/pixmaps/\1|' \
+		${WRKSRC}/data/dvdstyler.desktop
 	@${REINPLACE_CMD} -e 's|"sg\*"|"cd*"|g' \
 		${WRKSRC}/src/BurnDlg.cpp
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \
 		${WRKSRC}/src/Config.h
-	@${REINPLACE_CMD} -e 's|CodecID|AVCodecID|g' \
-		${WRKSRC}/src/mediaenc_ffmpeg.cpp
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in AUTHORS ChangeLog INSTALL README
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
-.endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
index cacb859f836d..172975545a28 100644
--- a/multimedia/dvdstyler/distinfo
+++ b/multimedia/dvdstyler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (DVDStyler-2.4.3.tar.bz2) = 886d84204d1009f88ee7e1c24916cb829365858b65de95cd1612a028a0e17067
-SIZE (DVDStyler-2.4.3.tar.bz2) = 5424774
+SHA256 (DVDStyler-2.6.1.tar.bz2) = 96f572249caf224bd01b7def7462f83de5e9fe294d721b83a94c3ff5daaeee55
+SIZE (DVDStyler-2.6.1.tar.bz2) = 5810208
diff --git a/multimedia/dvdstyler/files/patch-configure.in b/multimedia/dvdstyler/files/patch-configure.in
new file mode 100644
index 000000000000..31391f255881
--- /dev/null
+++ b/multimedia/dvdstyler/files/patch-configure.in
@@ -0,0 +1,20 @@
+--- configure.in.orig
++++ configure.in
+@@ -9,6 +9,7 @@
+ dnl options
+ AM_OPTIONS_WXCONFIG
+ AC_ARG_ENABLE(debug, [  --enable-debug          Enable debugging information], USE_DEBUG="$enableval", USE_DEBUG="no")
++AC_ARG_WITH(gnome, [ --with-gnome        Use libgnomeui for rendering of thumbnails], with_gnome="$withval", with_gnome="no")
+ 
+ AC_MSG_CHECKING(for install location)
+ case "$prefix" in
+@@ -111,7 +112,9 @@
+ fi
+ 
+ dnl check gnomeui-2.0
++if test x"$with_gnome" != x"no"; then
+ CHECK_WX_BUILT_WITH_GTK2()
++fi
+ if test x"$GTK_USEDVERSION" = x"2" ; then
+   PKG_CHECK_MODULES(GNOMEUI2, libgnomeui-2.0, GNOME2="-DGNOME2",
+     AC_MSG_WARN([libgnomeui will not be used for rendering of thumbnails]))
diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist
index 3ba854591a2f..a2899a09971e 100644
--- a/multimedia/dvdstyler/pkg-plist
+++ b/multimedia/dvdstyler/pkg-plist
@@ -1,4 +1,5 @@
 bin/dvdstyler
+man/man1/dvdstyler.1.gz
 share/applications/dvdstyler.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -97,6 +98,7 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/docs/help_en.zip
 %%DATADIR%%/docs/help_fi.zip
 %%DATADIR%%/docs/help_fr.zip
+%%DATADIR%%/docs/help_hu.zip
 %%DATADIR%%/docs/help_it.zip
 %%DATADIR%%/docs/help_ja.zip
 %%DATADIR%%/docs/help_nb.zip
@@ -126,6 +128,9 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/rc/dvdstyler.png
 %%DATADIR%%/rc/files.png
 %%DATADIR%%/rc/help.png
+%%DATADIR%%/rc/justifyCenter.png
+%%DATADIR%%/rc/justifyLeft.png
+%%DATADIR%%/rc/justifyRight.png
 %%DATADIR%%/rc/logo.png
 %%DATADIR%%/rc/logoSmall.png
 %%DATADIR%%/rc/minus.png
@@ -158,7 +163,11 @@ share/applications/dvdstyler.desktop
 %%DATADIR%%/templates/Travel/travel.png
 %%DATADIR%%/templates/Travel/travelWS.dvdt
 %%DATADIR%%/templates/Travel/travelWS.png
-man/man1/dvdstyler.1.gz
+%%DATADIR%%/transitions/fade.xml
+%%DATADIR%%/transitions/wipeBottomToTop.xml
+%%DATADIR%%/transitions/wipeLeftToRight.xml
+%%DATADIR%%/transitions/wipeRightToLeft.xml
+%%DATADIR%%/transitions/wipeTopToBottom.xml
 share/locale/ar/LC_MESSAGES/dvdstyler.mo
 share/locale/ca/LC_MESSAGES/dvdstyler.mo
 share/locale/cs/LC_MESSAGES/dvdstyler.mo
@@ -198,6 +207,7 @@ share/pixmaps/dvdstyler.png
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/es_ar/LC_MESSAGES
 @dirrmtry share/locale/es_ar
+@dirrm %%DATADIR%%/transitions
 @dirrm %%DATADIR%%/templates/Travel
 @dirrm %%DATADIR%%/templates/Basic
 @dirrm %%DATADIR%%/templates