CVS commit: pkgsrc/textproc/libhighlight

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/libhighlight
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Sun, 22 Sep 2024 18:58:12 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Sep 22 18:58:12 UTC 2024

Modified Files:
        pkgsrc/textproc/libhighlight: Makefile.common PLIST distinfo
        pkgsrc/textproc/libhighlight/patches: patch-extras_swig_makefile
Removed Files:
        pkgsrc/textproc/libhighlight/patches: patch-src_core_syntaxreader.cpp
            patch-src_include_syntaxreader.h

Log Message:
highlight: update to 4.14. Changes:

- updated astyle lib to version 3.6.2
- fixed SWIG lib compilation
- updated Terraform file suffix list


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/textproc/libhighlight/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/libhighlight/patches/patch-src_core_syntaxreader.cpp \
    pkgsrc/textproc/libhighlight/patches/patch-src_include_syntaxreader.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/libhighlight/Makefile.common
diff -u pkgsrc/textproc/libhighlight/Makefile.common:1.32 pkgsrc/textproc/libhighlight/Makefile.common:1.33
--- pkgsrc/textproc/libhighlight/Makefile.common:1.32   Fri Aug 16 15:27:59 2024
+++ pkgsrc/textproc/libhighlight/Makefile.common        Sun Sep 22 18:58:12 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.32 2024/08/16 15:27:59 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.33 2024/09/22 18:58:12 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               4.13
+VERSION=               4.14
 CATEGORIES=            textproc
 MASTER_SITES=          http://www.andre-simon.de/zip/
 EXTRACT_SUFX=          .tar.bz2
@@ -16,8 +16,8 @@ LICENSE=              gnu-gpl-v3
 
 USE_TOOLS+=            gmake pkg-config
 USE_LANGUAGES=         c c++
-FORCE_CXX_STD=         c++17
 USE_CXX_FEATURES=      c++17
+FORCE_CXX_STD=         c++17
 USE_LIBTOOL=           yes
 MAKE_FILE=             makefile
 

Index: pkgsrc/textproc/libhighlight/PLIST
diff -u pkgsrc/textproc/libhighlight/PLIST:1.27 pkgsrc/textproc/libhighlight/PLIST:1.28
--- pkgsrc/textproc/libhighlight/PLIST:1.27     Fri Aug 16 15:27:59 2024
+++ pkgsrc/textproc/libhighlight/PLIST  Sun Sep 22 18:58:12 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2024/08/16 15:27:59 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.28 2024/09/22 18:58:12 schmonz Exp $
 lib/libhighlight.la
 share/bash-completion/completions/highlight
 share/doc/highlight/AUTHORS
@@ -120,6 +120,7 @@ share/highlight/langDefs/crystal.lang
 share/highlight/langDefs/cs_block_regex.lang
 share/highlight/langDefs/csharp.lang
 share/highlight/langDefs/css.lang
+share/highlight/langDefs/cue.lang
 share/highlight/langDefs/d.lang
 share/highlight/langDefs/dart.lang
 share/highlight/langDefs/delphi.lang

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.35 pkgsrc/textproc/libhighlight/distinfo:1.36
--- pkgsrc/textproc/libhighlight/distinfo:1.35  Fri Aug 16 15:27:59 2024
+++ pkgsrc/textproc/libhighlight/distinfo       Sun Sep 22 18:58:12 2024
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.35 2024/08/16 15:27:59 schmonz Exp $
+$NetBSD: distinfo,v 1.36 2024/09/22 18:58:12 schmonz Exp $
 
-BLAKE2s (highlight-4.13.tar.bz2) = f04a1f86f1f23a827b3ec07623d2684d37f96cb3e99fd97079a953100fde7d0c
-SHA512 (highlight-4.13.tar.bz2) = 45f36ce3256567d45806d8cd31d595fb38c3d59933e9d99aeb980c9115a304c3b81597ac906c4439dd919e4983de8a9559fd52efa280bdb86c607efc4959c5ae
-Size (highlight-4.13.tar.bz2) = 1508433 bytes
-SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
+BLAKE2s (highlight-4.14.tar.bz2) = 663b1c284d4cd77ceb23ba475c81906759c5757306f333f6ca18eea2034e167f
+SHA512 (highlight-4.14.tar.bz2) = 485c426b82dfbc55d18ae5f9f1189b1d5af1c5349108ef202eb6fc23b1422c33d9b109dea7a2adb2b5c1089a7ed4caf8290451dd65f324c325e9f23cd2603b89
+Size (highlight-4.14.tar.bz2) = 1508512 bytes
+SHA1 (patch-extras_swig_makefile) = 56d32288f5662303d81ebd0ff7ff7672d50cd9d4
 SHA1 (patch-makefile) = 92f6514c39f6aa437f9beaafc10a1f6275e241b3
 SHA1 (patch-src_core_platform__fs.cpp) = be41ce38ac7365234fe68257dbee3b881f8e2b52
-SHA1 (patch-src_core_syntaxreader.cpp) = bcdecf28ea77c219f24ed882b8455055f222a844
 SHA1 (patch-src_gui-qt_highlight.pro) = c3aa498e49ddaffd98149e67b34490480d0e4a7c
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_include_syntaxreader.h) = 3f8a202cadfabce59f475f9f9ab4948e2154e73c
 SHA1 (patch-src_makefile) = d65034a2beb30251458edaf5ef678546453cb68b

Index: pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile:1.3 pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile:1.4
--- pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile:1.3 Wed Dec 18 01:34:34 2019
+++ pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile     Sun Sep 22 18:58:12 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-extras_swig_makefile,v 1.3 2019/12/18 01:34:34 schmonz Exp $
+$NetBSD: patch-extras_swig_makefile,v 1.4 2024/09/22 18:58:12 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- extras/swig/makefile.orig  2019-11-11 16:57:10.000000000 +0000
+--- extras/swig/makefile.orig  2024-09-13 13:45:24.000000000 +0000
 +++ extras/swig/makefile
 @@ -1,6 +1,6 @@
  
 -CXX=g++
--CFLAGS=-g -O2 -fPIC
+-CFLAGS=-g -O2 -fPIC -std=c++17
 +#CXX=g++
-+#CFLAGS=-g -O2 -fPIC
++#CFLAGS=-g -O2 -fPIC -std=c++17
  
  HL_INC=../../src/include/
  HL_SRC=../../src/
@@ -24,7 +24,7 @@ Use pkgsrc-specified compiler and flags.
        touch $@
  
  python: lib-stamp
--      swig -c++ -python -o highlight_wrap.cpp  highlight.i
+-      swig -c++ -std=c++17 -python -o highlight_wrap.cpp  highlight.i
 -      ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}
 -      ${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
 +      swig3.0 -c++ -python -o highlight_wrap.cpp  highlight.i
@@ -32,20 +32,20 @@ Use pkgsrc-specified compiler and flags.
 +      ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
  
  perl: lib-stamp
--      swig -c++ -perl -o highlight_wrap.cpp  highlight.i
+-      swig -c++ -std=c++17 -perl -o highlight_wrap.cpp  highlight.i
 -      ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
 -      ${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
 +      swig3.0 -c++ -perl -o highlight_wrap.cpp  highlight.i
 +      ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
-+      ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lperl -o highlight.so
++      ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
  
  php: lib-stamp
--      swig -c++ -php -o highlight_wrap.cpp highlight.i
+-      swig -c++ -std=c++17 -php -o highlight_wrap.cpp highlight.i
 -      ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
 -      ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
 +      swig3.0 -c++ -php -o highlight_wrap.cpp highlight.i
 +      ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
-+      ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lphp -o highlight.so
++      ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
  
  clean: python-clean perl-clean php-clean
        rm -f *-stamp

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index