Upgrade to version 15.3

Changes in release 15.3: Improvements, major bug fixes, XEmacs, Vim and web
interface support
Changes in release 15.1: Improvements to interface and major bug fixes

7 files changed, 204 insertions, 51 deletions

diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index 3f53def0c59..a2183309a98 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2001/06/20 03:22:17 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/03 14:57:21 seb Exp $
 
-DISTNAME=	cscope-15.0bl2
-PKGNAME=	cscope-15.0.2
+DISTNAME=	cscope-15.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cscope/}
 
@@ -13,16 +12,24 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK_ONLY=	YES
 
 CONFIGURE_ARGS+=	--with-ncurses=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-flex
 
-# Change references to <curses.h> to <ncurses.h> in the source files.
-NCURSES_SED=		-e "s|<curses.h>|<ncurses.h>|g"
+.include "../../mk/bsd.prefs.mk"
 
-post-extract:
-	cd ${WRKSRC}/src; for file in *.[ch]; do			\
-		${MV} -f $${file} $${file}.presubst;			\
-		${SED} ${NCURSES_SED} $${file}.presubst > $${file};	\
-		${RM} -f $${file}.presubst;				\
-	done
+.if ${OPSYS} == "SunOS"
+BUILD_DEPENDS+=		flex-*:../../devel/flex
+LEX=			${LOCALBASE}/bin/flex
+.endif
+
+CONFIGURE_ENV+=		LEX=${LEX}
+
+# touch some carefully selected auto* tools generated files to avoid
+# unnecessary regen of them after the pkg's patch had been applied
+pre-configure:
+	${TOUCH} ${WRKSRC}/aclocal.m4
+	${TOUCH} ${WRKSRC}/stamp-h.in
+	${TOUCH} ${WRKSRC}/Makefile.in ${WRKSRC}/contrib/Makefile.in \
+		${WRKSRC}/doc/Makefile.in ${WRKSRC}/src/Makefile.in
 
 .include "../../devel/ncurses/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cscope/distinfo b/devel/cscope/distinfo
index f3dedf8ab91..668be6a7963 100644
--- a/devel/cscope/distinfo
+++ b/devel/cscope/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/20 03:19:20 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/10/03 14:57:21 seb Exp $
 
-SHA1 (cscope-15.0bl2.tar.gz) = 982802507baf30ea6efa3f93cc1513fb9d1e39e0
-Size (cscope-15.0bl2.tar.gz) = 131713 bytes
-SHA1 (patch-aa) = 21442af029fba1d0fae2fcccd63cda7df3522fda
-SHA1 (patch-ab) = 35f103aa350b6a2a7f9ed08d1ec6d583bf80900e
+SHA1 (cscope-15.3.tar.gz) = ece72d2ede173dec0536003c4f8ab0fe7b0b3f11
+Size (cscope-15.3.tar.gz) = 196580 bytes
+SHA1 (patch-aa) = 15313e836e264c4a124090c93685d33d8b293326
+SHA1 (patch-ab) = ff72389fbf0d87d1b7eda51297275fc8a213600f
+SHA1 (patch-ac) = 46fb2edc1ddec03c0ac50f87acde2b59f907e12b
+SHA1 (patch-ad) = 4864f8afa7b6090d60d5509d1544b913cb4fcd51
diff --git a/devel/cscope/patches/patch-aa b/devel/cscope/patches/patch-aa
index b085c881587..f4a69769f6c 100644
--- a/devel/cscope/patches/patch-aa
+++ b/devel/cscope/patches/patch-aa
@@ -1,26 +1,30 @@
-$NetBSD: patch-aa,v 1.6 2001/06/20 03:19:21 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2001/10/03 14:57:21 seb Exp $
 
---- configure.orig	Wed May 10 15:39:50 2000
-+++ configure
-@@ -1344,7 +1344,6 @@
+--- configure.in.orig	Mon Jul  2 17:48:55 2001
++++ configure.in
+@@ -48,12 +48,12 @@
+ ])
+ 
+ 
++# configure's patch is hand-trimmed after regen from patched configure.in
++
+ dnl === BEGIN aclocal REPLACEMENT MACROS
+ 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 +65,7 @@
        flex*) ac_lib=fl ;;
        *) ac_lib=l ;;
        esac
 -      LDFLAGS='-L/usr/local/lib'
-       echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
- echo "configure:1350: checking for yywrap in -l$ac_lib" >&5
- ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
-@@ -1380,12 +1379,11 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  LEXLIB="-L/usr/local/lib -l$ac_lib"
-+  LEXLIB="-l$ac_lib"
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
+-      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
index 4e617d50f5e..fb94462b4fe 100644
--- a/devel/cscope/patches/patch-ab
+++ b/devel/cscope/patches/patch-ab
@@ -1,24 +1,37 @@
-$NetBSD: patch-ab,v 1.5 2001/06/20 03:19:21 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/10/03 14:57:21 seb Exp $
 
---- configure.in.orig	Fri May  5 17:09:35 2000
-+++ configure.in
-@@ -52,8 +52,6 @@
- dnl 
+--- configure.orig	Mon Jul  2 17:50:46 2001
++++ configure
+@@ -829,6 +829,8 @@
+ 
+ 
+ 
++# configure's patch is hand-trimmed after regen from patched configure.in
++
  # 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 @@
+ 
+@@ -1344,9 +1346,8 @@
        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")
+       echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
+ echo "configure:1350: checking for yywrap in -l$ac_lib" >&5
+ ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1380,12 +1381,11 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LEXLIB="-L/usr/local/lib -l$ac_lib"
++  LEXLIB="-l$ac_lib"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
 -      LDFLAGS=
-+      AC_CHECK_LIB($ac_lib, yywrap, LEXLIB="-l$ac_lib")
      fi
-     AC_SUBST(LEXLIB)
- ])
+     
+ 
diff --git a/devel/cscope/patches/patch-ac b/devel/cscope/patches/patch-ac
new file mode 100644
index 00000000000..cd4a4001a3b
--- /dev/null
+++ b/devel/cscope/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2001/10/03 14:57:21 seb Exp $
+
+--- contrib/Makefile.am.orig	Mon Jul  2 17:54:46 2001
++++ contrib/Makefile.am
+@@ -1,6 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-bin_SCRIPTS = ocs
++pkgdata_DATA = ocs
++
+ 
+ EXTRA_DIST = ocs README xcscope webcscope
+ 
diff --git a/devel/cscope/patches/patch-ad b/devel/cscope/patches/patch-ad
new file mode 100644
index 00000000000..5de5366f305
--- /dev/null
+++ b/devel/cscope/patches/patch-ad
@@ -0,0 +1,112 @@
+$NetBSD: patch-ad,v 1.3 2001/10/03 14:57:21 seb Exp $
+
+--- contrib/Makefile.in.orig	Mon Jul  2 23:56:55 2001
++++ contrib/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 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.
+@@ -70,20 +70,20 @@
+ VERSION = @VERSION@
+ YACC = @YACC@
+ 
+-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
+ 
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+@@ -95,23 +95,23 @@
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ 
+-install-binSCRIPTS: $(bin_SCRIPTS)
++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)
++	@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; \
+ 	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; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -140,23 +140,23 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+-install-exec-am: install-binSCRIPTS
++install-exec-am:
+ install-exec: install-exec-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)
+ 
+ 
+ mostlyclean-generic:
+@@ -186,7 +186,7 @@
+ 
+ maintainer-clean: maintainer-clean-am
+ 
+-.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 \
diff --git a/devel/cscope/pkg/PLIST b/devel/cscope/pkg/PLIST
index c24748305bd..21bdd15d763 100644
--- a/devel/cscope/pkg/PLIST
+++ b/devel/cscope/pkg/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2000/05/19 11:03:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/10/03 14:57:21 seb Exp $
 bin/cscope
 man/man1/cscope.1
+share/cscope/ocs
+@dirrm share/cscope