- Update to 3.20.0

- Simplify do-install
- Install missing files
- Add missing run-depends

Feature safe:	yes

3 files changed, 57 insertions, 65 deletions

diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 10cdaee77e3b..18ae366a12be 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	devede
-DISTVERSION=	3.17.0
+DISTVERSION=	3.20.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.rastersoft.com/descargas/ \
 		http://bsd-geek.de/FreeBSD/distfiles/
@@ -14,7 +14,9 @@ MASTER_SITES=	http://www.rastersoft.com/descargas/ \
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Create video DVDs, VCDs, sVCDs or CVDs from any number of video files
 
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
+RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
+		ibus-daemon:${PORTSDIR}/textproc/ibus \
+		mencoder:${PORTSDIR}/multimedia/mencoder \
 		spumux:${PORTSDIR}/multimedia/dvdauthor \
 		vcdimager:${PORTSDIR}/multimedia/vcdimager
 
@@ -50,29 +52,6 @@ PLIST_SUB+=	NLS=""
 
 PORTDOCS=	*
 
-DEVEDE_INTERFACE=	aboutdialog1.ui add_subtitle.ui add_subtitle2.ui \
-			codepages.lst languages.lst settings.ui waborted_dialog.ui \
-			wcancel_dialog.ui wcancel_job_dialog.ui wdel_chapter_dialog.ui \
-			wdel_subtitle.ui wdel_title_dialog.ui wdisk_type.ui \
-			wempty_titles_dialog.ui wend_dialog.ui werase_dialog.ui \
-			werror_dialog.ui wfile.ui wfolder_dialog.ui \
-			wfolder_exists.ui wloadconfig.ui wloosecurrent.ui \
-			wmain.ui wmenu_preview_ntsc.ui wmenu_preview_pal.ui \
-			wmenu_properties.ui wnofonts.ui wpreview_dialog.ui \
-			wpreviewagain_dialog.ui wprograms.ui wprogress.ui \
-			wsaveconfig.ui wtitle_properties_dialog.ui wwarning_dialog.ui
-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_settings.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.ogg
-DEVEDE_BACKGROUNDS=	biglens.png default_bg.png dvdfilm.png
-
 .if defined(WITH_PSYCO)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 EXTRA_PATCHES+=	${FILESDIR}/extra-psyco-patch-devede.py
@@ -86,33 +65,40 @@ post-patch:
 		-e 's|%%DATADIR%%|${DATADIR}|' \
 		-e 's|%%DOCSDIR%%|${DOCSDIR}|' \
 		${WRKSRC}/devede.py
+	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/devede-debug
 # Fix font location
 	@${REINPLACE_CMD} -E \
 		-e 's,/usr/share/fonts/truetype/ttf-dejavu/(DejaVuSans|dejavusans).ttf,${DEJAVU_FONTFILE},g' \
 		${WRKSRC}/devede_fonts.py
 
 do-install:
+# File locations in devede are a mess...
 	@${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${PREFIX}/bin/devede
+	@${INSTALL_SCRIPT} ${WRKSRC}/devede-debug ${PREFIX}/bin/
+
 	@${MKDIR} ${DATADIR}
-	@${MKDIR} ${DATADIR}/backgrounds
-	@${INSTALL_DATA} ${WRKSRC}/devede.svg ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/devedesans.ttf ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/changes.txt ${DATADIR}
-.for pixmap in ${DEVEDE_PIXMAPS}
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmap} ${DATADIR}
-.endfor
-.for background in ${DEVEDE_BACKGROUNDS}
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/backgrounds/${background} ${DATADIR}/backgrounds
-.endfor
-.for interface in ${DEVEDE_INTERFACE}
-	@${INSTALL_DATA} ${WRKSRC}/interface/${interface} ${DATADIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/devede.svg ${DATADIR}
+
+	@${MKDIR} ${DATADIR}/interface
+	@(cd ${WRKSRC}/interface && ${FIND} . -type f -exec ${INSTALL_DATA} "{}" ${DATADIR} \;)
+
+	@(cd ${WRKSRC}/pixmaps/ && ${FIND} . -depth 1 -type f \
+		-exec ${INSTALL_DATA} "{}" ${DATADIR} \;)
+
+	@${MKDIR} ${DATADIR}/backgrounds
+	@(cd ${WRKSRC}/pixmaps/backgrounds && ${FIND} . -type f \
+		-exec ${INSTALL_DATA} "{}" "${DATADIR}/backgrounds/{}" \;)
+
 	@${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
+	@(cd ${WRKSRC} && ${FIND} . -depth 1 -type f -name "devede_*.py" \
+			-exec ${INSTALL_SCRIPT} "{}" "${PREFIX}/lib/${PORTNAME}/{}" \;)
+
+	@${INSTALL_DATA} ${WRKSRC}/devede.svg ${PREFIX}/share/pixmaps
+
 .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
diff --git a/multimedia/devede/distinfo b/multimedia/devede/distinfo
index 72a510dc2b6f..5c515d87636a 100644
--- a/multimedia/devede/distinfo
+++ b/multimedia/devede/distinfo
@@ -1,2 +1,2 @@
-SHA256 (devede-3.17.0.tar.bz2) = 528acc83302aec65137f985f32a604cfb416122546827064f7ed54ebafcc4985
-SIZE (devede-3.17.0.tar.bz2) = 2370362
+SHA256 (devede-3.20.0.tar.bz2) = 3fe43419363ea119e4fa72336e1513e43e3280fd3f951cbb86a836f82f065f7e
+SIZE (devede-3.20.0.tar.bz2) = 2532542
diff --git a/multimedia/devede/pkg-plist b/multimedia/devede/pkg-plist
index 577047871949..e756e5db9061 100644
--- a/multimedia/devede/pkg-plist
+++ b/multimedia/devede/pkg-plist
@@ -1,4 +1,5 @@
 bin/devede
+bin/devede-debug
 lib/devede/devede_bincue.py
 lib/devede/devede_convert.py
 lib/devede/devede_delete.py
@@ -7,6 +8,7 @@ lib/devede/devede_disctype.py
 lib/devede/devede_dvd.py
 lib/devede/devede_dvdmenu.py
 lib/devede/devede_executor.py
+lib/devede/devede_ffmpeg_convert.py
 lib/devede/devede_fonts.py
 lib/devede/devede_help.py
 lib/devede/devede_loadsave.py
@@ -23,13 +25,16 @@ share/applications/devede.desktop
 %%DATADIR%%/add_subtitle.ui
 %%DATADIR%%/add_subtitle2.ui
 %%DATADIR%%/background.png
+%%DATADIR%%/backgrounds/biglens.png
+%%DATADIR%%/backgrounds/blackbg.png
+%%DATADIR%%/backgrounds/default_bg.png
+%%DATADIR%%/backgrounds/dvdfilm.png
 %%DATADIR%%/barras.png
 %%DATADIR%%/base_ntsc.mpg
 %%DATADIR%%/base_ntsc_wide.mpg
 %%DATADIR%%/base_pal.mpg
 %%DATADIR%%/base_pal_wide.mpg
 %%DATADIR%%/codepages.lst
-%%DATADIR%%/changes.txt
 %%DATADIR%%/devede.svg
 %%DATADIR%%/devedesans.ttf
 %%DATADIR%%/estira.png
@@ -41,6 +46,7 @@ share/applications/devede.desktop
 %%DATADIR%%/languages.lst
 %%DATADIR%%/settings.ui
 %%DATADIR%%/silence.ogg
+%%DATADIR%%/use_ffmpeg.ui
 %%DATADIR%%/waborted_dialog.ui
 %%DATADIR%%/wcancel_dialog.ui
 %%DATADIR%%/wcancel_job_dialog.ui
@@ -61,6 +67,7 @@ share/applications/devede.desktop
 %%DATADIR%%/wmenu_preview_ntsc.ui
 %%DATADIR%%/wmenu_preview_pal.ui
 %%DATADIR%%/wmenu_properties.ui
+%%DATADIR%%/wno_mp3lame.ui
 %%DATADIR%%/wnofonts.ui
 %%DATADIR%%/wpreview_dialog.ui
 %%DATADIR%%/wpreviewagain_dialog.ui
@@ -69,28 +76,27 @@ share/applications/devede.desktop
 %%DATADIR%%/wsaveconfig.ui
 %%DATADIR%%/wtitle_properties_dialog.ui
 %%DATADIR%%/wwarning_dialog.ui
-%%DATADIR%%/backgrounds/biglens.png
-%%DATADIR%%/backgrounds/default_bg.png
-%%DATADIR%%/backgrounds/dvdfilm.png
-%%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
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/devede.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/devede.mo
+share/locale/ca/LC_MESSAGES/devede.mo
+share/locale/cs/LC_MESSAGES/devede.mo
+share/locale/da/LC_MESSAGES/devede.mo
+share/locale/de/LC_MESSAGES/devede.mo
+share/locale/el/LC_MESSAGES/devede.mo
+share/locale/es/LC_MESSAGES/devede.mo
+share/locale/fr/LC_MESSAGES/devede.mo
+share/locale/gl/LC_MESSAGES/devede.mo
+share/locale/it/LC_MESSAGES/devede.mo
+share/locale/nb/LC_MESSAGES/devede.mo
+share/locale/nl/LC_MESSAGES/devede.mo
+share/locale/pl/LC_MESSAGES/devede.mo
+share/locale/pt_BR/LC_MESSAGES/devede.mo
+share/locale/pt_PT/LC_MESSAGES/devede.mo
+share/locale/ru/LC_MESSAGES/devede.mo
+share/locale/sk/LC_MESSAGES/devede.mo
+share/locale/sv/LC_MESSAGES/devede.mo
+share/locale/zh_CN/LC_MESSAGES/devede.mo
+share/locale/zh_TW/LC_MESSAGES/devede.mo
+share/pixmaps/devede.svg
+@dirrm %%DATADIR%%/interface
 @dirrm %%DATADIR%%/backgrounds
 @dirrm %%DATADIR%%
 @dirrmtry share/applications