From 9503d3a5e9bcd2609c87849a24c45786316c9168 Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 23 Dec 2002 22:27:48 +0000 Subject: Update to 1.6.1. Lots of changes and new features: you want to update! Changes since latest packaged version: Version 1.6.1 * fixed a bug in the configure phase that used to make the compilation fail with compilers not providing the function getop_long (reported by Horacio Montenegro ). Version 1.6 * scanners for flex and ChangeLog added by John Millaway * default to stdout when no --output is given along with the -i option and when --output="STDOUT" (as suggested by Hugh S. Myers, ) * fixed a problem with string comments in Python scanner * a separate executable is built, source-highlight-cgi, that can be used as a CGI program Version 1.5.1 * xhtml doctype generated correctly (thanks to Christian W. Zuckschwerdt and Josh Ghiloni ) reported by Martin Gebert * Anonymous CVS Access is now available http://savannah.gnu.org/projects/src-highlite Version 1.5 * xhtml output format is now handled (thanks to Christian W. Zuckschwerdt and Josh Ghiloni ) * assert is now recognized as a Java keyword (thanks to Fabio Calefato ) * a scanner for Python has been written by Martin Gebert . * when in Php3 strings can span more than one lines and line numbers are correctly formatted. Version 1.4 * fixed compilation error with some compilers due to headers istream.h and ostream.h (thanks to Dan barthel ) * a scanner for Php3 has been written by Alain Barbet * reading from stdin does not kill line numbers (notified by Keith Robertson ) * line number count is correctly reset when handling multiple files (bug fixed) * for Java sources, if, while, and other keywords that use '(' ')' are now correctly highlighted as keywords instead of as functions (reported by Manuel Kauers and Fabio Calefato ) * tabs are correctly handled for Prolog and Perl sources (reported by Martin Gebert ) Version 1.3 * now there is only one program, namely source-highlight, that accepts a command line option, --src-lang or -s, specifying the source language (for the moment java, cpp and prolog). Previous programs, java2html and cpp2html are provided as shell scripts, just for compatibility, but their use is not advised. * --out-format, -f, command line option added for specifying the output format (for the moment only html is accepted). Though only html is handled, this option is required. * a scanner for Prolog has been written by Martin Gebert . This scanner is still to be considered beta, and actually it was written for Visual Prolog, so it should be tested against other Prolog dialects. * a scanner for Perl has been written by Alain Barbet * Correctly check whether it is possible to write to a file (notified by Martin) * --tab option is correctly handled even for C/C++ files (bug fixed, notified by Martin) * Added option --line-number (-n) in order to print line numbers (as suggested by Ed Scott and Andre Charbonneau). * Man page added. --- textproc/source-highlight/Makefile | 4 +- textproc/source-highlight/PLIST | 53 +++++++----- textproc/source-highlight/distinfo | 14 +++- textproc/source-highlight/patches/patch-aa | 16 ++++ textproc/source-highlight/patches/patch-ab | 23 ++++++ textproc/source-highlight/patches/patch-ac | 38 +++++++++ textproc/source-highlight/patches/patch-ad | 128 +++++++++++++++++++++++++++++ textproc/source-highlight/patches/patch-ae | 43 ++++++++++ textproc/source-highlight/patches/patch-af | 48 +++++++++++ textproc/source-highlight/patches/patch-ag | 13 +++ textproc/source-highlight/patches/patch-ah | 103 +++++++++++++++++++++++ 11 files changed, 459 insertions(+), 24 deletions(-) create mode 100644 textproc/source-highlight/patches/patch-aa create mode 100644 textproc/source-highlight/patches/patch-ab create mode 100644 textproc/source-highlight/patches/patch-ac create mode 100644 textproc/source-highlight/patches/patch-ad create mode 100644 textproc/source-highlight/patches/patch-ae create mode 100644 textproc/source-highlight/patches/patch-af create mode 100644 textproc/source-highlight/patches/patch-ag create mode 100644 textproc/source-highlight/patches/patch-ah (limited to 'textproc/source-highlight') diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index 6ba62bbb58d..4b15c08fca4 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:19 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/12/23 22:27:48 seb Exp $ # -DISTNAME= source-highlight-1.2.1 +DISTNAME= source-highlight-1.6.1 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 66207e5d42c..fbd403569ed 100644 --- a/textproc/source-highlight/PLIST +++ b/textproc/source-highlight/PLIST @@ -1,33 +1,48 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/22 10:40:01 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/12/23 22:27:48 seb Exp $ bin/cpp2html bin/java2html +bin/source-highlight +bin/source-highlight-cgi +man/man1/source-highlight.1 +share/doc/html/source-highlight/ChangeLog.html +share/doc/html/source-highlight/Hello.css +share/doc/html/source-highlight/Hello.java +share/doc/html/source-highlight/Hello.java.html +share/doc/html/source-highlight/Hello1.html +share/doc/html/source-highlight/Hello2.css +share/doc/html/source-highlight/Hello2.html +share/doc/html/source-highlight/Hello3.html +share/doc/html/source-highlight/Hello4.html +share/doc/html/source-highlight/Hello5.html +share/doc/html/source-highlight/Hello_h_f.html +share/doc/html/source-highlight/Hello_lines.html +share/doc/html/source-highlight/Hello_xhtml.html +share/doc/html/source-highlight/Hello_xhtml2.html +share/doc/html/source-highlight/cmdline.c.html +share/doc/html/source-highlight/cmdline.h.html +share/doc/html/source-highlight/colors.html +share/doc/html/source-highlight/cpp2html.css +share/doc/html/source-highlight/flex_scanner.ll.html +share/doc/html/source-highlight/mono-alt.css +share/doc/html/source-highlight/mono.css +share/doc/html/source-highlight/source-highlight.html +share/doc/html/source-highlight/startapp.cc.html +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/xhtml.css share/doc/source-highlight/COPYING +share/doc/source-highlight/CREDITS share/doc/source-highlight/ChangeLog -share/doc/source-highlight/Hello.css -share/doc/source-highlight/Hello.java -share/doc/source-highlight/Hello.java.html -share/doc/source-highlight/Hello1.html -share/doc/source-highlight/Hello2.css -share/doc/source-highlight/Hello2.html -share/doc/source-highlight/Hello3.html -share/doc/source-highlight/Hello4.html -share/doc/source-highlight/Hello5.html -share/doc/source-highlight/Hello_h_f.html share/doc/source-highlight/INSTALL share/doc/source-highlight/NEWS share/doc/source-highlight/README share/doc/source-highlight/README.compile_VC6 share/doc/source-highlight/THANKS share/doc/source-highlight/TODO.txt -share/doc/source-highlight/cmdline.c.html -share/doc/source-highlight/cmdline.h.html -share/doc/source-highlight/colors.html -share/doc/source-highlight/cpp2html.css -share/doc/source-highlight/mono-alt.css -share/doc/source-highlight/mono.css -share/doc/source-highlight/source-highlight.html -share/doc/source-highlight/startapp.cc.html share/source-highlight/tags.j2h share/source-highlight/tags2.j2h @dirrm share/source-highlight @dirrm share/doc/source-highlight +@dirrm share/doc/html/source-highlight diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo index 7d128332543..33021b8f0ed 100644 --- a/textproc/source-highlight/distinfo +++ b/textproc/source-highlight/distinfo @@ -1,4 +1,12 @@ -$NetBSD: distinfo,v 1.2 2002/01/22 10:40:01 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/12/23 22:27:48 seb Exp $ -SHA1 (source-highlight-1.2.1.tar.gz) = f95eeda7eed3193772744e300f62fb0c88bb07d1 -Size (source-highlight-1.2.1.tar.gz) = 175484 bytes +SHA1 (source-highlight-1.6.1.tar.gz) = 27c1ff75fafac23949897846e9b698a8074d1c69 +Size (source-highlight-1.6.1.tar.gz) = 536939 bytes +SHA1 (patch-aa) = 3f124bcdc738222dedd0f961e26da3f374700680 +SHA1 (patch-ab) = ecb8ce16381bd68b55f309a0ae43912319138575 +SHA1 (patch-ac) = 19608fae7404b8ebd86c2dced2771f75831a4ac9 +SHA1 (patch-ad) = 5517bc83ac141f7a6c79a6c01241ee684859b637 +SHA1 (patch-ae) = 3f8d83bb56fb6c712eeabaf80acf548d7e09d352 +SHA1 (patch-af) = 19f619d2758af912bab1cc42fb689dcbcf5dbfed +SHA1 (patch-ag) = c99bb9f1af070c476f4c5b3c1954b1e8624f6c06 +SHA1 (patch-ah) = dbe25910f3828ac1522ea131ca5fd645693faa7e diff --git a/textproc/source-highlight/patches/patch-aa b/textproc/source-highlight/patches/patch-aa new file mode 100644 index 00000000000..5ef07f8bca8 --- /dev/null +++ b/textproc/source-highlight/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.1 2002/12/23 22:27:50 seb Exp $ + +--- configure.in.orig Wed Oct 30 18:21:25 2002 ++++ configure.in +@@ -17,9 +17,11 @@ AM_INIT_AUTOMAKE(source-highlight,1.6.1) + + AC_SUBST(source_highlightdatadir) + AC_SUBST(source_highlightdocdir) ++AC_SUBST(source_highlightdochtmldir) + + source_highlightdatadir=$datadir/source-highlight + source_highlightdocdir=$datadir/doc/source-highlight ++source_highlightdochtmldir=$datadir/doc/html/source-highlight + + dnl scanner version + diff --git a/textproc/source-highlight/patches/patch-ab b/textproc/source-highlight/patches/patch-ab new file mode 100644 index 00000000000..c434d4236af --- /dev/null +++ b/textproc/source-highlight/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.1 2002/12/23 22:27:50 seb Exp $ + +--- configure.orig Wed Oct 30 18:21:38 2002 ++++ configure +@@ -1595,8 +1595,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst + + + ++ + source_highlightdatadir=$datadir/source-highlight + source_highlightdocdir=$datadir/doc/source-highlight ++source_highlightdochtmldir=$datadir/doc/html/source-highlight + + + +@@ -5963,6 +5965,7 @@ s,@AWK@,$AWK,;t t + s,@SET_MAKE@,$SET_MAKE,;t t + s,@source_highlightdatadir@,$source_highlightdatadir,;t t + s,@source_highlightdocdir@,$source_highlightdocdir,;t t ++s,@source_highlightdochtmldir@,$source_highlightdochtmldir,;t t + s,@JAVA_SCANNER_VERSION@,$JAVA_SCANNER_VERSION,;t t + s,@CPP_SCANNER_VERSION@,$CPP_SCANNER_VERSION,;t t + s,@PROLOG_SCANNER_VERSION@,$PROLOG_SCANNER_VERSION,;t t diff --git a/textproc/source-highlight/patches/patch-ac b/textproc/source-highlight/patches/patch-ac new file mode 100644 index 00000000000..0ad02c04c0e --- /dev/null +++ b/textproc/source-highlight/patches/patch-ac @@ -0,0 +1,38 @@ +$NetBSD: patch-ac,v 1.1 2002/12/23 22:27:50 seb Exp $ + +--- doc/Makefile.am.orig Sun Oct 13 20:29:36 2002 ++++ doc/Makefile.am +@@ -34,7 +34,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html + header.html footer.html \ + startapp.cc.html cmdline.c.html cmdline.h.html + +-source_highlightdoc_DATA = colors.html @PACKAGE@.html \ ++source_highlightdochtml_DATA = colors.html @PACKAGE@.html \ + 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 new file mode 100644 index 00000000000..003135cc09d --- /dev/null +++ b/textproc/source-highlight/patches/patch-ad @@ -0,0 +1,128 @@ +$NetBSD: patch-ad,v 1.1 2002/12/23 22:27:50 seb Exp $ + +--- doc/Makefile.in.orig Wed Oct 30 18:22:19 2002 ++++ doc/Makefile.in +@@ -103,6 +103,7 @@ am__quote = @am__quote@ + install_sh = @install_sh@ + source_highlightdatadir = @source_highlightdatadir@ + source_highlightdocdir = @source_highlightdocdir@ ++source_highlightdochtmldir = @source_highlightdochtmldir@ + + TAGS_J2H_OPTION = --tags-file $(top_srcdir)/src/tags.j2h + +@@ -131,7 +132,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html + startapp.cc.html cmdline.c.html cmdline.h.html + + +-source_highlightdoc_DATA = colors.html @PACKAGE@.html \ ++source_highlightdochtml_DATA = colors.html @PACKAGE@.html \ + 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 = + + NROFF = nroff + MANS = $(man_MANS) +-DATA = $(source_highlightdoc_DATA) ++DATA = $(source_highlightdochtml_DATA) + + DIST_COMMON = Makefile.am Makefile.in source-highlight.1.in \ + source-highlight.html.in +@@ -229,23 +230,23 @@ uninstall-man1: + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done +-source_highlightdocDATA_INSTALL = $(INSTALL_DATA) +-install-source_highlightdocDATA: $(source_highlightdoc_DATA) ++source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA) ++install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir) +- @list='$(source_highlightdoc_DATA)'; for p in $$list; do \ ++ $(mkinstalldirs) $(DESTDIR)$(source_highlightdochtmldir) ++ @list='$(source_highlightdochtml_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f"; \ +- $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f; \ ++ echo " $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \ ++ $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f; \ + done + +-uninstall-source_highlightdocDATA: ++uninstall-source_highlightdochtmlDATA: + @$(NORMAL_UNINSTALL) +- @list='$(source_highlightdoc_DATA)'; for p in $$list; do \ ++ @list='$(source_highlightdochtml_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(source_highlightdocdir)/$$f"; \ +- rm -f $(DESTDIR)$(source_highlightdocdir)/$$f; \ ++ echo " rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \ ++ rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -281,7 +282,7 @@ check: check-am + all-am: Makefile $(MANS) $(DATA) + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(source_highlightdocdir) ++ $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(source_highlightdochtmldir) + + install: install-am + install-exec: install-exec-am +@@ -324,7 +325,7 @@ info: info-am + + info-am: + +-install-data-am: install-man install-source_highlightdocDATA ++install-data-am: install-man install-source_highlightdochtmlDATA + + install-exec-am: + +@@ -343,7 +344,7 @@ mostlyclean: mostlyclean-am + mostlyclean-am: mostlyclean-generic + + uninstall-am: uninstall-info-am uninstall-man \ +- uninstall-source_highlightdocDATA ++ uninstall-source_highlightdochtmlDATA + + uninstall-man: uninstall-man1 + +@@ -351,29 +352,29 @@ 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 + + + # 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 new file mode 100644 index 00000000000..1ddf2669a83 --- /dev/null +++ b/textproc/source-highlight/patches/patch-ae @@ -0,0 +1,43 @@ +$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 new file mode 100644 index 00000000000..93b92dc62ec --- /dev/null +++ b/textproc/source-highlight/patches/patch-af @@ -0,0 +1,48 @@ +$NetBSD: patch-af,v 1.1 2002/12/23 22:27:50 seb Exp $ + +--- src/Makefile.in.orig Wed Oct 30 18:21:55 2002 ++++ src/Makefile.in +@@ -103,6 +103,7 @@ am__quote = @am__quote@ + install_sh = @install_sh@ + source_highlightdatadir = @source_highlightdatadir@ + source_highlightdocdir = @source_highlightdocdir@ ++source_highlightdochtmldir = @source_highlightdochtmldir@ + + bin_PROGRAMS = source-highlight source-highlight-cgi + bin_SCRIPTS = java2html cpp2html +@@ -599,26 +600,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 new file mode 100644 index 00000000000..d14da41e191 --- /dev/null +++ b/textproc/source-highlight/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2002/12/23 22:27:50 seb Exp $ + +--- tests/Makefile.am.orig Wed Oct 30 18:26:23 2002 ++++ 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 + +-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 + + CLEANFILES = *.out.html diff --git a/textproc/source-highlight/patches/patch-ah b/textproc/source-highlight/patches/patch-ah new file mode 100644 index 00000000000..22fdb22231a --- /dev/null +++ b/textproc/source-highlight/patches/patch-ah @@ -0,0 +1,103 @@ +$NetBSD: patch-ah,v 1.1 2002/12/23 22:27:50 seb Exp $ + +--- tests/Makefile.in.orig Mon Dec 23 21:52:22 2002 ++++ tests/Makefile.in +@@ -103,6 +103,7 @@ am__quote = @am__quote@ + install_sh = @install_sh@ + source_highlightdatadir = @source_highlightdatadir@ + source_highlightdocdir = @source_highlightdocdir@ ++source_highlightdochtmldir = @source_highlightdochtmldir@ + + TAGS_J2H_OPTION = -f html --tags-file $(top_srcdir)/src/tags.j2h + +@@ -149,7 +150,7 @@ test.l test.l.html + + 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 + + +@@ -159,7 +160,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + 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 + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + uninstall-info-am: +-source_highlightdocDATA_INSTALL = $(INSTALL_DATA) +-install-source_highlightdocDATA: $(source_highlightdoc_DATA) ++source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA) ++install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir) +- @list='$(source_highlightdoc_DATA)'; for p in $$list; do \ ++ $(mkinstalldirs) $(DESTDIR)$(source_highlightdochtmldir) ++ @list='$(source_highlightdochtml_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f"; \ +- $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f; \ ++ echo " $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \ ++ $(source_highlightdochtmlDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdochtmldir)/$$f; \ + done + +-uninstall-source_highlightdocDATA: ++uninstall-source_highlightdochtmlDATA: + @$(NORMAL_UNINSTALL) +- @list='$(source_highlightdoc_DATA)'; for p in $$list; do \ ++ @list='$(source_highlightdochtml_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(source_highlightdocdir)/$$f"; \ +- rm -f $(DESTDIR)$(source_highlightdocdir)/$$f; \ ++ echo " rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f"; \ ++ rm -f $(DESTDIR)$(source_highlightdochtmldir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -223,7 +224,7 @@ check: check-am + all-am: Makefile $(DATA) + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir) ++ $(mkinstalldirs) $(DESTDIR)$(source_highlightdochtmldir) + + install: install-am + install-exec: install-exec-am +@@ -266,7 +267,7 @@ info: info-am + + info-am: + +-install-data-am: install-source_highlightdocDATA ++install-data-am: install-source_highlightdochtmlDATA + + install-exec-am: + +@@ -284,17 +285,17 @@ mostlyclean: mostlyclean-am + + mostlyclean-am: mostlyclean-generic + +-uninstall-am: uninstall-info-am uninstall-source_highlightdocDATA ++uninstall-am: uninstall-info-am uninstall-source_highlightdochtmlDATA + + .PHONY: all all-am check check-am clean clean-generic distclean \ + 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-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 \ +- uninstall-source_highlightdocDATA ++ uninstall-source_highlightdochtmlDATA + + + %.cc.html: %.cc -- cgit v1.2.3