6 files changed, 56 insertions, 81 deletions

diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index 8b3d3c09ae69..b41c65d09531 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -2,25 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	devede
-DISTVERSION=	3.23.0
-PORTREVISION=	1
+PORTVERSION=	3.23.0
+DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.rastersoft.com/descargas/ \
-		http://bsd-geek.de/FreeBSD/distfiles/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create video DVDs, VCDs, sVCDs, or CVDs from any number of video files
 
-BROKEN=		unfetchable
+LICENSE=	GPLv3+
 
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 		mencoder:multimedia/mencoder \
 		spumux:multimedia/dvdauthor \
+		mplayer:multimedia/mplayer \
 		vcdimager:multimedia/vcdimager \
 		cdrecord:sysutils/cdrtools
 
-USE_GNOME=	pygtk2
-USES=		iconv python tar:bzip2
+NO_ARCH=	yes
+USES=		iconv python
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	IBUS NLS
@@ -31,9 +31,17 @@ DEJAVU_FONTSDIR=	${LOCALBASE}/share/fonts/dejavu
 DEJAVU_FONTFILE=	${DEJAVU_FONTSDIR}/DejaVuSans.ttf
 
 IBUS_RUN_DEPENDS=	ibus-daemon:textproc/ibus
-NLS_USES=	gettext
+NLS_USES=	gettext-runtime:run
 OPTIONS_SUB=	yes
 
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	rastersoft
+GH_PROJECT=	Devede
+
+USE_GNOME=	pygtk2:run
+USE_PYTHON=	run
+
 PORTDOCS=	*
 
 post-patch:
@@ -46,58 +54,40 @@ post-patch:
 		${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' \
+	@${REINPLACE_CMD} -e \
+		's|\(font_path,"\).*\("\)|\1${DEJAVU_FONTFILE}\2|' \
 		${WRKSRC}/devede_fonts.py
 
 do-install:
 # File locations in devede are a mess...
 	${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${STAGEDIR}${PREFIX}/bin/devede
 	${INSTALL_SCRIPT} ${WRKSRC}/devede-debug ${STAGEDIR}${PREFIX}/bin/
-
+#
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/devede
+	${INSTALL_DATA} ${WRKSRC}/devede_*.py \
+		${STAGEDIR}${PREFIX}/lib/devede
+#
+	${INSTALL_DATA} ${WRKSRC}/devede.desktop ${STAGEDIR}${DESKTOPDIR}
+#
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/devedesans.ttf ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/devede.svg ${STAGEDIR}${DATADIR}
-
-	@${MKDIR} ${STAGEDIR}${DATADIR}/interface
-	(cd ${WRKSRC}/interface && ${FIND} . -type f -exec ${INSTALL_DATA} "{}" ${STAGEDIR}${DATADIR} \;)
-
-	(cd ${WRKSRC}/pixmaps/ && ${FIND} . -depth 1 -type f \
-		-exec ${INSTALL_DATA} "{}" ${STAGEDIR}${DATADIR} \;)
-
-	@${MKDIR} ${STAGEDIR}${DATADIR}/backgrounds
-	(cd ${WRKSRC}/pixmaps/backgrounds && ${FIND} . -type f \
-		-exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/backgrounds/{}" \;)
-
-	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/devede.desktop ${STAGEDIR}${DESKTOPDIR}
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
-	(cd ${WRKSRC} && ${FIND} . -depth 1 -type f -name "devede_*.py" \
-			-exec ${INSTALL_SCRIPT} "{}" "${STAGEDIR}${PREFIX}/lib/${PORTNAME}/{}" \;)
-
-	${INSTALL_DATA} ${WRKSRC}/devede.svg ${STAGEDIR}${PREFIX}/share/pixmaps
-
-	${INSTALL_DATA} ${WRKSRC}/po/ca.mo ${STAGEDIR}${PREFIX}/share/locale/ca/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/cs_CZ.mo ${STAGEDIR}${PREFIX}/share/locale/cs/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/da.mo ${STAGEDIR}${PREFIX}/share/locale/da/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/de_DE.mo ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/el.mo ${STAGEDIR}${PREFIX}/share/locale/el/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/es.mo ${STAGEDIR}${PREFIX}/share/locale/es/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/fr.mo ${STAGEDIR}${PREFIX}/share/locale/fr/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/gl.mo ${STAGEDIR}${PREFIX}/share/locale/gl/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/hu_HU.mo ${STAGEDIR}${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/it_IT.mo ${STAGEDIR}${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/nb_NO.mo ${STAGEDIR}${PREFIX}/share/locale/nb/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/nl.mo ${STAGEDIR}${PREFIX}/share/locale/nl/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/pl.mo ${STAGEDIR}${PREFIX}/share/locale/pl/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/pt_BR.mo ${STAGEDIR}${PREFIX}/share/locale/pt_BR/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/pt_PT.mo ${STAGEDIR}${PREFIX}/share/locale/pt_PT/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/ru.mo ${STAGEDIR}${PREFIX}/share/locale/ru/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/sk.mo ${STAGEDIR}${PREFIX}/share/locale/sk/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/sv.mo ${STAGEDIR}${PREFIX}/share/locale/sv/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/zh_CN.mo ${STAGEDIR}${PREFIX}/share/locale/zh_CN/LC_MESSAGES/devede.mo
-	${INSTALL_DATA} ${WRKSRC}/po/zh_TW.mo ${STAGEDIR}${PREFIX}/share/locale/zh_TW/LC_MESSAGES/devede.mo
+	${LN} -sf ${DATADIR}/devede.svg ${STAGEDIR}${PREFIX}/share/pixmaps
+	(cd ${WRKSRC}/interface && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/pixmaps && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+
+post-install-NLS-on:
+.for i in ca da el es fr gl nl pl pt_BR pt_PT ru sk sv zh_CN zh_TW
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/${i}.mo \
+		${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/devede.mo
+.endfor
+.for i in cs_CZ de_DE hu_HU it_IT nb_NO
+	${INSTALL_DATA} ${WRKSRC}/po/${i}.mo \
+		${STAGEDIR}${PREFIX}/share/locale/${i:C/_.*//}/LC_MESSAGES/devede.mo
+.endfor
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
 
diff --git a/multimedia/devede/distinfo b/multimedia/devede/distinfo
index 5e69db0f5710..c3b7fbdaa2a7 100644
--- a/multimedia/devede/distinfo
+++ b/multimedia/devede/distinfo
@@ -1,2 +1,2 @@
-SHA256 (devede-3.23.0.tar.bz2) = 9e217ca46f5f275cb0c3cadbe8c830fa1fde774c004bd95a343d1255be6f25e1
-SIZE (devede-3.23.0.tar.bz2) = 2680546
+SHA256 (rastersoft-Devede-v3.23.0_GH0.tar.gz) = 00a64cf5e39c13b6bae475e892baec5609cb5ad2d31078ee913efc961624335c
+SIZE (rastersoft-Devede-v3.23.0_GH0.tar.gz) = 2663547
diff --git a/multimedia/devede/files/extra-psyco-patch-devede.py b/multimedia/devede/files/extra-psyco-patch-devede.py
deleted file mode 100644
index 92edfe4fc25a..000000000000
--- a/multimedia/devede/files/extra-psyco-patch-devede.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./devede.py.orig	2009-04-30 08:17:34.000000000 -0300
-+++ ./devede.py	2009-04-30 08:18:03.000000000 -0300
-@@ -19,6 +19,13 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+try:
-+  import psyco
-+  import re
-+  psyco.cannotcompile(re.compile)
-+  psyco.profile()
-+except ImportError:
-+  pass
- 
- import sys
- import os
diff --git a/multimedia/devede/files/patch-devede.py b/multimedia/devede/files/patch-devede
index 433cc358a551..e190199eee4d 100644
--- a/multimedia/devede/files/patch-devede.py
+++ b/multimedia/devede/files/patch-devede
@@ -1,8 +1,8 @@
---- devede.py.orig	2009-05-25 09:50:34.000000000 -0300
-+++ devede.py	2009-06-13 08:40:49.000000000 -0300
-@@ -69,7 +69,19 @@
+--- devede.orig	2012-10-20 18:32:49 UTC
++++ devede
+@@ -59,7 +59,19 @@ if found==False:
  	except:
- 		found=False	
+ 		found=False
  
 -if tipo==0:
 +tipo=3
diff --git a/multimedia/devede/pkg-descr b/multimedia/devede/pkg-descr
index 88f4c2fe9ff9..4c52a200e8ea 100644
--- a/multimedia/devede/pkg-descr
+++ b/multimedia/devede/pkg-descr
@@ -1,7 +1,8 @@
-DeVeDe is a program to create video DVDs and CDs (VCD, sVCD or CVD), suitables
-for home players, from any number of video files, in any of the formats
-supported by Mplayer. The big advantage over other utilites is that it only
-needs Mplayer, Mencoder, DVDAuthor, VCDImager and MKisofs (well, and
-Python 2.4, PyGTK and PyGlade), so its dependencies are really small.
+DeVeDe is a program to create video DVDs and CDs (VCD, sVCD or CVD),
+suitables for home players, from any number of video files, in any of
+the formats supported by Mplayer. The big advantage over other utilites
+is that it only needs Mplayer, Mencoder, DVDAuthor, VCDImager and
+MKisofs (well, and Python 2.4, PyGTK and PyGlade), so its dependencies
+are really small.
 
 WWW: http://www.rastersoft.com/programas/devede.html
diff --git a/multimedia/devede/pkg-plist b/multimedia/devede/pkg-plist
index 27ae078b1dd0..7d7c0fde733f 100644
--- a/multimedia/devede/pkg-plist
+++ b/multimedia/devede/pkg-plist
@@ -85,6 +85,7 @@ share/applications/devede.desktop
 %%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/hu/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
@@ -96,5 +97,4 @@ share/applications/devede.desktop
 %%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
-%%NLS%%share/pixmaps/devede.svg
-@dir %%DATADIR%%/interface
+share/pixmaps/devede.svg