Update to 5.6:

ctags-5.6 (Mon May 29 2006)
* Reformatted code for independence of tab stop setting.
* Changed default configuration to disable installation of etags links.
* Changed --langmap to first unmap each supplied extension from other languages.
* Added support for ASP constants [ASP, Patch #961842].
* Added support for GNU make extensions [Make].
* Added .mk as extension recognized as a make language file [Make].
* Added missing help for list-maps options [Bug #1201826].
* Added new extension field "typeref" [thanks to Bram Moolenaar].
* Extended functionality of Ruby parser with patch from Elliot Hughes [Ruby].
* Fixed creation of TAGS file with etags-include but no files [Bug #941233].
* Fixed problem reading last line of list file (-L) without final newline.
* Fixed infinite loop that could occur on files without final newline [C, Java].
* Fixed incorrect tag for first field of table [SQL].
* Fixed missing tags for functions beginning with underscore [Sh].
* Fixed missing tags for functions with variable arg list [C, Bug #1201689].
* Fixed parsing problem with parentheses in argument list [C, Bug #1085585].
* Fixed problem in preprocessor directive handling [C, Bug #1086609].

4 files changed, 13 insertions, 90 deletions

diff --git a/devel/exctags/Makefile b/devel/exctags/Makefile
index 20b4a4e4074..97067a54420 100644
--- a/devel/exctags/Makefile
+++ b/devel/exctags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/04/13 23:36:20 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/23 00:14:09 wiz Exp $
 #
 
-DISTNAME=	ctags-5.5.4
+DISTNAME=	ctags-5.6
 PKGNAME=	ex${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ctags/}
@@ -18,6 +18,8 @@ CONFIGURE_ARGS+=	--with-readlib
 CONFIGURE_ARGS+=	--enable-custom-config=${PKG_SYSCONFDIR}/ctags.conf
 
 CPPFLAGS+=		-DETAGS="\"exetags\""
+# Makefile ignores CPPFLAGS
+CFLAGS+=		${CPPFLAGS}
 
 SUBST_CLASSES+=		man
 SUBST_STAGE.man=	post-patch
diff --git a/devel/exctags/PLIST b/devel/exctags/PLIST
index eee5e5e3cfb..9f142dd06ae 100644
--- a/devel/exctags/PLIST
+++ b/devel/exctags/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/13 15:23:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/02/23 00:14:09 wiz Exp $
 bin/exctags
-bin/exetags
 include/readtags.h
 lib/readtags.o
 man/man1/exctags.1
-man/man1/exetags.1
diff --git a/devel/exctags/distinfo b/devel/exctags/distinfo
index ea36089bfde..42aae94cb82 100644
--- a/devel/exctags/distinfo
+++ b/devel/exctags/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 22:24:13 agc Exp $
+$NetBSD: distinfo,v 1.9 2007/02/23 00:14:09 wiz Exp $
 
-SHA1 (ctags-5.5.4.tar.gz) = 1f912ef66c44d5527ce44c447a13fc33188bf16e
-RMD160 (ctags-5.5.4.tar.gz) = 0a50cd6009c4d383b9820307be7089b050ce3a93
-Size (ctags-5.5.4.tar.gz) = 260962 bytes
-SHA1 (patch-aa) = 1e5bf6c9df7b4d905c18ad6512dd9f54ca1e1ce2
+SHA1 (ctags-5.6.tar.gz) = 930afaa138624717393fe475201f795251bd5e5e
+RMD160 (ctags-5.6.tar.gz) = 9221bcc105f302b6e05f599914f5d4e24cda62f0
+Size (ctags-5.6.tar.gz) = 267019 bytes
+SHA1 (patch-aa) = 5c8fd497146cf49925210d551072e230b3b06a74
diff --git a/devel/exctags/patches/patch-aa b/devel/exctags/patches/patch-aa
index 51918c194cf..f456915110c 100644
--- a/devel/exctags/patches/patch-aa
+++ b/devel/exctags/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2004/06/03 15:20:59 uebayasi Exp $
+$NetBSD: patch-aa,v 1.5 2007/02/23 00:14:09 wiz Exp $
 
---- Makefile.in.orig	2004-06-03 23:33:10.000000000 +0900
-+++ Makefile.in	2004-06-03 23:37:34.000000000 +0900
+--- Makefile.in.orig	2003-07-27 22:09:58.000000000 +0000
++++ Makefile.in
 @@ -6,8 +6,8 @@
  # These are the names of the installed programs, in case you wish to change
  # them.
@@ -13,80 +13,3 @@ $NetBSD: patch-aa,v 1.4 2004/06/03 15:20:59 uebayasi Exp $
  
  # Set this to the path to your shell (must run Bourne shell commands).
  #
-@@ -28,6 +28,7 @@
- CC	= @CC@
- DEFS	= @DEFS@
- CFLAGS	= @CFLAGS@
-+CPPFLAGS	= @CPPFLAGS@
- LDFLAGS	= @LDFLAGS@
- LIBS	= @LIBS@
- EXEEXT	= @EXEEXT@
-@@ -59,9 +60,9 @@
- 
- VPATH	= $(srcdir)
- 
--INSTALL		= cp
--INSTALL_PROG	= $(INSTALL)
--INSTALL_DATA	= $(INSTALL)
-+INSTALL_PROGRAM	= $(BSD_INSTALL_PROGRAM)
-+INSTALL_MAN	= $(BSD_INSTALL_MAN)
-+INSTALL_DATA	= $(BSD_INSTALL_DATA)
- 
- READ_LIB = readtags.$(OBJEXT)
- READ_INC = readtags.h
-@@ -103,14 +104,14 @@
- 	$(CC) -I. -I$(srcdir) $(DEFS) -DDEBUG -g $(LDFLAGS) -o $@ debug.c $(SOURCES)
- 
- readtags$(EXEEXT): readtags.c readtags.h
--	$(CC) -DREADTAGS_MAIN -I. -I$(srcdir) $(DEFS) $(CFLAGS) $(LDFLAGS) -o $@ readtags.c
-+	$(CC) -DREADTAGS_MAIN -I. -I$(srcdir) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ readtags.c
- 
- ETYPEREF_OBJS = etyperef.o keyword.o routines.o strlist.o vstring.o
- etyperef$(EXEEXT): $(ETYPEREF_OBJS)
- 	$(CC) $(LDFLAGS) -o $@ $(ETYPEREF_OBJS)
- 
- etyperef.o: eiffel.c
--	$(CC) -DTYPE_REFERENCE_TOOL -I. -I$(srcdir) $(DEFS) $(CFLAGS) -o $@ -c eiffel.c
-+	$(CC) -DTYPE_REFERENCE_TOOL -I. -I$(srcdir) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ -c eiffel.c
- 
- $(OBJECTS): $(HEADERS) config.h
- 
-@@ -138,7 +139,7 @@
- install-lib: $(DEST_READ_LIB) $(DEST_READ_INC)
- 
- $(DEST_CTAGS): $(CTAGS_EXEC) $(bindir) FORCE
--	$(INSTALL_PROG) $(CTAGS_EXEC) $@  &&  chmod 755 $@
-+	$(INSTALL_PROGRAM) $(CTAGS_EXEC) $@  &&  chmod 755 $@
- 
- $(DEST_ETAGS):
- 	- if [ -x $(DEST_CTAGS) ]; then \
-@@ -153,7 +154,7 @@
- install-eman: $(DEST_EMAN)
- 
- $(DEST_CMAN): $(man1dir) $(MANPAGE) FORCE
--	- $(INSTALL_DATA) $(srcdir)/$(MANPAGE) $@  &&  chmod 644 $@
-+	- $(INSTALL_MAN) $(srcdir)/$(MANPAGE) $@  &&  chmod 644 $@
- 
- $(DEST_EMAN):
- 	- if [ -f $(DEST_CMAN) ]; then \
-@@ -164,10 +165,10 @@
- # install the library
- #
- $(DEST_READ_LIB): $(READ_LIB) $(libdir) FORCE
--	$(INSTALL_PROG) $(READ_LIB) $@  &&  chmod 644 $@
-+	$(INSTALL_DATA) $(READ_LIB) $@  &&  chmod 644 $@
- 
- $(DEST_READ_INC): $(READ_INC) $(incdir) FORCE
--	$(INSTALL_PROG) $(READ_INC) $@  &&  chmod 644 $@
-+	$(INSTALL_DATA) $(READ_INC) $@  &&  chmod 644 $@
- 
- 
- #
-@@ -216,6 +217,6 @@
- # implicit rules
- #
- .c.$(OBJEXT):
--	$(CC) -I. -I$(srcdir) $(DEFS) $(CFLAGS) -c $<
-+	$(CC) -I. -I$(srcdir) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
- 
- # vi:set tabstop=8: