pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/source-highlight Update to version 2.1.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/3fc812ee13fc
branches: trunk
changeset: 500527:3fc812ee13fc
user: seb <seb%pkgsrc.org@localhost>
date: Mon Oct 10 09:05:59 2005 +0000
description:
Update to version 2.1.2.
Add build dependencies on GNU make and GNU sed for 'test' target's benefit.
Support for input chroot, via make variable SOURCE_HIGHLIGHT_INPUT_CHROOT,
deactivated otherwise the build is broken.
XXX Is 'TOOLS_PLATFORM.gsed= # empty' the proper way to override a
the platform sed tool ?
Relinquish stewardship.
Changes since last packaged version (1.11):
Version 2.1.2
* fixed conversion of hexadecimal characters in output language
definitions
* fixed compilation error with regex 1.33
* include man page
* fixed a bug with LaTeX output of " with some inputencs
Version 2.1.1
* fixed a bug that sigsegv when more than one input file
is provided
* fixed a compilation error with gcc 4.0
Version 2.1
* Included obsolete man page.
* output language format specifications are read at run-time
so that new output languages can be easily added dynamically
(without recompiling the sources) by using a simple syntax.
* "fixed" and "notfixed" styles can be specified.
* fixed the handling of end-of-line (processed only once)
* LaTeX output
* TeXinfo output
* debug of a language definition
* tags.j2h files are now called style files.
* renamed --tags-file option in --style-file
* allows to specify a prefix for the generated line number anchors
* --header and --footer do not imply --doc
* language definition for LogTalk and LaTeX
Version 2.0
* Language specifications are read at run-time, so that
new languages can be easily added dynamically (without recompiling
the sources) by using a simple syntax.
* "nonsensitive" for simple definitions
* cgi version not built automatically
* failsafe option to simply output the input file when no
language definition is found
* functionalities with less improved.
Version 1.11.1
* fixed compilations problems on some Unix compilers
diffstat:
textproc/source-highlight/Makefile | 23 +-
textproc/source-highlight/PLIST | 58 ++-
textproc/source-highlight/distinfo | 24 +-
textproc/source-highlight/patches/patch-aa | 19 +-
textproc/source-highlight/patches/patch-ab | 46 +-
textproc/source-highlight/patches/patch-ac | 22 +-
textproc/source-highlight/patches/patch-ad | 534 +++++++++++++++++++++++-----
textproc/source-highlight/patches/patch-ae | 6 +-
textproc/source-highlight/patches/patch-af | 157 +++++++-
textproc/source-highlight/patches/patch-ag | 131 ++++++-
textproc/source-highlight/patches/patch-ah | 116 +-----
11 files changed, 828 insertions(+), 308 deletions(-)
diffs (truncated from 1257 to 300 lines):
diff -r 16fd56eb505c -r 3fc812ee13fc textproc/source-highlight/Makefile
--- a/textproc/source-highlight/Makefile Mon Oct 10 08:35:54 2005 +0000
+++ b/textproc/source-highlight/Makefile Mon Oct 10 09:05:59 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/10 09:05:59 seb Exp $
#
-DISTNAME= source-highlight-1.11
+DISTNAME= source-highlight-2.1.2
SVR4_PKGNAME= srchl
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=src-highlite/}
@@ -13,13 +13,26 @@
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
+INFO_FILES= source-highlight.info
+
+# this is only really needed for the 'test' target
+USE_TOOLS+= gmake gsed
TEST_TARGET= check
+BUILDLINK_TRANSFORM+= l:boost_regex:boost_regex-mt
+
.include "../../mk/bsd.prefs.mk"
-.ifdef SOURCE_HIGHLIGHT_INPUT_CHROOT
-CONFIGURE_ARGS+= --enable-input-chroot=${SOURCE_HIGHLIGHT_INPUT_CHROOT}
-BUILD_DEFS+= SOURCE_HIGHLIGHT_INPUT_CHROOT
+.if "${OPSYS}" == "NetBSD"
+# We really need GNU sed not NetBSD's GNuish sed
+TOOLS_PLATFORM.gsed= # empty
.endif
+# Build is broken with input chroot
+#.ifdef SOURCE_HIGHLIGHT_INPUT_CHROOT
+#CONFIGURE_ARGS+= --enable-input-chroot=${SOURCE_HIGHLIGHT_INPUT_CHROOT:Q}
+#BUILD_DEFS+= SOURCE_HIGHLIGHT_INPUT_CHROOT
+#.endif
+
+.include "../../devel/boost-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 16fd56eb505c -r 3fc812ee13fc textproc/source-highlight/PLIST
--- a/textproc/source-highlight/PLIST Mon Oct 10 08:35:54 2005 +0000
+++ b/textproc/source-highlight/PLIST Mon Oct 10 09:05:59 2005 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/21 00:15:47 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/10/10 09:05:59 seb Exp $
bin/cpp2html
bin/java2html
bin/source-highlight
-bin/source-highlight-cgi
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
@@ -26,13 +26,15 @@
share/doc/html/source-highlight/cpp2html.css
share/doc/html/source-highlight/error.log.html
share/doc/html/source-highlight/flex_scanner.ll.html
+share/doc/html/source-highlight/index.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/syslog.log.html
-share/doc/html/source-highlight/tags.esc
-share/doc/html/source-highlight/tags.syslog
+share/doc/html/source-highlight/syslog.style
+share/doc/html/source-highlight/test.htm.html
+share/doc/html/source-highlight/test.java.tex.html
share/doc/html/source-highlight/test.js.html
share/doc/html/source-highlight/test.log.html
share/doc/html/source-highlight/test.lua.html
@@ -53,8 +55,52 @@
share/doc/source-highlight/README.compile_VC6
share/doc/source-highlight/THANKS
share/doc/source-highlight/TODO.txt
-share/source-highlight/tags.j2h
-share/source-highlight/tags2.j2h
+share/source-highlight/bison.lang
+share/source-highlight/c_comment.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/esc.outlang
+share/source-highlight/esc.style
+share/source-highlight/flex.lang
+share/source-highlight/fortran.lang
+share/source-highlight/function.lang
+share/source-highlight/html.lang
+share/source-highlight/html.outlang
+share/source-highlight/html_common.outlang
+share/source-highlight/htmldoc.outlang
+share/source-highlight/java.lang
+share/source-highlight/javascript.lang
+share/source-highlight/lang.map
+share/source-highlight/latex.lang
+share/source-highlight/latex.outlang
+share/source-highlight/latexcolor.outlang
+share/source-highlight/latexcolordoc.outlang
+share/source-highlight/latexdoc.outlang
+share/source-highlight/log.lang
+share/source-highlight/logtalk.lang
+share/source-highlight/lua.lang
+share/source-highlight/number.lang
+share/source-highlight/outlang.map
+share/source-highlight/pascal.lang
+share/source-highlight/perl.lang
+share/source-highlight/php.lang
+share/source-highlight/prolog.lang
+share/source-highlight/python.lang
+share/source-highlight/ruby.lang
+share/source-highlight/sml.lang
+share/source-highlight/style2.style
+share/source-highlight/style3.style
+share/source-highlight/symbols.lang
+share/source-highlight/texinfo.outlang
+share/source-highlight/texinfo.style
+share/source-highlight/url.lang
+share/source-highlight/xhtml.outlang
+share/source-highlight/xhtmlcss.outlang
+share/source-highlight/xhtmldoc.outlang
@dirrm share/source-highlight
@dirrm share/doc/source-highlight
@dirrm share/doc/html/source-highlight
diff -r 16fd56eb505c -r 3fc812ee13fc textproc/source-highlight/distinfo
--- a/textproc/source-highlight/distinfo Mon Oct 10 08:35:54 2005 +0000
+++ b/textproc/source-highlight/distinfo Mon Oct 10 09:05:59 2005 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/10/10 09:05:59 seb Exp $
-SHA1 (source-highlight-1.11.tar.gz) = 67bfdfcfe525dc4e61143e8e5865f8d977fe2b58
-RMD160 (source-highlight-1.11.tar.gz) = c096bcbf0985bfff0c7416acd27b25313761c905
-Size (source-highlight-1.11.tar.gz) = 722472 bytes
-SHA1 (patch-aa) = 3f124bcdc738222dedd0f961e26da3f374700680
-SHA1 (patch-ab) = 8b8d92e8bfe8773b7eeff6d7d794f4b8f47218ac
-SHA1 (patch-ac) = 62475d945664b84eb4a6e43e5cd4c75f9049eefe
-SHA1 (patch-ad) = e9635748cedbc11d7a0c7a68f149e8647a3ddbc0
-SHA1 (patch-ae) = ea3b682e89556a8c32b990585c07c6cd48fb24d9
-SHA1 (patch-af) = 55f91e0f744ca0028db5aa04806084e057191637
-SHA1 (patch-ag) = e56f2f94ae8cc22766d11ee3729ad3e6410f3240
-SHA1 (patch-ah) = ba914d5f459bda5da8a57ad83b53abb4bc474701
+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
diff -r 16fd56eb505c -r 3fc812ee13fc textproc/source-highlight/patches/patch-aa
--- a/textproc/source-highlight/patches/patch-aa Mon Oct 10 08:35:54 2005 +0000
+++ b/textproc/source-highlight/patches/patch-aa Mon Oct 10 09:05:59 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/10 09:05:59 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)
+--- configure.ac.orig 2005-08-25 14:09:51.000000000 +0000
++++ configure.ac
+@@ -17,9 +17,11 @@ AM_INIT_AUTOMAKE(source-highlight,2.1.2)
AC_SUBST(source_highlightdatadir)
AC_SUBST(source_highlightdocdir)
@@ -12,5 +12,12 @@
source_highlightdocdir=$datadir/doc/source-highlight
+source_highlightdochtmldir=$datadir/doc/html/source-highlight
- dnl scanner version
-
+ 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.])
+-fi
+\ No newline at end of file
++fi
diff -r 16fd56eb505c -r 3fc812ee13fc textproc/source-highlight/patches/patch-ab
--- a/textproc/source-highlight/patches/patch-ab Mon Oct 10 08:35:54 2005 +0000
+++ b/textproc/source-highlight/patches/patch-ab Mon Oct 10 09:05:59 2005 +0000
@@ -1,32 +1,20 @@
-$NetBSD: patch-ab,v 1.2 2004/08/16 15:21:45 seb Exp $
+$NetBSD: patch-ab,v 1.3 2005/10/10 09:05:59 seb Exp $
---- configure.orig 2004-08-16 14:10:31.000000000 +0000
-+++ 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 AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot source_highlightdatadir
source_highlightdocdir JAVA_SCANNER_VERSION CPP_SCANNER_VERSION PROLOG_SCANNER_VERSION PERL_SCANNER_VERSION PHP3_SCANNER_VERSION PYTHON_SCANNER_VERSION 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 CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS CXXCPP GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE YFLAGS TAR 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 AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot source_highlightdatadir
source_highlightdocdir source_highlightdochtmldir JAVA_SCANNER_VERSION CPP_SCANNER_VERSION PROLOG_SCANNER_VERSION PERL_SCANNER_VERSION PHP3_SCANNER_VERSION PYTHON_SCANNER_VERSION 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 CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS CXXCPP GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE YFLAGS TAR
LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -1744,8 +1744,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
-
+--- doc/Makefile.am.orig 2005-08-25 14:10:51.000000000 +0000
++++ doc/Makefile.am
+@@ -71,7 +71,7 @@ EXTRA_DIST = colors.html source-highligh
+ gpl.texinfo flex_scanner.ll $(GENERATEDINFOS) \
+ source-highlight.1
-
-+
- source_highlightdatadir=$datadir/source-highlight
- source_highlightdocdir=$datadir/doc/source-highlight
-+source_highlightdochtmldir=$datadir/doc/html/source-highlight
-
-
+-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)
-@@ -7341,6 +7343,7 @@ s,@SET_MAKE@,$SET_MAKE,;t t
- s,@am__leading_dot@,$am__leading_dot,;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
+-DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
+\ No newline at end of file
++DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
diff -r 16fd56eb505c -r 3fc812ee13fc textproc/source-highlight/patches/patch-ac
--- a/textproc/source-highlight/patches/patch-ac Mon Oct 10 08:35:54 2005 +0000
+++ b/textproc/source-highlight/patches/patch-ac Mon Oct 10 09:05:59 2005 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2003/06/12 01:17:31 seb Exp $
+$NetBSD: patch-ac,v 1.3 2005/10/10 09:05:59 seb Exp $
---- 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 \
- startapp.cc.html cmdline.c.html cmdline.h.html
+--- tests/Makefile.am.orig 2005-08-25 14:01:56.000000000 +0000
++++ tests/Makefile.am
+@@ -459,7 +459,7 @@ check_debug: debug.debug
+ @echo expect no output from diff
+ diff $(srcdir)/debug.debug debug.out.debug
--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 \
+-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
diff -r 16fd56eb505c -r 3fc812ee13fc textproc/source-highlight/patches/patch-ad
--- a/textproc/source-highlight/patches/patch-ad Mon Oct 10 08:35:54 2005 +0000
+++ b/textproc/source-highlight/patches/patch-ad Mon Oct 10 09:05:59 2005 +0000
@@ -1,110 +1,436 @@
-$NetBSD: patch-ad,v 1.4 2004/08/16 15:21:45 seb Exp $
+$NetBSD: patch-ad,v 1.5 2005/10/10 09:05:59 seb Exp $
---- doc/Makefile.in.orig 2004-08-16 14:10:12.000000000 +0000
-+++ doc/Makefile.in
-@@ -59,11 +59,11 @@ CONFIG_CLEAN_FILES = source-highlight.ht
- SOURCES =
- DIST_SOURCES =
- man1dir = $(mandir)/man1
--am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdocdir)"
-+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdochtmldir)"
- NROFF = nroff
- MANS = $(man_MANS)
--source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(source_highlightdoc_DATA)
-+source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(source_highlightdochtml_DATA)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -161,6 +161,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- source_highlightdatadir = @source_highlightdatadir@
Home |
Main Index |
Thread Index |
Old Index