Date: 11 Sep 2003 12:16:11 -0000 From: Rui Lopes <rui@ruilopes.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56700: Update port: textproc/meld to 0.8.5 Message-ID: <20030911121611.42662.qmail@ns.webtt.biz> Resent-Message-ID: <200309111220.h8BCKEgT055699@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56700
>Category: ports
>Synopsis: Update port: textproc/meld to 0.8.5
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 11 05:20:14 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:
* Update to 0.8.5.
* Removed our patch, not needed anymore.
* Don't compile .pyo files, we are not using them.
>How-To-Repeat:
>Fix:
--- meld.patch begins here ---
# * Update to 0.8.5.
# * Removed our patch, not needed anymore.
# * Don't compile .pyo files, we are not using them.
# -- Rui Lopes <rui@ruilopes.com>
diff -ruN meld.orig/Makefile meld/Makefile
--- meld.orig/Makefile Wed Sep 10 14:00:13 2003
+++ meld/Makefile Thu Sep 11 12:49:26 2003
@@ -6,7 +6,7 @@
#
PORTNAME= meld
-PORTVERSION= 0.8.4
+PORTVERSION= 0.8.5
CATEGORIES= textproc devel python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= meld
@@ -46,9 +46,7 @@
.endif
post-install:
- @${ECHO_CMD} 'Compiling files...'
- @(cd ${INSTALLDIR} && \
- ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)" && \
- ${PYTHON_CMD} -O -c "import compileall; compileall.compile_dir('.', 0)")
+ @cd ${INSTALLDIR} && \
+ ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)"
.include <bsd.port.mk>
diff -ruN meld.orig/distinfo meld/distinfo
--- meld.orig/distinfo Wed Sep 10 14:00:13 2003
+++ meld/distinfo Thu Sep 11 12:22:10 2003
@@ -1 +1 @@
-MD5 (meld-0.8.4.tgz) = 404620921890ab0b8bf77008bcd08498
+MD5 (meld-0.8.5.tgz) = 463553f70bda8c400843fd34270de2fd
diff -ruN meld.orig/files/patch-cvsview.py meld/files/patch-cvsview.py
--- meld.orig/files/patch-cvsview.py Wed Sep 10 14:00:13 2003
+++ meld/files/patch-cvsview.py Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- cvsview.py.orig Wed Jun 11 23:35:31 2003
-+++ cvsview.py Wed Jun 11 23:36:04 2003
-@@ -90,7 +90,7 @@
- if plus >= 0:
- cotime = 0
- try:
-- cotime = time.mktime( time.strptime(date) )
-+ cotime = time.mktime( time.strptime(date) ) - time.timezone
- except ValueError, e:
- if not date.startswith("Result of merge"):
- print "Unable to parse date '%s' in '%s/CVS/Entries'" % (date, directory)
diff -ruN meld.orig/pkg-plist meld/pkg-plist
--- meld.orig/pkg-plist Wed Sep 10 14:00:13 2003
+++ meld/pkg-plist Thu Sep 11 12:53:52 2003
@@ -2,45 +2,33 @@
share/gnome/applications/meld.desktop
share/meld/cvsview.py
share/meld/cvsview.pyc
-share/meld/cvsview.pyo
share/meld/diffutil.py
share/meld/diffutil.pyc
-share/meld/diffutil.pyo
share/meld/dirdiff.py
share/meld/dirdiff.pyc
-share/meld/dirdiff.pyo
share/meld/filediff.py
share/meld/filediff.pyc
-share/meld/filediff.pyo
share/meld/gnomeglade.py
share/meld/gnomeglade.pyc
-share/meld/gnomeglade.pyo
share/meld/meld
share/meld/meldapp.py
share/meld/meldapp.pyc
-share/meld/meldapp.pyo
share/meld/melddoc.py
share/meld/melddoc.pyc
-share/meld/melddoc.pyo
share/meld/misc.py
share/meld/misc.pyc
-share/meld/misc.pyo
share/meld/prefs.py
share/meld/prefs.pyc
-share/meld/prefs.pyo
share/meld/task.py
share/meld/task.pyc
-share/meld/task.pyo
share/meld/tree.py
share/meld/tree.pyc
-share/meld/tree.pyo
share/meld/undo.py
share/meld/undo.pyc
-share/meld/undo.pyo
share/meld/glade2/cvsview.glade
share/meld/glade2/dirdiff.glade
share/meld/glade2/filediff.glade
-share/meld/glade2/meld-app.glade
+share/meld/glade2/meldapp.glade
share/meld/glade2/pixmaps/button_apply0.xpm
share/meld/glade2/pixmaps/button_apply1.xpm
share/meld/glade2/pixmaps/button_copy0.xpm
--- 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?20030911121611.42662.qmail>