Update to 15.5:

(2003/08/14 - broeker) Cleaned up man page, INSTALL and TODO files.
(2003/08/14 - broeker) Have configure check for <regex.h>.  Bail out if none
	               found.
(2003/08/14 - broeker) New options --help and --version.
(2003/06/12 - broeker) New option -v to output progress updates even in
		       line mode.  To be used by interface kscope.
(2003/06/02 - broeker) Use the basename of files only to test for SCCS/RCS
	               files in -R traversal.
(2003/04/29 - broeker) Check that a src file is a regular file before trying to
	               scan it.  Change from S_IFDIR/S_IFREG bit tests to
		       macros S_ISDIR/S_ISREG.
(2003/03/05 - broeker) Remove '-y' option from pipe call to utility "sort".
	               It's long since deprecated, and some modern versions
		       will barf seeing it.
(2003/03/02 - broeker) Don't restrict to 14 character filenames any longer.
(2003/01/23 - broeker) Update to latest auto* tools.  First step towards
                       integration of GNOME GUI version.
(2002/12/11 - broeker) Get rid of deprecated ={...} style actions in egrep.y.
	               Use plain {...} instead.
(2002/10/29 - broeker) Fix bug #588671: disprefs was still 0 if only 1 very
	               long reference output shown by curses display.
(2002/08/27 - broeker) Fix bug #600494: use mygetenv() for HOME, and provide
	               a fall-back if it's not there.

8 files changed, 214 insertions, 160 deletions

diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index a22ff47ce7e..c230861bf6e 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2005/09/20 03:52:01 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/10/03 15:00:12 wiz Exp $
 
-DISTNAME=	cscope-15.4
-PKGREVISION=	4
+DISTNAME=	cscope-15.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cscope/}
 
diff --git a/devel/cscope/distinfo b/devel/cscope/distinfo
index 86f71182c87..b22a174df9f 100644
--- a/devel/cscope/distinfo
+++ b/devel/cscope/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 22:24:11 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/10/03 15:00:12 wiz Exp $
 
-SHA1 (cscope-15.4.tar.gz) = 4b70bc0b3c87e5b3f032f9bd93af09ac861ca539
-RMD160 (cscope-15.4.tar.gz) = d833a25783212ce9169be124608046e7577e34ae
-Size (cscope-15.4.tar.gz) = 224057 bytes
-SHA1 (patch-aa) = 0212dd5ee9777bb2987cc57dca3747299b065f4f
-SHA1 (patch-ab) = 66042af02a5af64111a914aebcb4d7a74f421442
-SHA1 (patch-ac) = 46fb2edc1ddec03c0ac50f87acde2b59f907e12b
-SHA1 (patch-ad) = b3975c7abfcbd2081fc63b9857b0f162400dc075
-SHA1 (patch-ae) = b57c9bc91a88064dfa8dcb7592cd862eb926c7f1
-SHA1 (patch-af) = 7a2905d1d29b06b83684cbd7afdd8fc435cd8ef2
+SHA1 (cscope-15.5.tar.gz) = 2e8e66735254328399dc50757b270bcc3e9002d3
+RMD160 (cscope-15.5.tar.gz) = 30623f07043abc90d76b384c407abe5813a8a716
+Size (cscope-15.5.tar.gz) = 243793 bytes
+SHA1 (patch-ac) = 40a69af0eb5419de827b490c960803a736040f2c
+SHA1 (patch-ad) = 7e0f25b67f3476ac90b7541595649d6a6bf65aa9
+SHA1 (patch-af) = fbccbdcbf195a5852ff35be36446c471daf36cd5
diff --git a/devel/cscope/patches/patch-aa b/devel/cscope/patches/patch-aa
deleted file mode 100644
index 865739e5cc1..00000000000
--- a/devel/cscope/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2002/06/12 13:16:50 seb Exp $
-
---- configure.in.orig	Mon Jul  2 17:48:55 2001
-+++ configure.in
-@@ -52,8 +52,6 @@
- dnl 
- # ACNU_PROG_LEX fm AC_PROG_LEX 
- # -----------  
--dnl chg: probes for lib in /usr/local/lib
--dnl sheesh you'd have thought that this was obvious enough to be done anyway
- AC_DEFUN(ACNU_PROG_LEX,[
- dnl   autoconf-2.14a
- dnl    AH_CHECK_LIB(fl)dnl
-@@ -65,9 +63,7 @@
-       flex*) ac_lib=fl ;;
-       *) ac_lib=l ;;
-       esac
--      LDFLAGS='-L/usr/local/lib'
--      AC_CHECK_LIB($ac_lib, yywrap, LEXLIB="-L/usr/local/lib -l$ac_lib")
--      LDFLAGS=
-+      AC_CHECK_LIB($ac_lib, yywrap, LEXLIB="-l$ac_lib")
-     fi
-     AC_SUBST(LEXLIB)
- ])
diff --git a/devel/cscope/patches/patch-ab b/devel/cscope/patches/patch-ab
deleted file mode 100644
index 9a08f3b34c4..00000000000
--- a/devel/cscope/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2003/07/12 07:04:33 wiz Exp $
-
---- configure.orig	Sun Jul 28 18:50:35 2002
-+++ configure
-@@ -2431,7 +2431,6 @@ fi
-       flex*) ac_lib=fl ;;
-       *) ac_lib=l ;;
-       esac
--      LDFLAGS='-L/usr/local/lib'
-       as_ac_Lib=`echo "ac_cv_lib_$ac_lib''_yywrap" | $as_tr_sh`
- echo "$as_me:2436: checking for yywrap in -l$ac_lib" >&5
- echo $ECHO_N "checking for yywrap in -l$ac_lib... $ECHO_C" >&6
-@@ -2483,10 +2482,9 @@ fi
- echo "$as_me:2483: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  LEXLIB="-L/usr/local/lib -l$ac_lib"
-+  LEXLIB="-l$ac_lib"
- fi
- 
--      LDFLAGS=
-     fi
- 
-             echo "$as_me:2492: checking lex output file root" >&5
diff --git a/devel/cscope/patches/patch-ac b/devel/cscope/patches/patch-ac
index cd4a4001a3b..4792b5be5b5 100644
--- a/devel/cscope/patches/patch-ac
+++ b/devel/cscope/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2001/10/03 14:57:21 seb Exp $
+$NetBSD: patch-ac,v 1.6 2005/10/03 15:00:12 wiz Exp $
 
---- contrib/Makefile.am.orig	Mon Jul  2 17:54:46 2001
+--- contrib/Makefile.am.orig	2001-07-18 15:48:55.000000000 +0200
 +++ contrib/Makefile.am
 @@ -1,6 +1,7 @@
  ## Process this file with automake to produce Makefile.in
diff --git a/devel/cscope/patches/patch-ad b/devel/cscope/patches/patch-ad
index 3dc6220c706..d90da8834bc 100644
--- a/devel/cscope/patches/patch-ad
+++ b/devel/cscope/patches/patch-ad
@@ -1,116 +1,235 @@
-$NetBSD: patch-ad,v 1.4 2003/07/12 07:04:33 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2005/10/03 15:00:12 wiz Exp $
 
---- contrib/Makefile.in.orig	Sun Jul 28 18:58:23 2002
+--- contrib/Makefile.in.orig	2003-09-04 18:51:25.000000000 +0200
 +++ contrib/Makefile.in
-@@ -71,13 +71,13 @@ PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- YACC = @YACC@
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.7.2 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
  
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  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.
+@@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -35,7 +34,29 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++subdir = contrib
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++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@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -99,7 +120,10 @@ ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
++am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -122,6 +146,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -129,18 +154,8 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
 -bin_SCRIPTS = ocs
+-
 +pkgdata_DATA = ocs
- 
  EXTRA_DIST = ocs README xcscope webcscope
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
--SCRIPTS =  $(bin_SCRIPTS)
-+DATA =  $(pkgdata_DATA)
- 
- DIST_COMMON =  README Makefile.am Makefile.in
+-subdir = contrib
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SCRIPTS = $(bin_SCRIPTS)
+-
+-DIST_SOURCES =
+-DIST_COMMON = README Makefile.am Makefile.in
+ all: all-am
  
-@@ -89,30 +89,30 @@ GZIP_ENV = --best
- all: all-redirect
  .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- 
+@@ -149,37 +164,30 @@ $(srcdir)/Makefile.in:  Makefile.am  $(t
+ 	  $(AUTOMAKE) --gnu  contrib/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 -install-binSCRIPTS: $(bin_SCRIPTS)
++uninstall-info-am:
 +install-pkgdataDATA: $(pkgdata_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(bindir)
 -	@list='$(bin_SCRIPTS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
--	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
--	  else if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
--	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
--	  else :; fi; fi; \
-+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
++	test -z "$(pkgdatadir)" || $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
 +	@list='$(pkgdata_DATA)'; for p in $$list; do \
-+	  if test -f $(srcdir)/$$p; then \
-+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
-+	  else if test -f $$p; then \
-+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
-+	  fi; fi; \
+ 	  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
  
 -uninstall-binSCRIPTS:
 +uninstall-pkgdataDATA:
  	@$(NORMAL_UNINSTALL)
--	list='$(bin_SCRIPTS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	list='$(pkgdata_DATA)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
+-	@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:
  tags: TAGS
  TAGS:
-@@ -123,6 +123,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
- subdir = contrib
+ 
+ ctags: CTAGS
+ CTAGS:
+ 
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-
+-top_distdir = ..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
  
  distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu contrib/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -141,23 +146,23 @@ check-am: all-am
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -210,11 +218,11 @@ distdir: $(DISTFILES)
+ 	done
+ check-am: all-am
  check: check-am
- installcheck-am:
- installcheck: installcheck-am
--install-exec-am: install-binSCRIPTS
-+install-exec-am:
+-all-am: Makefile $(SCRIPTS)
+-
++all-am: Makefile $(DATA)
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-
++	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
++	  test -z "$$dir" || $(mkinstalldirs) "$$dir"; \
++	done
+ install: install-am
  install-exec: install-exec-am
+ install-data: install-data-am
+@@ -226,7 +234,7 @@ install-am: all-am
+ installcheck: installcheck-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+-	  INSTALL_STRIP_FLAG=-s \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+@@ -234,7 +242,7 @@ mostlyclean-generic:
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -244,20 +252,22 @@ clean: clean-am
+ clean-am: clean-generic mostlyclean-am
+ 
+ distclean: distclean-am
+-
++	-rm -f Makefile
+ distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+ dvi-am:
+ 
++html: html-am
++
+ info: info-am
+ 
+ info-am:
  
 -install-data-am:
 +install-data-am: install-pkgdataDATA
- install-data: install-data-am
  
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
--uninstall-am: uninstall-binSCRIPTS
-+uninstall-am: uninstall-pkgdataDATA
- uninstall: uninstall-am
--all-am: Makefile $(SCRIPTS)
-+all-am: Makefile $(DATA)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+	$(mkinstalldirs)  $(DESTDIR)$(pkgdatadir)
+-install-exec-am: install-binSCRIPTS
++install-exec-am:
  
+ install-info: install-info-am
  
- mostlyclean-generic:
-@@ -187,7 +192,7 @@ maintainer-clean-am:  maintainer-clean-g
+@@ -266,7 +276,7 @@ install-man:
+ installcheck-am:
  
  maintainer-clean: maintainer-clean-am
+-
++	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-am
+@@ -281,16 +291,16 @@ ps: ps-am
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binSCRIPTS uninstall-info-am
++uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+ 
+ .PHONY: all all-am check check-am clean clean-generic distclean \
+-	distclean-generic distdir dvi dvi-am info info-am install \
+-	install-am install-binSCRIPTS install-data install-data-am \
+-	install-exec install-exec-am install-info install-info-am \
+-	install-man install-strip installcheck installcheck-am \
++	distclean-generic distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-pkgdataDATA install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+-	uninstall-am uninstall-binSCRIPTS uninstall-info-am
++	uninstall-am uninstall-info-am uninstall-pkgdataDATA
  
--.PHONY: uninstall-binSCRIPTS install-binSCRIPTS tags distdir info-am \
-+.PHONY: uninstall-pkgdataDATA install-pkgdataDATA tags distdir info-am \
- info dvi-am dvi check check-am installcheck-am installcheck \
- install-exec-am install-exec install-data-am install-data install-am \
- install uninstall-am uninstall all-redirect all-am all installdirs \
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/cscope/patches/patch-ae b/devel/cscope/patches/patch-ae
deleted file mode 100644
index 8e76a3247f3..00000000000
--- a/devel/cscope/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2004/05/05 13:25:27 wiz Exp $
-
---- src/build.c.orig	2001-11-22 18:38:19.000000000 +0100
-+++ src/build.c
-@@ -443,7 +443,7 @@ build(void)
- 		}
- 		(void) fstat(fileno(postings), &statstruct);
- 		(void) fclose(postings);
--		(void) sprintf(sortcommand, "env LC_ALL=C sort -y -T %s %s", tmpdir, temp1);
-+		(void) sprintf(sortcommand, "env LC_ALL=C sort -T %s %s", tmpdir, temp1);
- 		if ((postings = mypopen(sortcommand, "r")) == NULL) {
- 			(void) fprintf(stderr, "cscope: cannot open pipe to sort command\n");
- 			cannotindex();
diff --git a/devel/cscope/patches/patch-af b/devel/cscope/patches/patch-af
index 8440af11c61..fe0977af537 100644
--- a/devel/cscope/patches/patch-af
+++ b/devel/cscope/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2004/12/17 22:29:06 wiz Exp $
+$NetBSD: patch-af,v 1.5 2005/10/03 15:00:12 wiz Exp $
 
---- src/main.c.orig	2002-07-28 17:40:07.000000000 +0200
+--- src/main.c.orig	2003-08-14 16:36:18.000000000 +0200
 +++ src/main.c
-@@ -319,9 +319,32 @@ lastarg:
+@@ -330,9 +330,32 @@ lastarg:
  	}
  
  	/* create the temporary file names */