Date: 25 Jun 2003 23:45:03 -0000 From: Rui Lopes <rui@ruilopes.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: pav@oook.cz Subject: ports/53739: [PATCH] for updating textproc/meld to 0.8.2 Message-ID: <20030625234503.6148.qmail@ns.webtt.biz> Resent-Message-ID: <200306252350.h5PNo9Tq082963@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53739 >Category: ports >Synopsis: [PATCH] for updating textproc/meld to 0.8.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 25 16:50:08 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Rui Lopes >Release: FreeBSD 5.1-RELEASE i386 >Organization: >Environment: System: FreeBSD disty 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Fri Jun 6 19:30:44 WEST 2003 root@disty:/usr/obj/usr/src/sys/DEBUGGER i386 >Description: * updated to meld 0.8.2 * install under X_PREFIX * install .desktop file * compile source in installation >How-To-Repeat: >Fix: --- meld.patch begins here --- # * updated to meld 0.8.2 # * install under X_PREFIX # * install .desktop file # * compile source in installation # # -- Rui Lopes <rui@ruilopes.com> diff -ruN meld.orig/Makefile meld/Makefile --- meld.orig/Makefile Wed Jun 25 15:02:51 2003 +++ meld/Makefile Thu Jun 26 00:27:54 2003 @@ -6,7 +6,7 @@ # PORTNAME= meld -PORTVERSION= 0.7.1 +PORTVERSION= 0.8.2 CATEGORIES= textproc devel python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= meld @@ -18,28 +18,39 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2 USE_PYTHON= yes +USE_X_PREFIX= yes NO_BUILD= yes USE_REINPLACE= yes +PKGINSTALL= ${WRKSRC}/pkg-install post-patch: - @${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${PYTHON_SITELIBDIR}/meldapp"|' ${WRKSRC}/misc.py - @${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${PREFIX}/share/doc/meld/index.html"|' ${WRKSRC}/meldapp.py - @${REINPLACE_CMD} \ - -e 's|/usr/share/pixmaps|${X11BASE}/share/gnome/pixmaps|' \ - ${WRKSRC}/cvsview.py + @${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${PINSTALLDIR}"|' ${WRKSRC}/misc.py + @${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${DOCSDIR}/index.html"|' ${WRKSRC}/meldapp.py + @${REINPLACE_CMD} -e 's|^Path=.*$$|Icon=${PINSTALLDIR}/glade2/pixmaps/icon.png|' ${WRKSRC}/meld.desktop +INSTALLDIR= share/meld +PINSTALLDIR= ${PREFIX}/${INSTALLDIR} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/meld ${PREFIX}/bin - ${ECHO} meldapp > ${PYTHON_SITELIBDIR}/meldapp.pth - ${MKDIR} ${PYTHON_SITELIBDIR}/meldapp - ${INSTALL_DATA} ${WRKSRC}/*.py ${PYTHON_SITELIBDIR}/meldapp - ${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2 - ${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${PYTHON_SITELIBDIR}/meldapp/glade2 - ${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps - ${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps - ${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps - ${MKDIR} ${PREFIX}/share/doc/meld - ${INSTALL_DATA} ${WRKSRC}/manual/*.html ${PREFIX}/share/doc/meld - ${INSTALL_DATA} ${WRKSRC}/manual/*.css ${PREFIX}/share/doc/meld + ${MKDIR} ${PINSTALLDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/meld ${PINSTALLDIR}/meld.py + ${LN} -sf ${PINSTALLDIR}/meld.py ${PREFIX}/bin/meld + ${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications + ${INSTALL_DATA} ${WRKSRC}/*.py ${PINSTALLDIR} + ${MKDIR} ${PINSTALLDIR}/glade2 + ${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${PINSTALLDIR}/glade2 + ${MKDIR} ${PINSTALLDIR}/glade2/pixmaps + ${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${PINSTALLDIR}/glade2/pixmaps + ${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${PINSTALLDIR}/glade2/pixmaps +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/manual/*.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/manual/*.css ${DOCSDIR} +.endif + +post-install: + @${SED} -e 's,@PYTHON_CMD@,${PYTHON_CMD},g ; \ + s,@INSTALLDIR@,${INSTALLDIR},g' \ + < ${FILESDIR}/pkg-install.in > ${WRKSRC}/pkg-install + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${WRKSRC}/pkg-install ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff -ruN meld.orig/distinfo meld/distinfo --- meld.orig/distinfo Wed Jun 25 15:02:51 2003 +++ meld/distinfo Wed Jun 25 15:06:02 2003 @@ -1 +1 @@ -MD5 (meld-0.7.1.tgz) = 09bb23c6afd868f209fdc5b0ea26e971 +MD5 (meld-0.8.2.tgz) = e547340b3f8271a2135a0cea9c9b1c2f diff -ruN meld.orig/files/pkg-install.in meld/files/pkg-install.in --- meld.orig/files/pkg-install.in Thu Jan 1 01:00:00 1970 +++ meld/files/pkg-install.in Wed Jun 25 23:08:35 2003 @@ -0,0 +1,15 @@ +#!/bin/sh +# $FreeBSD$ + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +PYTHON_CMD=@PYTHON_CMD@ +INSTALLDIR=${PKG_PREFIX}/@INSTALLDIR@ + +echo 'Compiling files...' +(cd ${INSTALLDIR} && \ + ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)" && \ + ${PYTHON_CMD} -O -c "import compileall; compileall.compile_dir('.', 0)" \ + ) || exit 1 diff -ruN meld.orig/pkg-plist meld/pkg-plist --- meld.orig/pkg-plist Wed Jun 25 15:02:51 2003 +++ meld/pkg-plist Wed Jun 25 23:58:29 2003 @@ -1,41 +1,49 @@ bin/meld -%%PYTHON_SITELIBDIR%%/meldapp.pth -%%PYTHON_SITELIBDIR%%/meldapp/cvsview.py -%%PYTHON_SITELIBDIR%%/meldapp/diffutil.py -%%PYTHON_SITELIBDIR%%/meldapp/dirdiff.py -%%PYTHON_SITELIBDIR%%/meldapp/filediff.py -%%PYTHON_SITELIBDIR%%/meldapp/gnomeglade.py -%%PYTHON_SITELIBDIR%%/meldapp/meldapp.py -%%PYTHON_SITELIBDIR%%/meldapp/misc.py -%%PYTHON_SITELIBDIR%%/meldapp/prefs.py -%%PYTHON_SITELIBDIR%%/meldapp/undo.py -%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.glade -%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.gladep -%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.glade -%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.gladep -%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.glade -%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.gladep -%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.glade -%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.gladep -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply0.xpm -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply1.xpm -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy0.xpm -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy1.xpm -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_delete.xpm -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/close.xpm -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-add-16.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-commit-16.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-remove-16.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-update-16.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/icon.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-changed.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-directory.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-new.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-regular.png -%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/logo.png -share/doc/meld/index.html -share/doc/meld/stylesheet.css -@dirrm share/doc/meld -@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps -@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2 -@dirrm %%PYTHON_SITELIBDIR%%/meldapp +share/gnome/applications/meld.desktop +share/meld/cvsview.py +share/meld/diffutil.py +share/meld/dirdiff.py +share/meld/filediff.py +share/meld/gnomeglade.py +share/meld/meld.py +share/meld/meldapp.py +share/meld/melddoc.py +share/meld/misc.py +share/meld/prefs.py +share/meld/task.py +share/meld/tree.py +share/meld/undo.py +share/meld/glade2/cvsview.glade +share/meld/glade2/cvsview.gladep +share/meld/glade2/dirdiff.glade +share/meld/glade2/dirdiff.gladep +share/meld/glade2/filediff.glade +share/meld/glade2/filediff.gladep +share/meld/glade2/meld-app.glade +share/meld/glade2/meld-app.gladep +share/meld/glade2/pixmaps/button_apply0.xpm +share/meld/glade2/pixmaps/button_apply1.xpm +share/meld/glade2/pixmaps/button_copy0.xpm +share/meld/glade2/pixmaps/button_copy1.xpm +share/meld/glade2/pixmaps/button_delete.xpm +share/meld/glade2/pixmaps/close.xpm +share/meld/glade2/pixmaps/cvs-add-16.png +share/meld/glade2/pixmaps/cvs-commit-16.png +share/meld/glade2/pixmaps/cvs-icon.png +share/meld/glade2/pixmaps/cvs-remove-16.png +share/meld/glade2/pixmaps/cvs-update-16.png +share/meld/glade2/pixmaps/icon.png +share/meld/glade2/pixmaps/logo.png +share/meld/glade2/pixmaps/tree-file-changed.png +share/meld/glade2/pixmaps/tree-file-new.png +share/meld/glade2/pixmaps/tree-file-normal.png +share/meld/glade2/pixmaps/tree-folder-changed.png +share/meld/glade2/pixmaps/tree-folder-new.png +share/meld/glade2/pixmaps/tree-folder-normal.png +%%PORTDOCS%%share/doc/meld/index.html +%%PORTDOCS%%share/doc/meld/stylesheet.css +%%PORTDOCS%%@dirrm share/doc/meld +@unexec rm -f %D/share/meld/*.py[co] +@dirrm share/meld/glade2/pixmaps +@dirrm share/meld/glade2 +@dirrm share/meld --- meld.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030625234503.6148.qmail>