From 74d46dd867e7d9e79eef70d9871ae1622a4f90bd Mon Sep 17 00:00:00 2001
From: lioux <lioux@FreeBSD.org>
Date: Thu, 12 Jun 2003 02:41:26 +0000
Subject: o PREFIX safeness: remove hardcoded path o Fix timezone offset in CVS
 view (and make it usable)

PR:		53087
Submitted by:	maintainer
---
 textproc/meld/Makefile               |  3 +++
 textproc/meld/files/patch-cvsview.py | 11 +++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 textproc/meld/files/patch-cvsview.py

(limited to 'textproc')

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 3799683..ab2cd49 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -24,6 +24,9 @@ USE_REINPLACE=	yes
 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
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/meld ${PREFIX}/bin
diff --git a/textproc/meld/files/patch-cvsview.py b/textproc/meld/files/patch-cvsview.py
new file mode 100644
index 0000000..a3da887
--- /dev/null
+++ b/textproc/meld/files/patch-cvsview.py
@@ -0,0 +1,11 @@
+--- 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)
-- 
cgit v1.1