Update to 1.6.3

News from version 1.6.1 the latest packaged version:

Version 1.6.3

   * Fixed problems in compilation in systems that do not provide
     getopt_long and yywrap (reported by Jackie Goodwin
     <goodwja@northropgrumman.com>).
   * Added .spec file for generating .rpm and .rpm.src (thanks to
     Christian W. Zuckschwerdt <zany@triq.net>).

Version 1.6.2

   * compliant to C++ standard headers (iostream etc.), no more
     backward compatibility warnings with gcc 3.2 (Thanks to
     Maurizio Loreti <loreti@pd.infn.it> for the report).

6 files changed, 228 insertions, 51 deletions

diff --git a/textproc/source-highlight/DESCR b/textproc/source-highlight/DESCR
index d70e75b1558..d14c863e7b3 100644
--- a/textproc/source-highlight/DESCR
+++ b/textproc/source-highlight/DESCR
@@ -1,3 +1,6 @@
-This package contains GNU java2html version 1.9 and GNU cpp2html version 1.5:
-- java2html highlights the syntax of a Java source file into a HTML document,
-- cpp2html highlights the syntax of a C or C++ source file into a HTML document.
+This program, given a source file, produces a document with syntax
+highlighting.
+
+At the moment this package can handle Java, C/C++, Prolog, Perl,
+Php3, Python, Flex, ChangeLog as source languages, and HTML,  XHTML
+as output format.
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 4b15c08fca4..539f6c1fb53 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/12/23 22:27:48 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/16 20:53:47 seb Exp $
 #
 
-DISTNAME=	source-highlight-1.6.1
+DISTNAME=	source-highlight-1.6.3
 SVR4_PKGNAME=	srchl
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=source-highlight/}
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 33021b8f0ed..10c7653b939 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2002/12/23 22:27:48 seb Exp $
+$NetBSD: distinfo,v 1.4 2003/02/16 20:53:47 seb Exp $
 
-SHA1 (source-highlight-1.6.1.tar.gz) = 27c1ff75fafac23949897846e9b698a8074d1c69
-Size (source-highlight-1.6.1.tar.gz) = 536939 bytes
+SHA1 (source-highlight-1.6.3.tar.gz) = 9694286e438b1d3b830bd817a64a2e4ba153355f
+Size (source-highlight-1.6.3.tar.gz) = 548007 bytes
 SHA1 (patch-aa) = 3f124bcdc738222dedd0f961e26da3f374700680
 SHA1 (patch-ab) = ecb8ce16381bd68b55f309a0ae43912319138575
 SHA1 (patch-ac) = 19608fae7404b8ebd86c2dced2771f75831a4ac9
-SHA1 (patch-ad) = 5517bc83ac141f7a6c79a6c01241ee684859b637
+SHA1 (patch-ad) = 4b65ad0a0a55115c95f0b5321d792056c2cdd2f5
 SHA1 (patch-ae) = 3f8d83bb56fb6c712eeabaf80acf548d7e09d352
-SHA1 (patch-af) = 19f619d2758af912bab1cc42fb689dcbcf5dbfed
+SHA1 (patch-af) = b194198b815fe715e2bec87f36ad52dbd3717361
 SHA1 (patch-ag) = c99bb9f1af070c476f4c5b3c1954b1e8624f6c06
-SHA1 (patch-ah) = dbe25910f3828ac1522ea131ca5fd645693faa7e
+SHA1 (patch-ah) = ab916790a514f90f9a02d9995698b1f2828cda9e
diff --git a/textproc/source-highlight/patches/patch-ad b/textproc/source-highlight/patches/patch-ad
index 003135cc09d..74dc69e5c1a 100644
--- a/textproc/source-highlight/patches/patch-ad
+++ b/textproc/source-highlight/patches/patch-ad
@@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-ad,v 1.2 2003/02/16 20:53:48 seb Exp $
 
---- doc/Makefile.in.orig	Wed Oct 30 18:22:19 2002
+--- doc/Makefile.in.orig	2003-02-09 09:22:52.000000000 +0000
 +++ doc/Makefile.in
-@@ -103,6 +103,7 @@ am__quote = @am__quote@
- install_sh = @install_sh@
+@@ -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@
  
- TAGS_J2H_OPTION = --tags-file $(top_srcdir)/src/tags.j2h 
- 
-@@ -131,7 +132,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html 
+@@ -168,7 +169,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html 
               startapp.cc.html cmdline.c.html cmdline.h.html
  
  
@@ -19,7 +19,13 @@ $NetBSD: patch-ad,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 \
-@@ -169,7 +170,7 @@ DIST_SOURCES =
+@@ -202,11 +203,13 @@ subdir = doc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = source-highlight.html source-highlight.1
++depcomp =
++am__depfiles_maybe =
+ DIST_SOURCES =
  
  NROFF = nroff
  MANS = $(man_MANS)
@@ -28,7 +34,16 @@ $NetBSD: patch-ad,v 1.1 2002/12/23 22:27:50 seb Exp $
  
  DIST_COMMON = Makefile.am Makefile.in source-highlight.1.in \
  	source-highlight.html.in
-@@ -229,23 +230,23 @@ uninstall-man1:
+@@ -215,7 +218,7 @@ all: all-am
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/Makefile
++	  $(AUTOMAKE) --gnu  --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
+@@ -270,23 +273,23 @@ uninstall-man1:
  	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
  	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
  	done
@@ -62,7 +77,7 @@ $NetBSD: patch-ad,v 1.1 2002/12/23 22:27:50 seb Exp $
  	done
  tags: TAGS
  TAGS:
-@@ -281,7 +282,7 @@ check: check-am
+@@ -331,7 +334,7 @@ check: check-am
  all-am: Makefile $(MANS) $(DATA)
  
  installdirs:
@@ -71,7 +86,7 @@ $NetBSD: patch-ad,v 1.1 2002/12/23 22:27:50 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -324,7 +325,7 @@ info: info-am
+@@ -374,7 +377,7 @@ info: info-am
  
  info-am:
  
@@ -80,8 +95,8 @@ $NetBSD: patch-ad,v 1.1 2002/12/23 22:27:50 seb Exp $
  
  install-exec-am:
  
-@@ -343,7 +344,7 @@ mostlyclean: mostlyclean-am
- mostlyclean-am: mostlyclean-generic
+@@ -401,7 +404,7 @@ ps: ps-am
+ ps-am:
  
  uninstall-am: uninstall-info-am uninstall-man \
 -	uninstall-source_highlightdocDATA
@@ -89,17 +104,18 @@ $NetBSD: patch-ad,v 1.1 2002/12/23 22:27:50 seb Exp $
  
  uninstall-man: uninstall-man1
  
-@@ -351,29 +352,29 @@ uninstall-man: uninstall-man1
+@@ -409,29 +412,30 @@ 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 \
 -	install-man1 install-source_highlightdocDATA install-strip \
 +	install-man1 install-source_highlightdochtmlDATA install-strip \
  	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	uninstall uninstall-am uninstall-info-am uninstall-man \
--	uninstall-man1 uninstall-source_highlightdocDATA
-+	uninstall-man1 uninstall-source_highlightdochtmlDATA
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+-	uninstall-man uninstall-man1 uninstall-source_highlightdocDATA
++	uninstall-man uninstall-man1 \
++	uninstall-source_highlightdochtmlDATA
  
  
  # note that $(srcdir) actually points to doc dir
diff --git a/textproc/source-highlight/patches/patch-af b/textproc/source-highlight/patches/patch-af
index 93b92dc62ec..0f7e8b11cc6 100644
--- a/textproc/source-highlight/patches/patch-af
+++ b/textproc/source-highlight/patches/patch-af
@@ -1,16 +1,166 @@
-$NetBSD: patch-af,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-af,v 1.2 2003/02/16 20:53:48 seb Exp $
 
---- src/Makefile.in.orig	Wed Oct 30 18:21:55 2002
+--- src/Makefile.in.orig	2003-02-09 09:23:04.000000000 +0000
 +++ src/Makefile.in
-@@ -103,6 +103,7 @@ am__quote = @am__quote@
- install_sh = @install_sh@
+@@ -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@
  
- bin_PROGRAMS = source-highlight source-highlight-cgi
- bin_SCRIPTS = java2html cpp2html
-@@ -599,26 +600,26 @@ uninstall-info: uninstall-info-recursive
+@@ -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
diff --git a/textproc/source-highlight/patches/patch-ah b/textproc/source-highlight/patches/patch-ah
index 22fdb22231a..06a0313fbf2 100644
--- a/textproc/source-highlight/patches/patch-ah
+++ b/textproc/source-highlight/patches/patch-ah
@@ -1,16 +1,16 @@
-$NetBSD: patch-ah,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-ah,v 1.2 2003/02/16 20:53:48 seb Exp $
 
---- tests/Makefile.in.orig	Mon Dec 23 21:52:22 2002
+--- tests/Makefile.in.orig	2003-02-09 09:23:16.000000000 +0000
 +++ tests/Makefile.in
-@@ -103,6 +103,7 @@ am__quote = @am__quote@
- install_sh = @install_sh@
+@@ -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@
  
- TAGS_J2H_OPTION = -f html --tags-file $(top_srcdir)/src/tags.j2h 
- 
-@@ -149,7 +150,7 @@ test.l test.l.html
+@@ -186,7 +187,7 @@ test.l test.l.html
  
  CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html --footer=$(srcdir)/footer.html --title="Header and footer test"
  
@@ -19,16 +19,24 @@ $NetBSD: patch-ah,v 1.1 2002/12/23 22:27:50 seb Exp $
  test.py.html
  
  
-@@ -159,7 +160,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+@@ -195,8 +196,10 @@ subdir = tests
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
  DIST_SOURCES =
 -DATA = $(source_highlightdoc_DATA)
 +DATA = $(source_highlightdochtml_DATA)
  
  DIST_COMMON = Makefile.am Makefile.in
  all: all-am
-@@ -171,23 +172,23 @@ $(srcdir)/Makefile.in:  Makefile.am  $(t
+@@ -204,27 +207,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
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
@@ -62,7 +70,7 @@ $NetBSD: patch-ah,v 1.1 2002/12/23 22:27:50 seb Exp $
  	done
  tags: TAGS
  TAGS:
-@@ -223,7 +224,7 @@ check: check-am
+@@ -269,7 +272,7 @@ check: check-am
  all-am: Makefile $(DATA)
  
  installdirs:
@@ -71,7 +79,7 @@ $NetBSD: patch-ah,v 1.1 2002/12/23 22:27:50 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -266,7 +267,7 @@ info: info-am
+@@ -312,7 +315,7 @@ info: info-am
  
  info-am:
  
@@ -80,9 +88,9 @@ $NetBSD: patch-ah,v 1.1 2002/12/23 22:27:50 seb Exp $
  
  install-exec-am:
  
-@@ -284,17 +285,17 @@ mostlyclean: mostlyclean-am
+@@ -338,17 +341,17 @@ ps: ps-am
  
- mostlyclean-am: mostlyclean-generic
+ ps-am:
  
 -uninstall-am: uninstall-info-am uninstall-source_highlightdocDATA
 +uninstall-am: uninstall-info-am uninstall-source_highlightdochtmlDATA
@@ -94,8 +102,8 @@ $NetBSD: patch-ah,v 1.1 2002/12/23 22:27:50 seb Exp $
 -	install-source_highlightdocDATA install-strip installcheck \
 +	install-source_highlightdochtmlDATA install-strip installcheck \
  	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	uninstall uninstall-am uninstall-info-am \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
 -	uninstall-source_highlightdocDATA
 +	uninstall-source_highlightdochtmlDATA