3 files changed, 90 insertions, 22 deletions

diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 5640cb5f9f05..eb3d0775466d 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	devede
-DISTVERSION=	3.01
-PORTREVISION=	4
+DISTVERSION=	3.12c
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.rastersoft.com/descargas/ \
 		http://www.bsd-geek.de/FreeBSD/distfiles/
@@ -17,7 +16,8 @@ COMMENT=	Create video DVDs, VCDs, sVCDs or CVDs from any number of video files
 
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
 		spumux:${PORTSDIR}/multimedia/dvdauthor \
-		vcdimager:${PORTSDIR}/multimedia/vcdimager
+		vcdimager:${PORTSDIR}/multimedia/vcdimager \
+		${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
@@ -26,6 +26,9 @@ NO_BUILD=	yes
 
 OPTIONS=	PSYCO "Use psyco to compile the python scripts" Off \
 
+# Strip last character not present in distribution.
+WRKSRC=		${WRKDIR}/${DISTNAME:C/b//}
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_NLS)
@@ -37,46 +40,62 @@ PLIST_SUB+=	NLS=""
 
 PORTDOCS=	docs/*
 
-DEVEDE_LIBS=	devede_convert.py devede_gtk_helper.py devede_other.py
+DEVEDE_LIBS=	devede_bincue.py devede_convert.py devede_delete.py \
+		devede_dialogs.py devede_disctype.py devede_dvd.py \
+		devede_dvdmenu.py devede_executor.py devede_fonts.py \
+		devede_help.py devede_loadsave.py devede_main.py \
+		devede_newfiles.py devede_other.py devede_subtitles.py \
+		devede_title_properties.py devede_video_convert.py \
+		devede_xml_menu.py
+DEVEDE_PIXMAPS=	background.png barras.png base_ntsc.mpg base_ntsc_wide.mpg \
+		base_pal.mpg base_pal_wide.mpg estira.png icon_cvd.png \
+		icon_divx.png icon_dvd.png icon_svcd.png icon_vcd.png \
+		silence.mp3
 
 .if defined(WITH_PSYCO)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 .endif
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	@${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${PREFIX}/bin/devede
+	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/devede.glade ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/devede.svg ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/devedesans.ttf ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/background.png ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/barras.png ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/estira.png ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/silence.wav ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/devede.png ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/devede.desktop ${PREFIX}/share/applications
+.for pixmap in ${DEVEDE_PIXMAPS}
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmap} ${DATADIR}
+.endfor
+	@${MKDIR} ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/devede.desktop ${DESKTOPDIR}
 	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
 .for lib in ${DEVEDE_LIBS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${lib} ${PREFIX}/lib/${PORTNAME}
 .endfor
 .if !defined(WITHOUT_NLS)
+	${INSTALL_DATA} ${WRKSRC}/po/ca.mo ${PREFIX}/share/locale/ca/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/cs_CZ.mo ${PREFIX}/share/locale/cs/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/da.mo ${PREFIX}/share/locale/da/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/de_DE.mo ${PREFIX}/share/locale/de/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/ca.mo ${PREFIX}/share/locale/ca/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/el.mo ${PREFIX}/share/locale/el/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/es.mo ${PREFIX}/share/locale/es/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/fr.mo ${PREFIX}/share/locale/fr/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/gl.mo ${PREFIX}/share/locale/gl/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/it.mo ${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/it_IT.mo ${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/nb_NO.mo ${PREFIX}/share/locale/nb/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/nl.mo ${PREFIX}/share/locale/nl/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/pl.mo ${PREFIX}/share/locale/pl/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/pt_BR.mo ${PREFIX}/share/locale/pt_BR/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/pt_PT.mo ${PREFIX}/share/locale/pt_PT/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/ru.mo ${PREFIX}/share/locale/ru/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/sk.mo ${PREFIX}/share/locale/sk/LC_MESSAGES/devede.mo
 	${INSTALL_DATA} ${WRKSRC}/po/sv.mo ${PREFIX}/share/locale/sv/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/zh_TW.mo ${PREFIX}/share/locale/zh_TW/LC_MESSAGES/devede.mo
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/devede/distinfo b/multimedia/devede/distinfo
index 7ba4b6a3314e..c1b44a1b03b9 100644
--- a/multimedia/devede/distinfo
+++ b/multimedia/devede/distinfo
@@ -1,3 +1,3 @@
-MD5 (devede-3.01.tar.bz2) = 11dd6a55c6ee44fc028d36857e1bb300
-SHA256 (devede-3.01.tar.bz2) = 0b4e0f0b8a03d3c869e63e1d4ecd5cba691e1ea64399d61bd9cf5a825915f815
-SIZE (devede-3.01.tar.bz2) = 1185161
+MD5 (devede-3.12c.tar.bz2) = 567347acbfa7d425a11836bfd5eeb7f9
+SHA256 (devede-3.12c.tar.bz2) = 8ce067b4a90430c99ba8fff36a6e1be39c9bbf69379c32dea9859170662b6bb6
+SIZE (devede-3.12c.tar.bz2) = 1612667
diff --git a/multimedia/devede/pkg-plist b/multimedia/devede/pkg-plist
index 6b6a3887f29e..69fbfb7fe5b3 100644
--- a/multimedia/devede/pkg-plist
+++ b/multimedia/devede/pkg-plist
@@ -1,44 +1,93 @@
 bin/devede
+lib/devede/devede_bincue.py
 lib/devede/devede_convert.py
-lib/devede/devede_gtk_helper.py
+lib/devede/devede_delete.py
+lib/devede/devede_dialogs.py
+lib/devede/devede_disctype.py
+lib/devede/devede_dvd.py
+lib/devede/devede_dvdmenu.py
+lib/devede/devede_executor.py
+lib/devede/devede_fonts.py
+lib/devede/devede_help.py
+lib/devede/devede_loadsave.py
+lib/devede/devede_main.py
+lib/devede/devede_newfiles.py
 lib/devede/devede_other.py
+lib/devede/devede_subtitles.py
+lib/devede/devede_title_properties.py
+lib/devede/devede_video_convert.py
+lib/devede/devede_xml_menu.py
 share/applications/devede.desktop
 %%DATADIR%%/background.png
 %%DATADIR%%/barras.png
+%%DATADIR%%/base_ntsc.mpg
+%%DATADIR%%/base_ntsc_wide.mpg
+%%DATADIR%%/base_pal.mpg
+%%DATADIR%%/base_pal_wide.mpg
 %%DATADIR%%/devede.glade
+%%DATADIR%%/devede.svg
 %%DATADIR%%/devedesans.ttf
 %%DATADIR%%/estira.png
-%%DATADIR%%/silence.wav
+%%DATADIR%%/icon_cvd.png
+%%DATADIR%%/icon_divx.png
+%%DATADIR%%/icon_dvd.png
+%%DATADIR%%/icon_svcd.png
+%%DATADIR%%/icon_vcd.png
+%%DATADIR%%/silence.mp3
+%%PORTDOCS%%%%DOCSDIR%%/html/basic.html
 %%PORTDOCS%%%%DOCSDIR%%/html/choose.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/contact.html
 %%PORTDOCS%%%%DOCSDIR%%/html/create.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/devede.html
+%%PORTDOCS%%%%DOCSDIR%%/html/disk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/file.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gpl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/main.html
 %%PORTDOCS%%%%DOCSDIR%%/html/main.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/main2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/main3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/menu.html
 %%PORTDOCS%%%%DOCSDIR%%/html/menu.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/menu2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/menu_bad.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/menu_example.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/menu_opts.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/menu_opts2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/menu_trans.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/movie1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/movie2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/movie3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/movie3b.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/movie4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/movie5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/movie6.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/movie7.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/psf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/select.html
+%%PORTDOCS%%%%DOCSDIR%%/html/subs.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/title.html
 %%PORTDOCS%%%%DOCSDIR%%/html/title_prop.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/versions.html
 %%NLS%%share/locale/ca/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/devede.mo
+%%NLS%%share/locale/da/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/de/LC_MESSAGES/devede.mo
+%%NLS%%share/locale/el/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/es/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/it/LC_MESSAGES/devede.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/devede.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/devede.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/devede.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/devede.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/devede.mo
-share/pixmaps/devede.png
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/devede.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 @dirrm %%DATADIR%%
 @dirrmtry share/applications