[pkgsrc/trunk]: pkgsrc/devel/cscope Update to cscope 15.8a

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/cscope Update to cscope 15.8a
From: asau <asau%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 13:08:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d401d3a2d28
branches:  trunk
changeset: 610441:0d401d3a2d28
user:      asau <asau%pkgsrc.org@localhost>
date:      Thu Oct 25 08:28:20 2012 +0000

description:
Update to cscope 15.8a


Changes since 15.7a

 - Allow usage of function keys ctrl-f and ctrl-b even from result pane.
 - More informative display of position in a multi-screenful result set.
 - Handle source files with freaky large numbers of lines.
 - Search for assignment failed to recognize >>= and <<=,
   incorrectly recognized ~=, and was implemented somewhat clumsily.
 - Added vi plugin to read cscope db's
 - Tolerate C++ :: scope operator inside argument lists, too.
 - Bug fixes.

diffstat:

 devel/cscope/Makefile         |    6 +-
 devel/cscope/distinfo         |   14 +-
 devel/cscope/patches/patch-aa |   18 +--
 devel/cscope/patches/patch-ac |    9 +-
 devel/cscope/patches/patch-ad |  210 +++++++++++++++++++++++++++++++++---------
 5 files changed, 183 insertions(+), 74 deletions(-)

diffs (truncated from 348 to 300 lines):

diff -r 74da27f39aba -r 0d401d3a2d28 devel/cscope/Makefile
--- a/devel/cscope/Makefile     Thu Oct 25 08:03:30 2012 +0000
+++ b/devel/cscope/Makefile     Thu Oct 25 08:28:20 2012 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2010/12/18 13:06:04 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2012/10/25 08:28:20 asau Exp $
 
-DISTNAME=      cscope-15.7a
-PKGREVISION=   1
+DISTNAME=      cscope-15.8a
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cscope/}
-EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://cscope.sourceforge.net/
diff -r 74da27f39aba -r 0d401d3a2d28 devel/cscope/distinfo
--- a/devel/cscope/distinfo     Thu Oct 25 08:03:30 2012 +0000
+++ b/devel/cscope/distinfo     Thu Oct 25 08:28:20 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2009/05/23 09:04:01 tron Exp $
+$NetBSD: distinfo,v 1.20 2012/10/25 08:28:20 asau Exp $
 
-SHA1 (cscope-15.7a.tar.bz2) = f6348694e5443769add851f97fd39365e93dc474
-RMD160 (cscope-15.7a.tar.bz2) = 8bc904f636e8e6ea4542738095183475911858f9
-Size (cscope-15.7a.tar.bz2) = 361214 bytes
-SHA1 (patch-aa) = 40eb37ab0ffdf18830521031b174332bd544f2cb
-SHA1 (patch-ac) = 40a69af0eb5419de827b490c960803a736040f2c
-SHA1 (patch-ad) = 83cfd932c20c5860664ebb40ca0d0945da3f2953
+SHA1 (cscope-15.8a.tar.gz) = 00f76825791b895532778f720c509cd13b9d6846
+RMD160 (cscope-15.8a.tar.gz) = 9536de3b7bdf6dd355dd9c28308457692c9a0b9f
+Size (cscope-15.8a.tar.gz) = 601232 bytes
+SHA1 (patch-aa) = b8f3a2b4f30726a51c8cf676c2accd07bfd5ccb1
+SHA1 (patch-ac) = d548d256e9d7dd26195e37512ccbe9844bf7ace1
+SHA1 (patch-ad) = c64b701d5a06c6b3dffd961a95960f417d9399b1
diff -r 74da27f39aba -r 0d401d3a2d28 devel/cscope/patches/patch-aa
--- a/devel/cscope/patches/patch-aa     Thu Oct 25 08:03:30 2012 +0000
+++ b/devel/cscope/patches/patch-aa     Thu Oct 25 08:28:20 2012 +0000
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2007/01/06 22:45:49 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2012/10/25 08:28:20 asau Exp $
 
---- src/constants.h.orig       2006-09-30 10:13:00.000000000 +0200
+--- src/constants.h.orig       2012-04-07 14:12:07.000000000 +0000
 +++ src/constants.h
-@@ -68,6 +68,7 @@
- #define       NUMLEN  5               /* line number length */
- #define       PATHLEN 250             /* file pathname length */
- #define       PATLEN  250             /* symbol pattern length */
-+#define       TEMPSTRING_LEN 8191     /* max strlen() of the global temp string */
- #define TEMPSTRING_LEN 8191     /* max strlen() of the global temp string */
- #define       REFFILE "cscope.out"    /* cross-reference output file */
- #define       NAMEFILE "cscope.files" /* default list-of-files file */
-@@ -85,6 +86,13 @@
+@@ -85,6 +85,13 @@
  #define NUMLEN_STR STRINGIZE(NUMLEN)
  #define TEMPSTRING_LEN_STR STRINGIZE(TEMPSTRING_LEN)
  
@@ -24,9 +16,9 @@
  /* screen lines */
  #define       FLDLINE (LINES - FIELDS - 1)    /* first input field line */
  #define       MSGLINE 0                       /* message line */
-@@ -103,7 +111,7 @@
+@@ -103,7 +110,7 @@
  #define INCLUDES      8
- #define       FIELDS          9
+ #define       FIELDS          10
  
 -#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__
 +#if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ && !__APPLE__
diff -r 74da27f39aba -r 0d401d3a2d28 devel/cscope/patches/patch-ac
--- a/devel/cscope/patches/patch-ac     Thu Oct 25 08:03:30 2012 +0000
+++ b/devel/cscope/patches/patch-ac     Thu Oct 25 08:28:20 2012 +0000
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.6 2005/10/03 15:00:12 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2012/10/25 08:28:20 asau Exp $
 
---- contrib/Makefile.am.orig   2001-07-18 15:48:55.000000000 +0200
+--- contrib/Makefile.am.orig   2012-08-04 15:11:39.000000000 +0000
 +++ contrib/Makefile.am
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
 -bin_SCRIPTS = ocs
 +pkgdata_DATA = ocs
-+
  
- EXTRA_DIST = ocs README xcscope webcscope
+ EXTRA_DIST = README ocs cctree.txt cctree.vim xcscope webcscope
  
diff -r 74da27f39aba -r 0d401d3a2d28 devel/cscope/patches/patch-ad
--- a/devel/cscope/patches/patch-ad     Thu Oct 25 08:03:30 2012 +0000
+++ b/devel/cscope/patches/patch-ad     Thu Oct 25 08:28:20 2012 +0000
@@ -1,66 +1,154 @@
-$NetBSD: patch-ad,v 1.6 2007/01/06 22:45:49 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2012/10/25 08:28:20 asau Exp $
 
---- contrib/Makefile.in.orig   2006-09-30 17:14:56.000000000 +0200
+--- contrib/Makefile.in.orig   2012-08-04 15:17:12.000000000 +0000
 +++ contrib/Makefile.in
-@@ -50,6 +50,10 @@ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS)
- SOURCES =
- DIST_SOURCES =
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11.3 from Makefile.am.
++# Makefile.in generated by automake 1.12.4 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +15,23 @@
+ @SET_MAKE@
+ 
+ VPATH = @srcdir@
++am__make_dryrun = \
++  { \
++    am__dry=no; \
++    case $$MAKEFLAGS in \
++      *\\[\ \ ]*) \
++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++      *) \
++        for am__flg in $$MAKEFLAGS; do \
++          case $$am__flg in \
++            *=*|--*) ;; \
++            *n*) am__dry=yes; break;; \
++          esac; \
++        done;; \
++    esac; \
++    test $$am__dry = yes; \
++  }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -35,7 +51,8 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = contrib
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++      $(top_srcdir)/mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/configure.in
+@@ -45,6 +62,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
++SOURCES =
++DIST_SOURCES =
++am__can_run_installinfo = \
++  case $$AM_UPDATE_INFO_DIR in \
++    n|no|NO) false;; \
++    *) (install-info --version) >/dev/null 2>&1;; \
++  esac
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -72,10 +96,8 @@ am__uninstall_files_from_dir = { \
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+-am__installdirs = "$(DESTDIR)$(bindir)"
+-SCRIPTS = $(bin_SCRIPTS)
+-SOURCES =
+-DIST_SOURCES =
 +am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-+pkgdataDATA_INSTALL = $(INSTALL_DATA)
 +DATA = $(pkgdata_DATA)
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -148,7 +152,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+ AMTAR = @AMTAR@
+@@ -180,7 +202,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -bin_SCRIPTS = ocs
 +pkgdata_DATA = ocs
- EXTRA_DIST = ocs README xcscope webcscope
+ EXTRA_DIST = README ocs cctree.txt cctree.vim xcscope webcscope
  all: all-am
  
-@@ -182,26 +186,23 @@ $(top_srcdir)/configure:  $(am__configur
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -215,44 +237,35 @@ $(top_srcdir)/configure:  $(am__configur
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
 -install-binSCRIPTS: $(bin_SCRIPTS)
 +install-pkgdataDATA: $(pkgdata_DATA)
        @$(NORMAL_INSTALL)
--      test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
--      @list='$(bin_SCRIPTS)'; for p in $$list; do \
-+      test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+      @list='$(pkgdata_DATA)'; for p in $$list; do \
+-      test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+-      @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
++      @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
++      if test -n "$$list"; then \
++        echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
++        $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
++      fi; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--        if test -f $$d$$p; then \
--          f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
--          echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
--          $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
--        else :; fi; \
-+        f=$(am__strip_dir) \
-+        echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-+        $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
-       done
+-        if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+-      done | \
+-      sed -e 'p;s,.*/,,;n' \
+-          -e 'h;s|.*|.|' \
+-          -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+-      $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+-        { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-          if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+-            if (++n[d] == $(am__install_max)) { \
+-              print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+-          else { print "f", d "/" $$4, $$1 } } \
+-        END { for (d in files) print "f", d, files[d] }' | \
+-      while read type dir files; do \
+-           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-           test -z "$$files" || { \
+-             echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+-             $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+-           } \
+-      ; done
++        echo "$$d$$p"; \
++      done | $(am__base_list) | \
++      while read files; do \
++        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
++        $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
++      done
  
 -uninstall-binSCRIPTS:
 +uninstall-pkgdataDATA:
        @$(NORMAL_UNINSTALL)
--      @list='$(bin_SCRIPTS)'; for p in $$list; do \
--        f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
--        echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
--        rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+      @list='$(pkgdata_DATA)'; for p in $$list; do \
-+        f=$(am__strip_dir) \
-+        echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-+        rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
-       done
--uninstall-info-am:
+-      @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+-      files=`for p in $$list; do echo "$$p"; done | \
+-             sed -e 's,.*/,,;$(transform)'`; \
+-      dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
++      @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
++      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++      dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
  tags: TAGS
  TAGS:
  
-@@ -238,10 +239,10 @@ distdir: $(DISTFILES)
+ ctags: CTAGS
+ CTAGS:
+ 
++cscope cscopelist:
++
+ 
+ distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -286,9 +299,9 @@ distdir: $(DISTFILES)
        done
  check-am: all-am
  check: check-am
@@ -68,21 +156,53 @@
 +all-am: Makefile $(DATA)
  installdirs:
 -      for dir in "$(DESTDIR)$(bindir)"; do \
--        test -z "$$dir" || $(mkdir_p) "$$dir"; \
 +      for dir in "$(DESTDIR)$(pkgdatadir)"; do \
-+        test -z "$$dir" || $(mkdir_p) "$$dir"; \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
  install: install-am
- install-exec: install-exec-am
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/xvidcap Always return a value from non-void functi...
Next by Date: [pkgsrc/trunk]: pkgsrc/emulators/qemu Pass correct path to smbd.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/xvidcap Always return a value from non-void functi...
Next by Thread: [pkgsrc/trunk]: pkgsrc/emulators/qemu Pass correct path to smbd.
Indexes:
Home | Main Index | Thread Index | Old Index