pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/diffuse Update to 0.3.3 with post-release patche...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e6b5680ac780
branches: trunk
changeset: 557522:e6b5680ac780
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Apr 16 22:43:30 2009 +0000
description:
Update to 0.3.3 with post-release patches for easier installation and
a bug fix.
Set LICENSE.
Diffuse 0.3.3 - 2009-04-13
- fixed a bug handling the backspace key with the cursor in the first column
Diffuse 0.3.2 - 2009-04-13
- POSIX installer with '--destdir=' and '--files-only' options for packagers
- vi-like keybindings for line mode
- '-m' option to open modified files in separate tabs
- 'Merge From Left Then Right' and 'Merge From Right Then Left' menu items
- drag-n-drop support
- preferences for behaviour of tabs
- files with edits now tagged with '*'
- auto indent
- 'Open File In New Tab...' and 'Open Modified Files...' menu items
- 'Save All' menu item
- mac-style line ending support
- new end of line display behaviour
- improved organisation of menu items
- button bar no longer grabs keyboard focus
- removed dependence on urllib module
- errors are now reported on stderr
- removed TODO list
- minor bug fixes
diffstat:
devel/diffuse/Makefile | 42 +++-------------
devel/diffuse/distinfo | 12 ++--
devel/diffuse/patches/patch-aa | 22 ++++----
devel/diffuse/patches/patch-ab | 100 +++++++++++++++++++++++++++++++++++++++++
devel/diffuse/patches/patch-ac | 10 ++++
5 files changed, 137 insertions(+), 49 deletions(-)
diffs (235 lines):
diff -r b0e80b15d7d6 -r e6b5680ac780 devel/diffuse/Makefile
--- a/devel/diffuse/Makefile Thu Apr 16 22:25:40 2009 +0000
+++ b/devel/diffuse/Makefile Thu Apr 16 22:43:30 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/04/06 10:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/04/16 22:43:30 wiz Exp $
#
-DISTNAME= diffuse-0.3.1
+DISTNAME= diffuse-0.3.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=diffuse/}
EXTRACT_SUFX= .tar.bz2
@@ -10,51 +10,27 @@
HOMEPAGE= http://diffuse.sourceforge.net/
COMMENT= Graphical tool for merging and comparing text files
+LICENSE= gnu-gpl-v2
+
PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= # none
USE_DIRS= xdg-1.4 gnome2-1.6
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/applications
-INSTALLATION_DIRS+= share/diffuse/syntax share/examples/diffuse
-INSTALLATION_DIRS+= share/gnome/help/diffuse share/pixmaps
-INSTALLATION_DIRS+= share/gnome/help/diffuse/C share/omf/diffuse
-
CONF_FILES+= ${PREFIX}/share/examples/diffuse/diffuserc \
${PKG_SYSCONFDIR}/diffuserc
PYTHON_VERSIONS_ACCEPTED= 25 24
-REPLACE_PYTHON= src/usr/bin/diffuse
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths+= src/etc/diffuserc
-SUBST_FILES.paths+= src/usr/bin/diffuse
-SUBST_FILES.paths+= src/usr/share/omf/diffuse/diffuse-C.omf
-SUBST_FILES.paths+= src/usr/share/man/man1/diffuse.1
-SUBST_SED.paths+= -e "s,/usr,${PREFIX},"
-SUBST_SED.paths+= -e "s,/etc,${PKG_SYSCONFDIR},"
-SUBST_STAGE.paths= post-patch
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
do-build:
# nothing
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/diffuse ${DESTDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/diffuse.png \
- ${DESTDIR}${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/diffuse/C/diffuse.xml \
- ${DESTDIR}${PREFIX}/share/gnome/help/diffuse/C
- ${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/diffuse/diffuse-C.omf \
- ${DESTDIR}${PREFIX}/share/omf/diffuse
- ${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/diffuse.desktop \
- ${DESTDIR}${PREFIX}/share/applications
- ${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/diffuse.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA} ${WRKSRC}/src/usr/share/diffuse/syntax/* \
- ${DESTDIR}${PREFIX}/share/diffuse/syntax
- ${INSTALL_DATA} ${WRKSRC}/src/etc/diffuserc \
- ${DESTDIR}${PREFIX}/share/examples/diffuse
+ cd ${WRKSRC} && ${PYTHONBIN} ./install.py --destdir=${DESTDIR} \
+ --examplesdir=${PREFIX}/share/examples/diffuse \
+ --mandir=${PREFIX}/${PKGMANDIR} \
+ --prefix=${PREFIX} --sysconfdir=${PKG_SYSCONFDIR} \
+ --pythonbin=${PYTHONBIN} --files-only
.include "../../lang/python/application.mk"
.include "../../mk/omf-scrollkeeper.mk"
diff -r b0e80b15d7d6 -r e6b5680ac780 devel/diffuse/distinfo
--- a/devel/diffuse/distinfo Thu Apr 16 22:25:40 2009 +0000
+++ b/devel/diffuse/distinfo Thu Apr 16 22:43:30 2009 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/04/06 10:13:28 wiz Exp $
+$NetBSD: distinfo,v 1.4 2009/04/16 22:43:30 wiz Exp $
-SHA1 (diffuse-0.3.1.tar.bz2) = e7cfcb8c066c0f1ac57425966668f3e8a5d76c3a
-RMD160 (diffuse-0.3.1.tar.bz2) = 7fc0f785794923994efef5dfd15185ad6d0310aa
-Size (diffuse-0.3.1.tar.bz2) = 88923 bytes
-SHA1 (patch-aa) = 1a98c5d6b9b61ee611ad8748bdb7d8f531bf286e
+SHA1 (diffuse-0.3.3.tar.bz2) = e9c19fd00c76ff9d837190621579500bffe5ed03
+RMD160 (diffuse-0.3.3.tar.bz2) = 6a879d5aa5b10fd42ff729f56363eba0ae210df7
+Size (diffuse-0.3.3.tar.bz2) = 96642 bytes
+SHA1 (patch-aa) = b6cfd3f8676afecef2ee62cb1e51da509ebaaec6
+SHA1 (patch-ab) = cb4621e8dcf2e3156cee1c9487b705e6ac5d8cfb
+SHA1 (patch-ac) = 743def25aa7d4748fee16dfaa3aed0ccd034410e
diff -r b0e80b15d7d6 -r e6b5680ac780 devel/diffuse/patches/patch-aa
--- a/devel/diffuse/patches/patch-aa Thu Apr 16 22:25:40 2009 +0000
+++ b/devel/diffuse/patches/patch-aa Thu Apr 16 22:43:30 2009 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2009/04/06 10:13:28 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2009/04/16 22:43:31 wiz Exp $
---- src/usr/bin/diffuse.orig 2009-03-30 09:58:33.000000000 +0000
+--- src/usr/bin/diffuse.orig 2009-04-13 22:24:24.000000000 +0000
+++ src/usr/bin/diffuse
-@@ -100,7 +100,7 @@ import shlex
- import stat
- import string
- import subprocess
--import urllib
-+#import urllib
- import webbrowser
-
- # platform tests
+@@ -1296,7 +1296,7 @@ class VCSs:
+ if len(s) > 2 and s[0] in 'ACMR':
+ k = os.path.join(self.root, prefs.convertToNativePath(s[2:]))
+ if not isabs:
+- k = replpath(pwd, k)
++ k = relpath(pwd, k)
+ r[k] = s[0]
+ for k in sorted(r.keys()):
+ v = r[k]
diff -r b0e80b15d7d6 -r e6b5680ac780 devel/diffuse/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/diffuse/patches/patch-ab Thu Apr 16 22:43:30 2009 +0000
@@ -0,0 +1,100 @@
+$NetBSD: patch-ab,v 1.1 2009/04/16 22:43:31 wiz Exp $
+
+--- install.py.orig 2009-04-13 22:24:25.000000000 +0000
++++ install.py
+@@ -39,7 +39,12 @@ if os.name == 'nt':
+ os.umask(stat.S_IWGRP | stat.S_IWOTH)
+
+ # option defaults
+-options = { 'destdir': '/', 'prefix': '/usr/local/', 'sysconfdir': '/etc/', 'python-interpreter': '/usr/bin/env python' }
++options = { 'destdir': '/',
++ 'prefix': '/usr/local/',
++ 'sysconfdir': '/etc/',
++ 'examplesdir': '${sysconfdir}',
++ 'mandir': '${prefix}/share/man/',
++ 'pythonbin': '/usr/bin/env python' }
+ install = True
+ files_only = False
+
+@@ -68,12 +73,20 @@ Options:
+ directory for installing read-only single-machine data
+ default: %s
+
+- --python-interpreter=PATH
++ --examplesdir=PATH
++ directory for example configuration files
++ default: %s
++
++ --mandir=PATH
++ directory for man pages
++ default: %s
++
++ --pythonbin=PATH
+ command for python interpreter
+ default: %s
+
+ --files-only
+- only install/remove files; skip the post install/removal tasks""" % (app_path, options['destdir'], options['prefix'], options['sysconfdir'], options['python-interpreter'])
++ only install/remove files; skip the post install/removal tasks""" % (app_path, options['destdir'], options['prefix'], options['sysconfdir'], options['examplesdir'], options['mandir'],
options['pythonbin'])
+ sys.exit(0)
+
+ # returns the list of components used in a path
+@@ -149,8 +162,14 @@ for arg in sys.argv[1:]:
+ logError('Unknown option "%s".' % (arg, ))
+ sys.exit(1)
+
++# expand variables
++for s in 'sysconfdir', 'examplesdir', 'mandir':
++ for k in 'prefix', 'sysconfdir':
++ if s != k:
++ options[s] = options[s].replace('${%s}' % (k, ), options[k])
++
+ # validate inputs
+-for opt in 'prefix', 'sysconfdir':
++for opt in 'prefix', 'sysconfdir', 'examplesdir', 'mandir':
+ p = options[opt]
+ c = components(p)
+ if os.pardir in c or os.curdir in c:
+@@ -163,7 +182,9 @@ for opt in 'prefix', 'sysconfdir':
+ destdir = options['destdir']
+ prefix = options['prefix']
+ sysconfdir = options['sysconfdir']
+-python = options['python-interpreter']
++examplesdir = options['examplesdir']
++mandir = options['mandir']
++pythonbin = options['pythonbin']
+
+ # tell the user what we are about to do
+ if install:
+@@ -174,21 +195,27 @@ print '''Performing %s with:
+ destdir=%s
+ prefix=%s
+ sysconfdir=%s
+- python-interpreter=%s''' % (stage, destdir, prefix, sysconfdir, python)
++ examplesdir=%s
++ mandir=%s
++ pythonbin=%s''' % (stage, destdir, prefix, sysconfdir, examplesdir, mandir, pythonbin)
+
+ # install files to prefix
+ processFiles(install, destdir, prefix, 'src/usr', {
+- 'bin/diffuse': [ ("'../../etc/diffuserc'", repr(relpath(os.path.join(prefix, 'bin'), os.path.join(sysconfdir, 'diffuserc')))), ('/usr/bin/env python', python) ],
++ 'bin/diffuse': [ ("'../../etc/diffuserc'", repr(relpath(os.path.join(prefix, 'bin'), os.path.join(sysconfdir, 'diffuserc')))), ('/usr/bin/env python', pythonbin) ],
+ 'share/applications/diffuse.desktop': None,
+ 'share/diffuse/syntax/*.syntax': None,
+ 'share/gnome/help/diffuse/C/diffuse.xml': [ ('/usr/', prefix), ('/etc/', sysconfdir) ],
+- 'share/man/man1/diffuse.1': [ ('/usr/', prefix), ('/etc/', sysconfdir) ],
+ 'share/omf/diffuse/diffuse-C.omf': [ ('/usr/', prefix) ],
+ 'share/pixmaps/diffuse.png': None
+ })
+
++# install manual
++processFiles(install, destdir, mandir, 'src/usr/share/man', {
++ 'man1/diffuse.1': [ ('/usr/', prefix), ('/etc/', sysconfdir) ]
++ })
++
+ # install files to sysconfdir
+-processFiles(install, destdir, sysconfdir, 'src/etc', { 'diffuserc': [ ('../usr', relpath(sysconfdir, prefix)) ] })
++processFiles(install, destdir, examplesdir, 'src/etc', { 'diffuserc': [ ('/etc/', sysconfdir), ('../usr', relpath(sysconfdir, prefix)) ] })
+
+ if not install:
+ # remove directories we own
diff -r b0e80b15d7d6 -r e6b5680ac780 devel/diffuse/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/diffuse/patches/patch-ac Thu Apr 16 22:43:30 2009 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 2009/04/16 22:43:31 wiz Exp $
+
+--- src/etc/diffuserc.orig 2009-04-13 22:24:25.000000000 +0000
++++ src/etc/diffuserc
+@@ -1,4 +1,4 @@
+-# initialisation file for diffuse
++# /etc/diffuserc: System-wide initialisation file for Diffuse
+ #
+ # Copyright (C) 2006-2009 Derrick Moser <derrick_moser%yahoo.com@localhost>
+
Home |
Main Index |
Thread Index |
Old Index