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.4:
details: https://anonhg.NetBSD.org/pkgsrc/rev/35430f9902a0
branches: trunk
changeset: 396984:35430f9902a0
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Aug 06 21:52:07 2009 +0000
description:
Update to 0.3.4:
Released 2009-07-03
* syntax highlighting for .plist, GLSL, SConscript, and SConstruct files
* status bar now explains how to navigate between modes
* added labels to indicate syntax highlighting rules, encoding, and format
* Subversion 1.6 support
* added Henri Menke's German translation
* added '--examplesdir=' and '--mandir=' options to install.py
* renamed the '--python-interpreter=' installer option to '--pythonbin='
* minor bug fixes
Add an additional post-release fix from upstream (patch-aa).
diffstat:
devel/diffuse/Makefile | 6 +-
devel/diffuse/PLIST | 4 +-
devel/diffuse/distinfo | 12 ++--
devel/diffuse/patches/patch-aa | 23 ++++----
devel/diffuse/patches/patch-ab | 100 -----------------------------------------
devel/diffuse/patches/patch-ac | 10 ----
6 files changed, 23 insertions(+), 132 deletions(-)
diffs (210 lines):
diff -r 39c0eaab0f09 -r 35430f9902a0 devel/diffuse/Makefile
--- a/devel/diffuse/Makefile Thu Aug 06 21:45:02 2009 +0000
+++ b/devel/diffuse/Makefile Thu Aug 06 21:52:07 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/06 21:52:07 wiz Exp $
#
-DISTNAME= diffuse-0.3.3
+DISTNAME= diffuse-0.3.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=diffuse/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@
CONF_FILES+= ${PREFIX}/share/examples/diffuse/diffuserc \
${PKG_SYSCONFDIR}/diffuserc
-PYTHON_VERSIONS_ACCEPTED= 25 24
+PYTHON_VERSIONS_ACCEPTED= 26 25 24
do-build:
# nothing
diff -r 39c0eaab0f09 -r 35430f9902a0 devel/diffuse/PLIST
--- a/devel/diffuse/PLIST Thu Aug 06 21:45:02 2009 +0000
+++ b/devel/diffuse/PLIST Thu Aug 06 21:52:07 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:48:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/08/06 21:52:07 wiz Exp $
bin/diffuse
man/man1/diffuse.1
share/applications/diffuse.desktop
@@ -8,6 +8,7 @@
share/diffuse/syntax/csharp.syntax
share/diffuse/syntax/css.syntax
share/diffuse/syntax/gettext.syntax
+share/diffuse/syntax/glsl.syntax
share/diffuse/syntax/html.syntax
share/diffuse/syntax/ini.syntax
share/diffuse/syntax/java.syntax
@@ -30,5 +31,6 @@
share/diffuse/syntax/xml.syntax
share/examples/diffuse/diffuserc
share/gnome/help/diffuse/C/diffuse.xml
+share/locale/de/LC_MESSAGES/diffuse.mo
share/omf/diffuse/diffuse-C.omf
share/pixmaps/diffuse.png
diff -r 39c0eaab0f09 -r 35430f9902a0 devel/diffuse/distinfo
--- a/devel/diffuse/distinfo Thu Aug 06 21:45:02 2009 +0000
+++ b/devel/diffuse/distinfo Thu Aug 06 21:52:07 2009 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/04/16 22:43:30 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/08/06 21:52:07 wiz Exp $
-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
+SHA1 (diffuse-0.3.4.tar.bz2) = f221d248b44d978fc031cb739e382d9058ca4efc
+RMD160 (diffuse-0.3.4.tar.bz2) = 54f8ffaed9bc2153e1ed3acb64a3e9fd000ee2a1
+Size (diffuse-0.3.4.tar.bz2) = 102845 bytes
+SHA1 (patch-aa) = d314791a740b878af9041c70920562fa6385708d
diff -r 39c0eaab0f09 -r 35430f9902a0 devel/diffuse/patches/patch-aa
--- a/devel/diffuse/patches/patch-aa Thu Aug 06 21:45:02 2009 +0000
+++ b/devel/diffuse/patches/patch-aa Thu Aug 06 21:52:07 2009 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2009/04/16 22:43:31 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2009/08/06 21:52:07 wiz Exp $
---- src/usr/bin/diffuse.orig 2009-04-13 22:24:24.000000000 +0000
+--- src/usr/bin/diffuse.orig 2009-07-03 23:11:09.000000000 +0000
+++ src/usr/bin/diffuse
-@@ -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]
+@@ -3368,7 +3368,9 @@ class FileDiffViewer(gtk.Table):
+ # middle mouse button, paste primary selection
+ if self.mode == CHAR_MODE and f == self.current_pane:
+ self.button_press(f, x, y, False)
++ self.openUndoBlock()
+ gtk.clipboard_get(gtk.gdk.SELECTION_PRIMARY).request_text(self.receive_clipboard_text_cb)
++ self.closeUndoBlock()
+ elif event.button == 3:
+ # right mouse button, raise context sensitive menu
+ can_align = (self.mode == LINE_MODE and (f == self.current_pane + 1 or f == self.current_pane - 1))
diff -r 39c0eaab0f09 -r 35430f9902a0 devel/diffuse/patches/patch-ab
--- a/devel/diffuse/patches/patch-ab Thu Aug 06 21:45:02 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-$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 39c0eaab0f09 -r 35430f9902a0 devel/diffuse/patches/patch-ac
--- a/devel/diffuse/patches/patch-ac Thu Aug 06 21:45:02 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$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