pkg/32325: New version of GNU source-highlight. Patch included.

To: pkg-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/32325: New version of GNU source-highlight. Patch included.
From: lkundrak%skosi.org@localhost
Date: Sun, 18 Dec 2005 06:25:04 +0000 (UTC)
>Number:         32325
>Category:       pkg
>Synopsis:       New version of GNU source-highlight. Patch included.
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 18 06:25:04 +0000 2005
>Originator:     Lubomir Kundrak
>Release:        
>Organization:
>Environment:
>Description:
Here's patch for source-highlight package.
What i did is basically adjusting existing patches and update PLIST.
>How-To-Repeat:
diff -d -N -r -u source-highlight.orig/Makefile source-highlight/Makefile
--- source-highlight.orig/Makefile      2005-12-18 03:29:52.000000000 +0100
+++ source-highlight/Makefile   2005-12-18 04:53:28.000000000 +0100
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.18 2005/10/10 20:13:45 tv Exp $
 #
 
-DISTNAME=      source-highlight-2.1.2
+DISTNAME=      source-highlight-2.3
 SVR4_PKGNAME=  srchl
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=src-highlite/}
@@ -21,6 +21,8 @@
 
 BUILDLINK_TRANSFORM+=  l:boost_regex:boost_regex-mt
 
+DEPENDS+=      exctags>=5.5.4:../../devel/exctags
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
diff -d -N -r -u source-highlight.orig/PLIST source-highlight/PLIST
--- source-highlight.orig/PLIST 2005-12-18 03:29:52.000000000 +0100
+++ source-highlight/PLIST      2005-12-18 04:38:49.000000000 +0100
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2005/10/10 09:05:59 seb Exp $
+@comment $NetBSD$
 bin/cpp2html
 bin/java2html
 bin/source-highlight
 bin/src-hilite-lesspipe.sh
-info/source-highlight.info
 man/man1/source-highlight.1
 share/doc/html/source-highlight/Hello.css
 share/doc/html/source-highlight/Hello.java
@@ -18,15 +17,25 @@
 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/SimpleClass-doc.html
+share/doc/html/source-highlight/SimpleClass.html
+share/doc/html/source-highlight/SimpleClass.java
+share/doc/html/source-highlight/UsageExample.html
+share/doc/html/source-highlight/UsageExample.java
 share/doc/html/source-highlight/access.log.html
 share/doc/html/source-highlight/auth.log.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/cpp.lang.html
 share/doc/html/source-highlight/cpp2html.css
+share/doc/html/source-highlight/default.style.html
 share/doc/html/source-highlight/error.log.html
 share/doc/html/source-highlight/flex_scanner.ll.html
+share/doc/html/source-highlight/footer.html
+share/doc/html/source-highlight/header.html
 share/doc/html/source-highlight/index.html
+share/doc/html/source-highlight/langdef.lang.html
+share/doc/html/source-highlight/log.lang.html
 share/doc/html/source-highlight/mono-alt.css
 share/doc/html/source-highlight/mono.css
 share/doc/html/source-highlight/source-highlight.html
@@ -45,6 +54,8 @@
 share/doc/html/source-highlight/test.py.html
 share/doc/html/source-highlight/test.rb.html
 share/doc/html/source-highlight/test.sml.html
+share/doc/html/source-highlight/test_refs.cpp.html
+share/doc/html/source-highlight/test_refs.h.html
 share/doc/html/source-highlight/xhtml.css
 share/doc/source-highlight/COPYING
 share/doc/source-highlight/CREDITS
@@ -52,19 +63,24 @@
 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/source-highlight/bison.lang
 share/source-highlight/c_comment.lang
+share/source-highlight/c_string.lang
 share/source-highlight/caml.lang
 share/source-highlight/changelog.lang
 share/source-highlight/cpp.lang
 share/source-highlight/css_common.outlang
 share/source-highlight/cssdoc.outlang
 share/source-highlight/default.style
+share/source-highlight/diff.lang
+share/source-highlight/docbook.outlang
 share/source-highlight/esc.outlang
 share/source-highlight/esc.style
+share/source-highlight/extreme_comment.lang
+share/source-highlight/extreme_comment2.lang
+share/source-highlight/extreme_comment3.lang
 share/source-highlight/flex.lang
 share/source-highlight/fortran.lang
 share/source-highlight/function.lang
@@ -73,8 +89,10 @@
 share/source-highlight/html_common.outlang
 share/source-highlight/htmldoc.outlang
 share/source-highlight/java.lang
+share/source-highlight/javadoc.outlang
 share/source-highlight/javascript.lang
 share/source-highlight/lang.map
+share/source-highlight/langdef.lang
 share/source-highlight/latex.lang
 share/source-highlight/latex.outlang
 share/source-highlight/latexcolor.outlang
@@ -84,14 +102,17 @@
 share/source-highlight/logtalk.lang
 share/source-highlight/lua.lang
 share/source-highlight/number.lang
+share/source-highlight/outlang.lang
 share/source-highlight/outlang.map
 share/source-highlight/pascal.lang
 share/source-highlight/perl.lang
 share/source-highlight/php.lang
+share/source-highlight/postscript.lang
 share/source-highlight/prolog.lang
 share/source-highlight/python.lang
 share/source-highlight/ruby.lang
 share/source-highlight/sml.lang
+share/source-highlight/style.lang
 share/source-highlight/style2.style
 share/source-highlight/style3.style
 share/source-highlight/symbols.lang
diff -d -N -r -u source-highlight.orig/distinfo source-highlight/distinfo
--- source-highlight.orig/distinfo      2005-12-18 03:29:52.000000000 +0100
+++ source-highlight/distinfo   2005-12-18 04:46:28.000000000 +0100
@@ -1,14 +1,16 @@
 $NetBSD: distinfo,v 1.13 2005/10/10 09:05:59 seb Exp $
 
-SHA1 (source-highlight-2.1.2.tar.gz) = 378ff93218a29db42f9b56e3c88fb18751686259
-RMD160 (source-highlight-2.1.2.tar.gz) = 
f4a54515efb7952a0f5105bc97d60929c726fd2f
-Size (source-highlight-2.1.2.tar.gz) = 557143 bytes
-SHA1 (patch-aa) = e4911d6c15c81fd1a24f517c0e5a7d3302c62656
-SHA1 (patch-ab) = 51752354b791007ffbe2ec560d322a0526036951
-SHA1 (patch-ac) = b2c5e51a85660d0e298dbfca6f3a335dde68b3d3
-SHA1 (patch-ad) = 3bdbd5e9ef87eeb0869ebd5a64e3d0e9f934f69a
-SHA1 (patch-ae) = 1695543aaee9a414fe0267c8e4798be7ed507760
-SHA1 (patch-af) = 6131f0c5be4c6c0819abc591fd0f8a7a6ab8a05a
-SHA1 (patch-ag) = 469d098f73ab695a46bf3ac4a69f033f85f676e8
-SHA1 (patch-ah) = 8b001b2fb917e067bfb8a2f45c41b24f3294b05b
-SHA1 (patch-ai) = 8571124ee2190bc0da0d78046aa8bcd542296857
+SHA1 (source-highlight-2.3.tar.gz) = d7b94846bb611adf448586a8ee6ffdaf757fa103
+RMD160 (source-highlight-2.3.tar.gz) = 1fd9fa062f55015dea21057c0d6d18494cf33914
+Size (source-highlight-2.3.tar.gz) = 621232 bytes
+SHA1 (patch-aa) = f59c9509a0149c5ea85ff66f62e141d92041de2d
+SHA1 (patch-ab) = e0eb19803187840654da2943c26c67d25ca18b3f
+SHA1 (patch-ac) = 2d7fd47722e52402888ca518d275ae2c639fc966
+SHA1 (patch-ad) = e2878607f98584f767e6fd0965d89d9ab28fa66e
+SHA1 (patch-ae) = 8d8fb5fcb0d18942003126145da76302fecfdbf3
+SHA1 (patch-af) = b50fbb80179ac1de9704e43c36df6bceb5fb5882
+SHA1 (patch-ag) = 4ba13540c9809b70deb42ebc20319110b6ff962a
+SHA1 (patch-ah) = 9ee2c9e41836ea444b64d3f7daa289be577f1250
+SHA1 (patch-ai) = f8412abbc0a3928cdbe5b499a11d3acf83f07893
+SHA1 (patch-aj) = d533801f33ccc6d32b8e948a950c0a510e215d36
+SHA1 (patch-ak) = be3df0a8bd7ba07da0569ae83c82fcef62ac9bd6
diff -d -N -r -u source-highlight.orig/patches/patch-aa 
source-highlight/patches/patch-aa
--- source-highlight.orig/patches/patch-aa      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-aa   2005-12-18 04:43:17.000000000 +0100
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.2 2005/10/10 09:05:59 seb Exp $
 
---- configure.ac.orig  2005-08-25 14:09:51.000000000 +0000
+--- configure.ac.orig  2005-12-09 18:13:42.000000000 +0100
 +++ configure.ac
-@@ -17,9 +17,11 @@ AM_INIT_AUTOMAKE(source-highlight,2.1.2)
+@@ -17,9 +17,11 @@ AM_INIT_AUTOMAKE(source-highlight,2.3)
  
  AC_SUBST(source_highlightdatadir)
  AC_SUBST(source_highlightdocdir)
@@ -14,10 +14,10 @@
  
  dnl Checks for C compiler.
  AC_PROG_CC
-@@ -216,4 +218,4 @@ if test -z "$ac_cv_path_HELP2MAN"; then
- help2man is not installed so the man page will not
- be updated in case command line options are changed.
- This is important for maintainers only, though.])
+@@ -244,4 +246,4 @@ if test -z "$ac_cv_path_CTAGS"; then
+ 
+ ctags is not installed so you won't be able to
+ generate references (--gen-references).])
 -fi
 \ No newline at end of file
 +fi
diff -d -N -r -u source-highlight.orig/patches/patch-ab 
source-highlight/patches/patch-ab
--- source-highlight.orig/patches/patch-ab      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-ab   2005-12-18 04:43:17.000000000 +0100
@@ -1,20 +1,20 @@
 $NetBSD: patch-ab,v 1.3 2005/10/10 09:05:59 seb Exp $
 
---- doc/Makefile.am.orig       2005-08-25 14:10:51.000000000 +0000
+--- doc/Makefile.am.orig       2005-11-23 09:45:16.000000000 +0100
 +++ doc/Makefile.am
-@@ -71,7 +71,7 @@ EXTRA_DIST = colors.html source-highligh
-              gpl.texinfo flex_scanner.ll $(GENERATEDINFOS) \
-              source-highlight.1
+@@ -115,7 +115,7 @@ EXTRA_DIST = colors.html source-highligh
+            comment-show.lang \
+            SimpleClass.java SimpleClass-doc.html UsageExample.java
  
 -source_highlightdoc_DATA = colors.html source-highlight.html \
 +source_highlightdochtml_DATA = colors.html source-highlight.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 \
-@@ -167,4 +167,4 @@ flex_scanner.ll.html
- html-clean:
-       rm -f $(HTML_GENERATED_FILES)
+@@ -237,4 +237,4 @@ html-clean:
+ texinfo-clean:
+       rm -f $(GENERATEDINFOS)
  
--DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
+-DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS) 
tags langdef.lang.html
 \ No newline at end of file
-+DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
++DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS) 
tags langdef.lang.html
diff -d -N -r -u source-highlight.orig/patches/patch-ac 
source-highlight/patches/patch-ac
--- source-highlight.orig/patches/patch-ac      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-ac   2005-12-18 04:43:17.000000000 +0100
@@ -1,13 +1,20 @@
 $NetBSD: patch-ac,v 1.3 2005/10/10 09:05:59 seb Exp $
 
---- tests/Makefile.am.orig     2005-08-25 14:01:56.000000000 +0000
+--- tests/Makefile.am.orig     2005-11-23 09:45:17.000000000 +0100
 +++ tests/Makefile.am
-@@ -459,7 +459,7 @@ check_debug: debug.debug
-       @echo expect no output from diff
-       diff $(srcdir)/debug.debug debug.out.debug
+@@ -589,7 +589,7 @@ check_show: $(srcdir)/c_comment.show
+ clean_ref: 
+       rm -f $(OUTPUTWREFS)
  
 -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.rb.html test.js.html test.lua.html test.ml.html \
  test.sml.html test.log.html access.log.html auth.log.html error.log.html 
syslog.log.html test.htm.html test.java.tex.html \
- syslog.style
+ syslog.style \
+@@ -615,4 +615,4 @@ CLEANFILES = *.out.html *.out.txt *.out.
+ clean_html:
+       rm -f *.h.html *.java.html *.cc.html *.pas.html *.pl.html *.pm.html 
*.php3.html *.py.html *.chlog.html *.chlog_css.html *.l.html test_xhtml.html 
test_css.html test_css_nodoc.html test_header.html *.rb.html *.js.html 
*.java.txt *.java.tex *.java.texinfo *.lua.html *.ml.html *.sml.html 
test_*_lines.html *.log.html *.y.html *.simple.html *.tex.html *.lgt.html 
*.diff.html *.lang.html *.htm.html *.style.html
+ 
+-DISTCLEANFILES=test_ref.html test_ref.tags my_test_ref.tags tags test_ref.tex 
test_ref_post.tex test_ref.texinfo
+\ No newline at end of file
++DISTCLEANFILES=test_ref.html test_ref.tags my_test_ref.tags tags test_ref.tex 
test_ref_post.tex test_ref.texinfo
diff -d -N -r -u source-highlight.orig/patches/patch-ad 
source-highlight/patches/patch-ad
--- source-highlight.orig/patches/patch-ad      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-ad   2005-12-18 04:43:17.000000000 +0100
@@ -1,13 +1,13 @@
 $NetBSD: patch-ad,v 1.5 2005/10/10 09:05:59 seb Exp $
 
---- configure.orig     2005-10-09 09:26:55.000000000 +0000
+--- configure.orig     2005-12-09 18:14:46.000000000 +0100
 +++ configure
 @@ -309,7 +309,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar source_highlightdatadir source_highlightdocdir CC CFLAGS LDFLAGS 
CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE 
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE 
ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE 
am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB BOOST_REGEX_LIB CXXCPP 
CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS GEN
 GETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE DOUBLECPP NO_DOUBLECPP_TRUE 
NO_DOUBLECPP_FALSE VALGRIND HELP2MAN NO_HELP2MAN_TRUE NO_HELP2MAN_FALSE YFLAGS 
TAR TEXI2HTML LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar source_highlightdatadir source_highlightdocdir 
source_highlightdochtmldir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT 
DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE 
am__fastdepCC_TRUE am__fastdepCC_FALSE ar_to_use CPP EGREP CXX CXXFLAGS 
ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB 
ac_ct_RANLIB BOOST_REGEX_LIB CXXCPP CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB 
 LEX_OUTPUT_ROOT LIBOBJS GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE 
DOUBLECPP NO_DOUBLECPP_TRUE NO_DOUBLECPP_FALSE VALGRIND HELP2MAN 
NO_HELP2MAN_TRUE NO_HELP2MAN_FALSE YFLAGS TAR TEXI2HTML LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar source_highlightdatadir source_highlightdocdir CC CFLAGS LDFLAGS 
CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE 
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE 
ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE 
am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB BOOST_REGEX_LIB CXXCPP 
CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS GEN
 GETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE DOUBLECPP NO_DOUBLECPP_TRUE 
NO_DOUBLECPP_FALSE VALGRIND HELP2MAN NO_HELP2MAN_TRUE NO_HELP2MAN_FALSE CTAGS 
NO_CTAGS_TRUE NO_CTAGS_FALSE YFLAGS TAR TEXI2HTML ABSOLUTEDATADIR LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar source_highlightdatadir source_highlightdochtmldir CC CFLAGS LDFLAGS 
CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE 
AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE 
ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE 
am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB BOOST_REGEX_LIB CXXCPP 
CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS
  GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE DOUBLECPP NO_DOUBLECPP_TRUE 
NO_DOUBLECPP_FALSE VALGRIND HELP2MAN NO_HELP2MAN_TRUE NO_HELP2MAN_FALSE CTAGS 
NO_CTAGS_TRUE NO_CTAGS_FALSE YFLAGS TAR TEXI2HTML ABSOLUTEDATADIR LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -401,7 +401,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7974,6 +8013,7 @@ s,@am__tar@,$am__tar,;t t
+@@ -8246,6 +8285,7 @@ s,@am__tar@,$am__tar,;t t
  s,@am__untar@,$am__untar,;t t
  s,@source_highlightdatadir@,$source_highlightdatadir,;t t
  s,@source_highlightdocdir@,$source_highlightdocdir,;t t
@@ -409,7 +409,7 @@
  s,@CC@,$CC,;t t
  s,@CFLAGS@,$CFLAGS,;t t
  s,@LDFLAGS@,$LDFLAGS,;t t
-@@ -8190,6 +8230,11 @@ esac
+@@ -8466,6 +8506,11 @@ esac
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -421,7 +421,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -8228,12 +8273,6 @@ echo "$as_me: error: cannot find input f
+@@ -8504,12 +8549,6 @@ echo "$as_me: error: cannot find input f
         fi;;
        esac
      done` || { (exit 1); exit 1; }
diff -d -N -r -u source-highlight.orig/patches/patch-ae 
source-highlight/patches/patch-ae
--- source-highlight.orig/patches/patch-ae      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-ae   2005-12-18 04:43:17.000000000 +0100
@@ -1,6 +1,6 @@
 $NetBSD: patch-ae,v 1.4 2005/10/10 09:05:59 seb Exp $
 
---- src/lib/fileutil.cc.orig   2005-08-25 14:01:56.000000000 +0000
+--- src/lib/fileutil.cc.orig   2005-10-15 16:55:33.000000000 +0200
 +++ src/lib/fileutil.cc
 @@ -43,7 +43,7 @@ read_file(const string &fileName)
    // we open it as binary otherwise we may experience problems under
diff -d -N -r -u source-highlight.orig/patches/patch-af 
source-highlight/patches/patch-af
--- source-highlight.orig/patches/patch-af      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-af   2005-12-18 04:43:17.000000000 +0100
@@ -1,11 +1,11 @@
 $NetBSD: patch-af,v 1.5 2005/10/10 09:05:59 seb Exp $
 
---- doc/Makefile.in.orig       2005-10-09 09:27:17.000000000 +0000
+--- doc/Makefile.in.orig       2005-12-09 18:14:44.000000000 +0100
 +++ doc/Makefile.in
 @@ -56,6 +56,8 @@ am__configure_deps = $(am__aclocal_m4_de
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = index.html
+ CONFIG_CLEAN_FILES =
 +depcomp =
 +am__depfiles_maybe =
  SOURCES =
@@ -29,26 +29,26 @@
 +source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
 +DATA = $(source_highlightdochtml_DATA)
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ABSOLUTEDATADIR = @ABSOLUTEDATADIR@
  ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -184,6 +186,7 @@ sbindir = @sbindir@
+@@ -188,6 +190,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 = --style-file $(top_srcdir)/src/default.style
-@@ -210,7 +213,7 @@ EXTRA_DIST = colors.html source-highligh
-              gpl.texinfo flex_scanner.ll $(GENERATEDINFOS) \
-              source-highlight.1
+ STD_STYLE = --style-file $(top_srcdir)/src/default.style
+@@ -217,7 +220,7 @@ EXTRA_DIST = colors.html source-highligh
+            comment-show.lang \
+            SimpleClass.java SimpleClass-doc.html UsageExample.java
  
 -source_highlightdoc_DATA = colors.html source-highlight.html \
 +source_highlightdochtml_DATA = colors.html source-highlight.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 \
-@@ -250,9 +253,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+@@ -264,9 +267,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
              exit 1;; \
          esac; \
        done; \
@@ -60,7 +60,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
-@@ -444,22 +447,22 @@ uninstall-man1:
+@@ -456,22 +459,22 @@ uninstall-man1:
          echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
          rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
        done
@@ -92,7 +92,7 @@
        done
  tags: TAGS
  TAGS:
-@@ -502,7 +505,7 @@ check-am: all-am
+@@ -514,7 +517,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA)
  installdirs:
@@ -101,7 +101,7 @@
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
  install: install-am
-@@ -551,7 +554,7 @@ info: info-am
+@@ -563,7 +566,7 @@ info: info-am
  info-am: $(INFO_DEPS)
  
  install-data-am: install-info-am install-man \
@@ -110,7 +110,7 @@
  
  install-exec-am:
  
-@@ -609,7 +612,7 @@ ps: ps-am
+@@ -621,7 +624,7 @@ ps: ps-am
  ps-am: $(PSS)
  
  uninstall-am: uninstall-info-am uninstall-man \
@@ -119,7 +119,7 @@
  
  uninstall-man: uninstall-man1
  
-@@ -617,13 +620,14 @@ uninstall-man: uninstall-man1
+@@ -629,13 +632,13 @@ uninstall-man: uninstall-man1
        distclean distclean-generic distdir dvi dvi-am html html-am \
        info info-am install install-am install-data install-data-am \
        install-exec install-exec-am install-info install-info-am \
@@ -131,8 +131,7 @@
        mostlyclean-aminfo mostlyclean-generic mostlyclean-vti 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
++      uninstall-man uninstall-man1 uninstall-source_highlightdochtmlDATA
  
  
- source-highlight.texinfo: help-output.texinfo lang-list.texinfo 
outlang-list.texinfo test.java.texinfo debug.java.texinfo style.texinfo
+ source-highlight.texinfo: $(GENERATEDINFOS)
diff -d -N -r -u source-highlight.orig/patches/patch-ag 
source-highlight/patches/patch-ag
--- source-highlight.orig/patches/patch-ag      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-ag   2005-12-18 04:43:17.000000000 +0100
@@ -1,6 +1,6 @@
 $NetBSD: patch-ag,v 1.7 2005/10/10 09:05:59 seb Exp $
 
---- tests/Makefile.in.orig     2005-10-09 09:27:08.000000000 +0000
+--- tests/Makefile.in.orig     2005-12-09 18:14:45.000000000 +0100
 +++ tests/Makefile.in
 @@ -55,6 +55,8 @@ am__configure_deps = $(am__aclocal_m4_de
  mkinstalldirs = $(install_sh) -d
@@ -22,26 +22,26 @@
 +source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
 +DATA = $(source_highlightdochtml_DATA)
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ABSOLUTEDATADIR = @ABSOLUTEDATADIR@
  ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -168,6 +170,7 @@ sbindir = @sbindir@
+@@ -172,6 +174,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  source_highlightdatadir = @source_highlightdatadir@
  source_highlightdocdir = @source_highlightdocdir@
 +source_highlightdochtmldir = @source_highlightdochtmldir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- STD_TAGS = --style-file $(top_srcdir)/src/default.style
-@@ -261,7 +264,7 @@ erasedir.sed erasedir2.sed
- PROG_NOLANGDEF = $(PROGEXE) --outlang-def=$(srcdir)/simple.outlang 
$(STD_TAGS) --data-dir=$(srcdir)/
- PROG_NOOUTLANGDEF = $(PROGEXE) --lang-def=$(srcdir)/simple.lang $(STD_TAGS)
- CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html 
--footer=$(srcdir)/footer.html --title="Header and footer test"
+ STD_STYLE = --style-file $(top_srcdir)/src/default.style
+@@ -287,7 +290,7 @@ CPP2HTML_WREFS = $(CPP2HTML) --title="Co
+ CPP2LATEX_WREFS = $(CPP2TEX) --title="Contains references to tags" 
--gen-references=postline --line-number --ctags=""
+ CPP2LATEX_WREFSPOST = $(CPP2TEX) --title="Contains references to tags" 
--gen-references=postdoc --line-number --ctags=""
+ CTAGS_CMD = $(CTAGS) --excmd=n --tag-relative=yes 
 -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.rb.html test.js.html test.lua.html test.ml.html \
  test.sml.html test.log.html access.log.html auth.log.html error.log.html 
syslog.log.html test.htm.html test.java.tex.html \
- syslog.style
-@@ -281,9 +284,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+ syslog.style \
+@@ -309,9 +312,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
              exit 1;; \
          esac; \
        done; \
@@ -53,7 +53,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
-@@ -306,22 +309,22 @@ valgrind_tests.sh: $(top_builddir)/confi
+@@ -334,22 +337,22 @@ valgrind_tests.sh: $(top_builddir)/confi
  valgrind_test.sh: $(top_builddir)/config.status $(srcdir)/valgrind_test.sh.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  uninstall-info-am:
@@ -85,7 +85,7 @@
        done
  tags: TAGS
  TAGS:
-@@ -361,7 +364,7 @@ check-am: all-am
+@@ -389,7 +392,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(DATA)
  installdirs:
@@ -94,7 +94,7 @@
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
  install: install-am
-@@ -407,7 +410,7 @@ info: info-am
+@@ -436,7 +439,7 @@ info: info-am
  
  info-am:
  
@@ -103,7 +103,7 @@
  
  install-exec-am:
  
-@@ -433,17 +436,17 @@ ps: ps-am
+@@ -462,17 +465,17 @@ ps: ps-am
  
  ps-am:
  
@@ -123,4 +123,4 @@
 +      uninstall-source_highlightdochtmlDATA
  
  
- %.cc.html: %.cc
+ %.show: $(top_srcdir)/src/%.lang
diff -d -N -r -u source-highlight.orig/patches/patch-ah 
source-highlight/patches/patch-ah
--- source-highlight.orig/patches/patch-ah      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-ah   2005-12-18 04:46:24.000000000 +0100
@@ -1,15 +1,15 @@
 $NetBSD: patch-ah,v 1.8 2005/10/10 09:05:59 seb Exp $
 
---- doc/source-highlight.info.orig     2005-10-09 20:07:02.000000000 +0000
+--- doc/source-highlight.info.orig     2005-12-09 18:52:46.000000000 +0100
 +++ doc/source-highlight.info
 @@ -1,6 +1,12 @@
- This is source-highlight.info, produced by makeinfo version 4.7 from
+ This is source-highlight.info, produced by makeinfo version 4.8 from
  source-highlight.texinfo.
  
 +INFO-DIR-SECTION Programming & development tools
 +START-INFO-DIR-ENTRY
 +* GNU Source-highlight: (source-highlight).
-+                        Procude syntax highlighted documents from source 
files.
++                        Produce syntax highlighted documents from source 
files.
 +END-INFO-DIR-ENTRY
 +
     This file documents the `source-highlight' command which given a
diff -d -N -r -u source-highlight.orig/patches/patch-ai 
source-highlight/patches/patch-ai
--- source-highlight.orig/patches/patch-ai      2005-12-18 03:29:51.000000000 
+0100
+++ source-highlight/patches/patch-ai   2005-12-18 04:43:17.000000000 +0100
@@ -1,6 +1,6 @@
 $NetBSD: patch-ai,v 1.1 2004/10/23 17:47:16 seb Exp $
 
---- src/lib/outputgenerator.h.orig     2004-09-26 09:34:55.000000000 +0000
+--- src/lib/outputgenerator.h.orig     2005-10-15 16:55:34.000000000 +0200
 +++ src/lib/outputgenerator.h
 @@ -13,6 +13,7 @@
  #define OUTPUTGENERATOR_H
@@ -8,5 +8,5 @@
  #include <iostream>
 +#include <string>
  
- class OutputBuffer;
- 
+ /**
+ base class that actually writes the generated output to the output stream
diff -d -N -r -u source-highlight.orig/patches/patch-aj 
source-highlight/patches/patch-aj
--- source-highlight.orig/patches/patch-aj      1970-01-01 01:00:00.000000000 
+0100
+++ source-highlight/patches/patch-aj   2005-12-18 04:43:17.000000000 +0100
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/lib/cmdline.c.orig     2005-10-15 16:55:33.000000000 +0200
++++ src/lib/cmdline.c
+@@ -115,7 +115,7 @@ void clear_args (struct gengetopt_args_i
+   args_info->gen_references_orig = NULL;
+   args_info->ctags_file_arg = gengetopt_strdup ("tags");
+   args_info->ctags_file_orig = NULL;
+-  args_info->ctags_arg = gengetopt_strdup ("ctags --excmd=n 
--tag-relative=yes");
++  args_info->ctags_arg = gengetopt_strdup ("exctags --excmd=n 
--tag-relative=yes");
+   args_info->ctags_orig = NULL;
+   args_info->gen_version_flag = 1;
+   args_info->check_lang_arg = NULL;
+@@ -167,7 +167,7 @@ cmdline_parser_print_help (void)
+   printf("%s\n","      --line-number-ref[=prefix]\n                           
     number all output lines and generate an anchor, \n                         
         made of the specified prefix + the line \n                             
     number  (default=`line')");
+   printf("%s\n","      --gen-references=STRING   generate references  
(possible \n                                  values=\"inline\", \"postline\", 
\"postdoc\" \n                                  default=`inline')");
+   printf("%s\n","      --ctags-file=filename     specify the file generated 
by ctags that will \n                                  be used to generate 
references  \n                                  (default=`tags')");
+-  printf("%s\n","      --ctags=cmd               how to run the ctags 
command.  If this option \n                                  is not specified, 
ctags will be executed with \n                                  the default 
value.  If it is specified with \n                                  an empty 
string, ctags will not be executed \n                                  at all  
(default=`ctags --excmd=n \n                                  
--tag-relative=yes')");
++  printf("%s\n","      --ctags=cmd               how to run the ctags 
command.  If this option \n                                  is not specified, 
ctags will be executed with \n                                  the default 
value.  If it is specified with \n                                  an empty 
string, ctags will not be executed \n                                  at all  
(default=`exctags --excmd=n \n                                  
--tag-relative=yes')");
+   printf("%s\n","\ntesting:");
+   printf("%s\n","      --gen-version             put source-highlight version 
in the generated \n                                  file  (default=on)");
+   printf("%s\n","      --check-lang=filename     only check the correctness 
of a language \n                                  definition file");
diff -d -N -r -u source-highlight.orig/patches/patch-ak 
source-highlight/patches/patch-ak
--- source-highlight.orig/patches/patch-ak      1970-01-01 01:00:00.000000000 
+0100
+++ source-highlight/patches/patch-ak   2005-12-18 04:43:17.000000000 +0100
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- doc/source-highlight.1.orig        2005-12-18 04:37:03.000000000 +0100
++++ doc/source-highlight.1
+@@ -124,7 +124,7 @@ how to run the ctags command.  If this o
+ is not specified, ctags will be executed with
+ the default value.  If it is specified with
+ an empty string, ctags will not be executed
+-at all  (default=`ctags \fB\-\-excmd\fR=\fIn\fR
++at all  (default=`exctags \fB\-\-excmd\fR=\fIn\fR
+ \fB\-\-tag\-relative\fR=\fIyes\fR')
+ .SS "testing:"
+ .TP

>Fix:
Prev by Date: pkg/32324: mail/imap-uw doesn't compile in tiger (darwin)
Next by Date: Re: pkg/28811
Previous by Thread: pkg/32324: mail/imap-uw doesn't compile in tiger (darwin)
Next by Thread: Re: pkg/31203: Update graphics/ruby-RMagick from 1.9.0 to 1.9.1
Indexes:
Home | Main Index | Thread Index | Old Index