- Update to 3.17.0 [1]

- Remove unneeded patch [2]
- Silent install

PR:		ports/160332 [1], ports/160266 [2]
Submitted by:	stefan [1], lioux [2]

4 files changed, 37 insertions, 46 deletions

diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index b195c959cc10..10cdaee77e3b 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	devede
-DISTVERSION=	3.16.9
+DISTVERSION=	3.17.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.rastersoft.com/descargas/ \
 		http://bsd-geek.de/FreeBSD/distfiles/
@@ -28,7 +28,7 @@ NO_BUILD=	yes
 OPTIONS=	PSYCO "Enable devel/py-psyco optimization support" off
 
 # Strip last character not present in distribution.
-WRKSRC=		${WRKDIR}/${DISTNAME:C/b//}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DEJAVU_FONTSDIR=	${LOCALBASE}/lib/X11/fonts/dejavu
 DEJAVU_FONTFILE=	${DEJAVU_FONTSDIR}/DejaVuSans.ttf
@@ -51,7 +51,7 @@ PLIST_SUB+=	NLS=""
 PORTDOCS=	*
 
 DEVEDE_INTERFACE=	aboutdialog1.ui add_subtitle.ui add_subtitle2.ui \
-			codepages.lst languages.lst waborted_dialog.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 \
@@ -65,7 +65,7 @@ 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_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 \
@@ -92,54 +92,54 @@ post-patch:
 		${WRKSRC}/devede_fonts.py
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${PREFIX}/bin/devede
+	@${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${PREFIX}/bin/devede
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/backgrounds
-	${INSTALL_DATA} ${WRKSRC}/devede.svg ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/devedesans.ttf ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/changes.txt ${DATADIR}
+	@${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}
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmap} ${DATADIR}
 .endfor
 .for background in ${DEVEDE_BACKGROUNDS}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/backgrounds/${background} ${DATADIR}/backgrounds
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/backgrounds/${background} ${DATADIR}/backgrounds
 .endfor
 .for interface in ${DEVEDE_INTERFACE}
-	${INSTALL_DATA} ${WRKSRC}/interface/${interface} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/interface/${interface} ${DATADIR}
 .endfor
 	@${MKDIR} ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/devede.desktop ${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/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/hu_HU.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_CN.mo ${PREFIX}/share/locale/zh_CN/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/zh_TW.mo ${PREFIX}/share/locale/zh_TW/LC_MESSAGES/devede.mo
+	@${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/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/hu_HU.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_CN.mo ${PREFIX}/share/locale/zh_CN/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/html/* ${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 af308acb1639..72a510dc2b6f 100644
--- a/multimedia/devede/distinfo
+++ b/multimedia/devede/distinfo
@@ -1,2 +1,2 @@
-SHA256 (devede-3.16.9.tar.bz2) = eccaba86893935ff898e7b26d772214403362a6c8d729645778146560c1ac0c1
-SIZE (devede-3.16.9.tar.bz2) = 2368434
+SHA256 (devede-3.17.0.tar.bz2) = 528acc83302aec65137f985f32a604cfb416122546827064f7ed54ebafcc4985
+SIZE (devede-3.17.0.tar.bz2) = 2370362
diff --git a/multimedia/devede/files/patch-devede_other.py b/multimedia/devede/files/patch-devede_other.py
deleted file mode 100644
index 1fa41fc89932..000000000000
--- a/multimedia/devede/files/patch-devede_other.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./devede_other.py.orig	2010-10-01 17:35:11.558220218 +0200
-+++ ./devede_other.py	2010-10-01 17:35:51.631522099 +0200
-@@ -233,7 +233,7 @@
- 	
- 	def convert_to_UTF8(self,infile_n,outfile_n,origin_format):
- 		
--		command_line='iconv -f '+str(origin_format)+' -t UTF-8 "'+str(infile_n)+'" > "'+str(outfile_n)+'"'
-+		command_line='iconv -f '+str(origin_format)+' -t UTF8 "'+str(infile_n)+'" > "'+str(outfile_n)+'"'
- 		return self.launch_shell(command_line).wait()
- 	
- 	
diff --git a/multimedia/devede/pkg-plist b/multimedia/devede/pkg-plist
index a62fb38a232b..577047871949 100644
--- a/multimedia/devede/pkg-plist
+++ b/multimedia/devede/pkg-plist
@@ -13,6 +13,7 @@ lib/devede/devede_loadsave.py
 lib/devede/devede_main.py
 lib/devede/devede_newfiles.py
 lib/devede/devede_other.py
+lib/devede/devede_settings.py
 lib/devede/devede_subtitles.py
 lib/devede/devede_title_properties.py
 lib/devede/devede_video_convert.py
@@ -38,6 +39,7 @@ share/applications/devede.desktop
 %%DATADIR%%/icon_svcd.png
 %%DATADIR%%/icon_vcd.png
 %%DATADIR%%/languages.lst
+%%DATADIR%%/settings.ui
 %%DATADIR%%/silence.ogg
 %%DATADIR%%/waborted_dialog.ui
 %%DATADIR%%/wcancel_dialog.ui