5 files changed, 120 insertions, 9 deletions

diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index eb3d0775466d..b985b148d42e 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	devede
-DISTVERSION=	3.12c
+DISTVERSION=	3.14.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.rastersoft.com/descargas/ \
 		http://www.bsd-geek.de/FreeBSD/distfiles/
@@ -16,21 +16,30 @@ 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 \
-		${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
+		vcdimager:${PORTSDIR}/multimedia/vcdimager
 
 USE_BZIP2=	yes
+USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USE_CDRTOOLS=	yes
 NO_BUILD=	yes
 
-OPTIONS=	PSYCO "Use psyco to compile the python scripts" Off \
+OPTIONS=	PSYCO "Enable devel/py-psyco optimization support" off
 
 # Strip last character not present in distribution.
 WRKSRC=		${WRKDIR}/${DISTNAME:C/b//}
 
+DEJAVU_FONTSDIR=	${LOCALBASE}/lib/X11/fonts/dejavu
+DEJAVU_FONTFILE=	${DEJAVU_FONTSDIR}/DejaVuSans.ttf
+
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} != "i386"
+.undef WITH_PSYCO
+
+WITHOUT_PSYCO=	yes
+.endif
+
 .if defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS="@comment "
 .else
@@ -40,6 +49,20 @@ PLIST_SUB+=	NLS=""
 
 PORTDOCS=	docs/*
 
+DEVEDE_INTERFACE=	aboutdialog1.ui add_subtitle.ui add_subtitle2.ui \
+			codepages.lst languages.lst 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 \
@@ -54,17 +77,33 @@ DEVEDE_PIXMAPS=	background.png barras.png base_ntsc.mpg base_ntsc_wide.mpg \
 
 .if defined(WITH_PSYCO)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
+EXTRA_PATCHES+=	${FILESDIR}/extra-psyco-patch-devede.py
 .endif
 
+post-patch:
+# Fix general locations
+	@${REINPLACE_CMD} -E \
+		-e 's|%%PREFIX%%|${PREFIX}|' \
+		-e 's|%%PORTNAME%%|${PORTNAME}|' \
+		-e 's|%%DATADIR%%|${DATADIR}|' \
+		-e 's|%%DOCSDIR%%|${DOCSDIR}|' \
+		${WRKSRC}/devede.py
+# 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:
 	${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}
 .for pixmap in ${DEVEDE_PIXMAPS}
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmap} ${DATADIR}
 .endfor
+.for interface in ${DEVEDE_INTERFACE}
+	${INSTALL_DATA} ${WRKSRC}/interface/${interface} ${DATADIR}
+.endfor
 	@${MKDIR} ${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/devede.desktop ${DESKTOPDIR}
 	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
diff --git a/multimedia/devede/distinfo b/multimedia/devede/distinfo
index c1b44a1b03b9..79b65bd8b9d4 100644
--- a/multimedia/devede/distinfo
+++ b/multimedia/devede/distinfo
@@ -1,3 +1,3 @@
-MD5 (devede-3.12c.tar.bz2) = 567347acbfa7d425a11836bfd5eeb7f9
-SHA256 (devede-3.12c.tar.bz2) = 8ce067b4a90430c99ba8fff36a6e1be39c9bbf69379c32dea9859170662b6bb6
-SIZE (devede-3.12c.tar.bz2) = 1612667
+MD5 (devede-3.14.0.tar.bz2) = f7304e9276862758f6e4aa0bdbd0fc49
+SHA256 (devede-3.14.0.tar.bz2) = debdb1d91dbff469666e1cccaf8e21ced04b875df115efc28dee58b4f22b9f6e
+SIZE (devede-3.14.0.tar.bz2) = 1614281
diff --git a/multimedia/devede/files/extra-psyco-patch-devede.py b/multimedia/devede/files/extra-psyco-patch-devede.py
new file mode 100644
index 000000000000..92edfe4fc25a
--- /dev/null
+++ b/multimedia/devede/files/extra-psyco-patch-devede.py
@@ -0,0 +1,16 @@
+--- ./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.py
new file mode 100644
index 000000000000..433cc358a551
--- /dev/null
+++ b/multimedia/devede/files/patch-devede.py
@@ -0,0 +1,23 @@
+--- 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 @@
+ 	except:
+ 		found=False	
+ 
+-if tipo==0:
++tipo=3
++
++if tipo==3:
++	share_locale="%%PREFIX%%/share/locale"
++	glade="%%DATADIR%%"
++	sys.path.append("%%PREFIX%%/lib/%%PORTNAME%%")
++	font_path="%%DATADIR%%"
++	pic_path="%%DATADIR%%"
++	other_path="%%DATADIR%%"
++	help_path="%%DOCSDIR%%"
++	print "Using port-installed files"
++
++elif tipo==0:
+ 	#gettext.bindtextdomain('devede', '/usr/share/locale')
+ 	#Note also before python 2.3 you need the following if
+ 	#you need translations from non python code (glibc,libglade etc.)
diff --git a/multimedia/devede/pkg-plist b/multimedia/devede/pkg-plist
index 69fbfb7fe5b3..14852257002c 100644
--- a/multimedia/devede/pkg-plist
+++ b/multimedia/devede/pkg-plist
@@ -18,13 +18,16 @@ lib/devede/devede_title_properties.py
 lib/devede/devede_video_convert.py
 lib/devede/devede_xml_menu.py
 share/applications/devede.desktop
+%%DATADIR%%/aboutdialog1.ui
+%%DATADIR%%/add_subtitle.ui
+%%DATADIR%%/add_subtitle2.ui
 %%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%%/codepages.lst
 %%DATADIR%%/devede.svg
 %%DATADIR%%/devedesans.ttf
 %%DATADIR%%/estira.png
@@ -33,7 +36,36 @@ share/applications/devede.desktop
 %%DATADIR%%/icon_dvd.png
 %%DATADIR%%/icon_svcd.png
 %%DATADIR%%/icon_vcd.png
+%%DATADIR%%/languages.lst
 %%DATADIR%%/silence.mp3
+%%DATADIR%%/waborted_dialog.ui
+%%DATADIR%%/wcancel_dialog.ui
+%%DATADIR%%/wcancel_job_dialog.ui
+%%DATADIR%%/wdel_chapter_dialog.ui
+%%DATADIR%%/wdel_subtitle.ui
+%%DATADIR%%/wdel_title_dialog.ui
+%%DATADIR%%/wdisk_type.ui
+%%DATADIR%%/wempty_titles_dialog.ui
+%%DATADIR%%/wend_dialog.ui
+%%DATADIR%%/werase_dialog.ui
+%%DATADIR%%/werror_dialog.ui
+%%DATADIR%%/wfile.ui
+%%DATADIR%%/wfolder_dialog.ui
+%%DATADIR%%/wfolder_exists.ui
+%%DATADIR%%/wloadconfig.ui
+%%DATADIR%%/wloosecurrent.ui
+%%DATADIR%%/wmain.ui
+%%DATADIR%%/wmenu_preview_ntsc.ui
+%%DATADIR%%/wmenu_preview_pal.ui
+%%DATADIR%%/wmenu_properties.ui
+%%DATADIR%%/wnofonts.ui
+%%DATADIR%%/wpreview_dialog.ui
+%%DATADIR%%/wpreviewagain_dialog.ui
+%%DATADIR%%/wprograms.ui
+%%DATADIR%%/wprogress.ui
+%%DATADIR%%/wsaveconfig.ui
+%%DATADIR%%/wtitle_properties_dialog.ui
+%%DATADIR%%/wwarning_dialog.ui
 %%PORTDOCS%%%%DOCSDIR%%/html/basic.html
 %%PORTDOCS%%%%DOCSDIR%%/html/choose.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/contact.html
@@ -70,6 +102,7 @@ share/applications/devede.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/title.html
 %%PORTDOCS%%%%DOCSDIR%%/html/title_prop.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/versions.html
+%%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