- Fix Python Psyco support - Only enable under ARCH == i386 since it does not work elsewhere - Import the Psyco module on the main devede python script in order to use Psyco - Bump PORTREVISION since the previous version had broken support Added file(s): - files/extra-psyco-patch-devede.py Documentation on Psyco usage can be found at http://psyco.sourceforge.net/psycoguide/node8.html Please, make sure that any scripts not directly imported by devede.py have their own psyco import lines. Port maintainer (lme@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77
Responsible Changed From-To: freebsd-ports-bugs->lme Over to maintainer (via the GNATS Auto Assign Tool)
Hi, I apologize for the awful delay. On Thu, May 07, 2009 at 10:39:26PM +0200, Lars Engels wrote: > > Hi Mario, > > thanks a lot for your patch. It applies cleanly but portlint doesn't > like it: > FATAL: Makefile: [36]: OPTIONS is set after including bsd.port.pre.mk. > > I haven't used a conditional OPTIONS yet, do you have a suggestion? I have no better idea. I understand why portlint complains but I do not know of a better way of doing that. I've already used this trick on security/cfv/Makefile. Things seem to be okay for now though that is no indication that this is a proper construct. Do you have another idea? We could just have PSYCO OPTIONS before pre.mk but ignore it if ARCH!=i386. Regards, -- Mario S F Ferreira - DF - Brazil - "I guess this is a signature." feature, n: a documented bug | bug, n: an undocumented feature
I modified the patch so that OPTIONS is set before bsd.port.pre.mk to appease portlint(1). Furthermore, I've updated the port to version 3.13.1. o Patched Makefile o Added file(s): - files/extra-psyco-patch-devede.py - files/patch-devede.py --- devede-3.13.1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/devede/Makefile,v retrieving revision 1.8 diff -d -u -u -r1.8 Makefile --- Makefile 6 Apr 2009 17:13:38 -0000 1.8 +++ Makefile 13 Jun 2009 11:59:58 -0000 @@ -6,7 +6,7 @@ # PORTNAME= devede -DISTVERSION= 3.12c +DISTVERSION= 3.13.1 CATEGORIES= multimedia MASTER_SITES= http://www.rastersoft.com/descargas/ \ http://www.bsd-geek.de/FreeBSD/distfiles/ @@ -16,21 +16,30 @@ 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 @@ 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,8 +77,22 @@ .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} @@ -65,6 +102,9 @@ .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} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/devede/distinfo,v retrieving revision 1.3 diff -d -u -u -r1.3 distinfo --- distinfo 6 Apr 2009 17:13:38 -0000 1.3 +++ distinfo 13 Jun 2009 11:59:58 -0000 @@ -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.13.1.tar.bz2) = 357a2758a4fa7049ed14f1a6b60306d0 +SHA256 (devede-3.13.1.tar.bz2) = ccd2f0e6a2f08365e1f487ca5e5d7816ab5479b8c9bf0dcbca9711f174682ec0 +SIZE (devede-3.13.1.tar.bz2) = 1655463 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/devede/pkg-plist,v retrieving revision 1.5 diff -d -u -u -r1.5 pkg-plist --- pkg-plist 6 Apr 2009 17:13:38 -0000 1.5 +++ pkg-plist 13 Jun 2009 11:59:58 -0000 @@ -18,12 +18,16 @@ 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%%/codepages.lst %%DATADIR%%/devede.glade %%DATADIR%%/devede.svg %%DATADIR%%/devedesans.ttf @@ -33,7 +37,36 @@ %%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 @@ -43,6 +76,7 @@ %%PORTDOCS%%%%DOCSDIR%%/html/file.html %%PORTDOCS%%%%DOCSDIR%%/html/gpl.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/index.html~ %%PORTDOCS%%%%DOCSDIR%%/html/install.html %%PORTDOCS%%%%DOCSDIR%%/html/main.html %%PORTDOCS%%%%DOCSDIR%%/html/main.jpg Index: files/extra-psyco-patch-devede.py =================================================================== RCS file: files/extra-psyco-patch-devede.py diff -N files/extra-psyco-patch-devede.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/extra-psyco-patch-devede.py 13 Jun 2009 11:59:58 -0000 @@ -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 Index: files/patch-devede.py =================================================================== RCS file: files/patch-devede.py diff -N files/patch-devede.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-devede.py 13 Jun 2009 11:59:58 -0000 @@ -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%%/html" ++ 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.) --- devede-3.13.1.patch ends here --- -- Mario S F Ferreira - DF - Brazil - "I guess this is a signature." feature, n: a documented bug | bug, n: an undocumented feature
lme 2009-08-07 16:23:22 UTC FreeBSD ports repository Modified files: multimedia/devede Makefile distinfo pkg-plist Added files: multimedia/devede/files extra-psyco-patch-devede.py patch-devede.py Log: - fix Python Psyco support [1] - update to 3.14.0 PR: [1] ports/134109 Submitted by: lioux Revision Changes Path 1.9 +44 -5 ports/multimedia/devede/Makefile 1.4 +3 -3 ports/multimedia/devede/distinfo 1.1 +16 -0 ports/multimedia/devede/files/extra-psyco-patch-devede.py (new) 1.1 +23 -0 ports/multimedia/devede/files/patch-devede.py (new) 1.6 +34 -1 ports/multimedia/devede/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!