Update to version 1.7.

Changes in version 1.7:
   * scanner for Ruby programming language (thanks to Noritsugu Nakamura
     <nnakamur@mxq.mesh.ne.jp>).
   * fixed explicit rules in Makefiles that generated errors with some
     versions of non-GNU makes.

9 files changed, 33 insertions, 323 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 539f6c1fb53..f0189c60ab0 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/02/16 20:53:47 seb Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/12 01:17:30 seb Exp $
 #
 
-DISTNAME=	source-highlight-1.6.3
+DISTNAME=	source-highlight-1.7
 SVR4_PKGNAME=	srchl
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=source-highlight/}
diff --git a/textproc/source-highlight/PLIST b/textproc/source-highlight/PLIST
index fbd403569ed..9cc0d511715 100644
--- a/textproc/source-highlight/PLIST
+++ b/textproc/source-highlight/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/23 22:27:48 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/12 01:17:30 seb Exp $
 bin/cpp2html
 bin/java2html
 bin/source-highlight
@@ -31,6 +31,7 @@ share/doc/html/source-highlight/test.php3.html
 share/doc/html/source-highlight/test.pl.html
 share/doc/html/source-highlight/test.pm.html
 share/doc/html/source-highlight/test.py.html
+share/doc/html/source-highlight/test.rb.html
 share/doc/html/source-highlight/xhtml.css
 share/doc/source-highlight/COPYING
 share/doc/source-highlight/CREDITS
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 10c7653b939..b2bf8704a24 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.4 2003/02/16 20:53:47 seb Exp $
+$NetBSD: distinfo,v 1.5 2003/06/12 01:17:30 seb Exp $
 
-SHA1 (source-highlight-1.6.3.tar.gz) = 9694286e438b1d3b830bd817a64a2e4ba153355f
-Size (source-highlight-1.6.3.tar.gz) = 548007 bytes
+SHA1 (source-highlight-1.7.tar.gz) = 3bf7b5d91e8426fe7bb1931d56ce2d3c9f5bd035
+Size (source-highlight-1.7.tar.gz) = 570404 bytes
 SHA1 (patch-aa) = 3f124bcdc738222dedd0f961e26da3f374700680
 SHA1 (patch-ab) = ecb8ce16381bd68b55f309a0ae43912319138575
-SHA1 (patch-ac) = 19608fae7404b8ebd86c2dced2771f75831a4ac9
-SHA1 (patch-ad) = 4b65ad0a0a55115c95f0b5321d792056c2cdd2f5
-SHA1 (patch-ae) = 3f8d83bb56fb6c712eeabaf80acf548d7e09d352
-SHA1 (patch-af) = b194198b815fe715e2bec87f36ad52dbd3717361
-SHA1 (patch-ag) = c99bb9f1af070c476f4c5b3c1954b1e8624f6c06
-SHA1 (patch-ah) = ab916790a514f90f9a02d9995698b1f2828cda9e
+SHA1 (patch-ac) = 62475d945664b84eb4a6e43e5cd4c75f9049eefe
+SHA1 (patch-ad) = 7be6c33e8dbcc61f09ede32b25f6c912bb41b4de
+SHA1 (patch-ag) = 09fb79b4f552b7d7c16e48e39391848ab3d9484f
+SHA1 (patch-ah) = 7dadd77fc412ed4fa522ee146bf2eeeecdbe02e6
diff --git a/textproc/source-highlight/patches/patch-ac b/textproc/source-highlight/patches/patch-ac
index 0ad02c04c0e..057b1a65069 100644
--- a/textproc/source-highlight/patches/patch-ac
+++ b/textproc/source-highlight/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-ac,v 1.2 2003/06/12 01:17:31 seb Exp $
 
---- doc/Makefile.am.orig	Sun Oct 13 20:29:36 2002
+--- doc/Makefile.am.orig	2003-03-17 09:38:40.000000000 +0000
 +++ doc/Makefile.am
 @@ -34,7 +34,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html 
               header.html footer.html \
@@ -11,28 +11,3 @@ $NetBSD: patch-ac,v 1.1 2002/12/23 22:27:50 seb Exp $
      Hello.java Hello1.html Hello2.html Hello3.html Hello4.html Hello5.html \
      Hello.java.html Hello_h_f.html Hello_lines.html Hello_xhtml.html \
      Hello_xhtml2.html \
-@@ -48,19 +48,19 @@ man_MANS = @PACKAGE@.1
- # note that $(srcdir) actually points to doc dir
- 
- startapp.cc.html: $(top_srcdir)/src/startapp.cc
--	$(CPP2HTML) --doc $(OUTPUT_HERE) $<
-+	$(CPP2HTML) --doc $(OUTPUT_HERE) $(top_srcdir)/src/startapp.cc
- 
- ChangeLog.html: $(top_srcdir)/ChangeLog
--	$(CHANGELOG2HTML) --doc $(OUTPUT_HERE) $<
-+	$(CHANGELOG2HTML) --doc $(OUTPUT_HERE) $(top_srcdir)/ChangeLog
- 
- flex_scanner.ll.html: $(top_srcdir)/src/flex_scanner.ll
--	$(FLEX2HTML) --doc $(OUTPUT_HERE) $<
-+	$(FLEX2HTML) --doc $(OUTPUT_HERE) $(top_srcdir)/src/flex_scanner.ll
- 
- cmdline.c.html: $(top_srcdir)/src/lib/cmdline.c
--	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/cpp2html.css" --header="$(srcdir)/header.html" --footer="$(srcdir)/footer.html" $<
-+	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/cpp2html.css" --header="$(srcdir)/header.html" --footer="$(srcdir)/footer.html" $(top_srcdir)/src/lib/cmdline.c
- 
- cmdline.h.html: $(top_srcdir)/src/lib/cmdline.h
--	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/mono.css" $<
-+	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/mono.css" $(top_srcdir)/src/lib/cmdline.h
- 
- BUILD_HELLO1 = $(PROGNAME) -i $(srcdir)/Hello.java -o Hello1.html
- BUILD_HELLO2 = $(PROGNAME) --input $(srcdir)/Hello.java --output Hello2.html --doc
diff --git a/textproc/source-highlight/patches/patch-ad b/textproc/source-highlight/patches/patch-ad
index 74dc69e5c1a..7ab9501a8a0 100644
--- a/textproc/source-highlight/patches/patch-ad
+++ b/textproc/source-highlight/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2003/02/16 20:53:48 seb Exp $
+$NetBSD: patch-ad,v 1.3 2003/06/12 01:17:32 seb Exp $
 
---- doc/Makefile.in.orig	2003-02-09 09:22:52.000000000 +0000
+--- doc/Makefile.in.orig	2003-06-12 00:36:17.000000000 +0000
 +++ doc/Makefile.in
 @@ -138,6 +138,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -39,7 +39,7 @@ $NetBSD: patch-ad,v 1.2 2003/02/16 20:53:48 seb Exp $
  $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  doc/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps doc/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps doc/Makefile
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  source-highlight.html: $(top_builddir)/config.status source-highlight.html.in
@@ -104,7 +104,7 @@ $NetBSD: patch-ad,v 1.2 2003/02/16 20:53:48 seb Exp $
  
  uninstall-man: uninstall-man1
  
-@@ -409,29 +412,30 @@ uninstall-man: uninstall-man1
+@@ -409,11 +412,12 @@ uninstall-man: uninstall-man1
  	distclean-generic distdir dvi dvi-am info info-am install \
  	install-am install-data install-data-am install-exec \
  	install-exec-am install-info install-info-am install-man \
@@ -119,26 +119,3 @@ $NetBSD: patch-ad,v 1.2 2003/02/16 20:53:48 seb Exp $
  
  
  # note that $(srcdir) actually points to doc dir
- 
- startapp.cc.html: $(top_srcdir)/src/startapp.cc
--	$(CPP2HTML) --doc $(OUTPUT_HERE) $<
-+	$(CPP2HTML) --doc $(OUTPUT_HERE) $(top_srcdir)/src/startapp.cc
- 
- ChangeLog.html: $(top_srcdir)/ChangeLog
--	$(CHANGELOG2HTML) --doc $(OUTPUT_HERE) $<
-+	$(CHANGELOG2HTML) --doc $(OUTPUT_HERE) $(top_srcdir)/ChangeLog
- 
- flex_scanner.ll.html: $(top_srcdir)/src/flex_scanner.ll
--	$(FLEX2HTML) --doc $(OUTPUT_HERE) $<
-+	$(FLEX2HTML) --doc $(OUTPUT_HERE) $(top_srcdir)/src/flex_scanner.ll
- 
- cmdline.c.html: $(top_srcdir)/src/lib/cmdline.c
--	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/cpp2html.css" --header="$(srcdir)/header.html" --footer="$(srcdir)/footer.html" $<
-+	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/cpp2html.css" --header="$(srcdir)/header.html" --footer="$(srcdir)/footer.html" $(top_srcdir)/src/lib/cmdline.c
- 
- cmdline.h.html: $(top_srcdir)/src/lib/cmdline.h
--	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/mono.css" $<
-+	$(CPP2HTML) --doc $(OUTPUT_HERE) --css="$(srcdir)/mono.css" $(top_srcdir)/src/lib/cmdline.h
- 
- Hello1.html: $(srcdir)/Hello.java
- 	$(BUILD_HELLO1)
diff --git a/textproc/source-highlight/patches/patch-ae b/textproc/source-highlight/patches/patch-ae
deleted file mode 100644
index 1ddf2669a83..00000000000
--- a/textproc/source-highlight/patches/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/12/23 22:27:50 seb Exp $
-
---- src/Makefile.am.orig	Mon Sep 16 21:03:08 2002
-+++ src/Makefile.am
-@@ -42,7 +42,7 @@ cxxconfig.h  \
- source-highlight.cc 
- 
- startapp-cgi.o: $(srcdir)/startapp.cc
--	$(CXXCOMPILE) -DBUILD_AS_CGI -o $@ -c $<
-+	$(CXXCOMPILE) -DBUILD_AS_CGI -o $@ -c $(srcdir)/startapp.cc
- 
- source_highlight_cgi_SOURCES = $(source_highlight_SOURCES)
- 
-@@ -84,21 +84,21 @@ MAINTAINERCLEANFILES = \
- # explicitly tell automake how to build scanners, because it really messes them
- # up otherwise.
- cpp_scanner.cc: $(srcdir)/cpp_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/cpp_scanner.ll
- java_scanner.cc: $(srcdir)/java_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- prolog_scanner.cc: $(srcdir)/prolog_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- perl_scanner.cc: $(srcdir)/perl_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- php3_scanner.cc: $(srcdir)/php3_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- python_scanner.cc: $(srcdir)/python_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- flex_scanner.cc: $(srcdir)/flex_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- changelog_scanner.cc: $(srcdir)/changelog_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- 
- tags:
- 	ctags --c-types='defgmstuv' --recurse=yes $(srcdir)/*
diff --git a/textproc/source-highlight/patches/patch-af b/textproc/source-highlight/patches/patch-af
deleted file mode 100644
index 0f7e8b11cc6..00000000000
--- a/textproc/source-highlight/patches/patch-af
+++ /dev/null
@@ -1,198 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/02/16 20:53:48 seb Exp $
-
---- src/Makefile.in.orig	2003-02-09 09:23:04.000000000 +0000
-+++ src/Makefile.in
-@@ -138,6 +138,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- source_highlightdatadir = @source_highlightdatadir@
- source_highlightdocdir = @source_highlightdocdir@
-+source_highlightdochtmldir = @source_highlightdochtmldir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- 
-@@ -246,19 +247,8 @@ SCRIPTS = $(bin_SCRIPTS)
- 
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Po $(DEPDIR)/getopt1.Po \
--@AMDEP_TRUE@	$(DEPDIR)/yywrap.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/changelog_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/cpp_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/flex_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/java_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/perl_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/php3_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/prolog_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/python_scanner.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/source-highlight.Po
-+depcomp =
-+am__depfiles_maybe =
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -293,7 +283,7 @@ all: $(BUILT_SOURCES)
- .SUFFIXES: .c .cc .ll .o .obj
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  src/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps src/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- java2html: $(top_builddir)/config.status java2html.in
-@@ -357,65 +347,17 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/yywrap.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/changelog_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpp_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flex_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/java_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perl_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/php3_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prolog_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/python_scanner.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/source-highlight.Po@am__quote@
--
--distclean-depend:
--	-rm -rf $(DEPDIR) ./$(DEPDIR)
--
- .c.o:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
--@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
--@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
--@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
--@am__fastdepCC_TRUE@	fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
--@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
--@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
--@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
--@am__fastdepCC_TRUE@	fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
- 
- .cc.o:
--@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
--@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
--@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
--@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
--@am__fastdepCXX_TRUE@	fi
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .cc.obj:
--@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
--@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
--@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
--@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
--@am__fastdepCXX_TRUE@	fi
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
- 
- .ll.cc:
- 	$(SHELL) $(YLWRAP) `test -f '$<' || echo '$(srcdir)/'`$< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-@@ -631,24 +573,24 @@ distclean-generic:
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
--	-rm -f java_scanner.cc
--	-rm -f python_scanner.cc
--	-rm -f prolog_scanner.cc
--	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
--	-rm -f php3_scanner.cc
--	-rm -f perl_scanner.cc
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+	-rm -f php3_scanner.cc
- 	-rm -f flex_scanner.cc
--	-rm -f changelog_scanner.cc
-+	-rm -f prolog_scanner.cc
- 	-rm -f cpp_scanner.cc
-+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-+	-rm -f java_scanner.cc
-+	-rm -f python_scanner.cc
-+	-rm -f changelog_scanner.cc
-+	-rm -f perl_scanner.cc
- clean: clean-recursive
- 
- clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
- 
- distclean: distclean-recursive
- 
--distclean-am: clean-am distclean-compile distclean-depend \
--	distclean-generic distclean-tags
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -691,10 +633,10 @@ uninstall-info: uninstall-info-recursive
- 
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- 	clean-binPROGRAMS clean-generic clean-recursive ctags \
--	ctags-recursive distclean distclean-compile distclean-depend \
--	distclean-generic distclean-recursive distclean-tags distdir \
--	dvi dvi-am dvi-recursive info info-am info-recursive install \
--	install-am install-binPROGRAMS install-binSCRIPTS install-data \
-+	ctags-recursive distclean distclean-compile distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-binPROGRAMS install-binSCRIPTS install-data \
- 	install-data-am install-data-recursive install-exec \
- 	install-exec-am install-exec-recursive install-info \
- 	install-info-am install-info-recursive install-man \
-@@ -710,26 +652,26 @@ uninstall-info: uninstall-info-recursive
- 
- 
- startapp-cgi.o: $(srcdir)/startapp.cc
--	$(CXXCOMPILE) -DBUILD_AS_CGI -o $@ -c $<
-+	$(CXXCOMPILE) -DBUILD_AS_CGI -o $@ -c $(srcdir)/startapp.cc
- 
- # explicitly tell automake how to build scanners, because it really messes them
- # up otherwise.
- cpp_scanner.cc: $(srcdir)/cpp_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/cpp_scanner.ll
- java_scanner.cc: $(srcdir)/java_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- prolog_scanner.cc: $(srcdir)/prolog_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- perl_scanner.cc: $(srcdir)/perl_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- php3_scanner.cc: $(srcdir)/php3_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- python_scanner.cc: $(srcdir)/python_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- flex_scanner.cc: $(srcdir)/flex_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- changelog_scanner.cc: $(srcdir)/changelog_scanner.ll
--	$(LEX) $(LFLAGS) -o $@ $<
-+	$(LEX) $(LFLAGS) -o $@ $(srcdir)/java_scanner.ll
- 
- tags:
- 	ctags --c-types='defgmstuv' --recurse=yes $(srcdir)/*
diff --git a/textproc/source-highlight/patches/patch-ag b/textproc/source-highlight/patches/patch-ag
index d14da41e191..fc094323520 100644
--- a/textproc/source-highlight/patches/patch-ag
+++ b/textproc/source-highlight/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-ag,v 1.2 2003/06/12 01:17:33 seb Exp $
 
---- tests/Makefile.am.orig	Wed Oct 30 18:26:23 2002
+--- tests/Makefile.am.orig	2003-03-21 15:25:46.000000000 +0000
 +++ tests/Makefile.am
-@@ -181,7 +181,7 @@ check_flex: test.l.html
- 	@echo expect no output from diff
- 	diff $(srcdir)/test.l.html test.l.out.html
+@@ -196,7 +196,7 @@ check_ruby: test.rb.html test_comments.r
+ 	diff $(srcdir)/test.rb.html test.rb.out.html
+ 	diff $(srcdir)/test_comments.rb.html test_comments.rb.out.html
  
 -source_highlightdoc_DATA = test.php3.html test.pl.html test.pm.html \
 +source_highlightdochtml_DATA = test.php3.html test.pl.html test.pm.html \
- test.py.html
+ test.py.html test.rb.html
  
  CLEANFILES = *.out.html
diff --git a/textproc/source-highlight/patches/patch-ah b/textproc/source-highlight/patches/patch-ah
index 06a0313fbf2..efe255f756f 100644
--- a/textproc/source-highlight/patches/patch-ah
+++ b/textproc/source-highlight/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2003/02/16 20:53:48 seb Exp $
+$NetBSD: patch-ah,v 1.3 2003/06/12 01:17:33 seb Exp $
 
---- tests/Makefile.in.orig	2003-02-09 09:23:16.000000000 +0000
+--- tests/Makefile.in.orig	2003-06-12 00:36:08.000000000 +0000
 +++ tests/Makefile.in
 @@ -138,6 +138,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -10,16 +10,16 @@ $NetBSD: patch-ah,v 1.2 2003/02/16 20:53:48 seb Exp $
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
-@@ -186,7 +187,7 @@ test.l test.l.html
+@@ -189,7 +190,7 @@ test.rb test_comments.rb test.rb.html te
  
  CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html --footer=$(srcdir)/footer.html --title="Header and footer test"
  
 -source_highlightdoc_DATA = test.php3.html test.pl.html test.pm.html \
 +source_highlightdochtml_DATA = test.php3.html test.pl.html test.pm.html \
- test.py.html
+ test.py.html test.rb.html
  
  
-@@ -195,8 +196,10 @@ subdir = tests
+@@ -198,8 +199,10 @@ subdir = tests
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -31,12 +31,12 @@ $NetBSD: patch-ah,v 1.2 2003/02/16 20:53:48 seb Exp $
  
  DIST_COMMON = Makefile.am Makefile.in
  all: all-am
-@@ -204,27 +207,27 @@ all: all-am
+@@ -207,27 +210,27 @@ all: all-am
  .SUFFIXES:
  $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
 -	  $(AUTOMAKE) --gnu  tests/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tests/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tests/Makefile
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
@@ -70,7 +70,7 @@ $NetBSD: patch-ah,v 1.2 2003/02/16 20:53:48 seb Exp $
  	done
  tags: TAGS
  TAGS:
-@@ -269,7 +272,7 @@ check: check-am
+@@ -272,7 +275,7 @@ check: check-am
  all-am: Makefile $(DATA)
  
  installdirs:
@@ -79,7 +79,7 @@ $NetBSD: patch-ah,v 1.2 2003/02/16 20:53:48 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -312,7 +315,7 @@ info: info-am
+@@ -315,7 +318,7 @@ info: info-am
  
  info-am:
  
@@ -88,7 +88,7 @@ $NetBSD: patch-ah,v 1.2 2003/02/16 20:53:48 seb Exp $
  
  install-exec-am:
  
-@@ -338,17 +341,17 @@ ps: ps-am
+@@ -341,17 +344,17 @@ ps: ps-am
  
  ps-am: