CVS commit: pkgsrc/textproc/libhighlight

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Mar 18 18:56:40 UTC 2024

Modified Files:
        pkgsrc/textproc/libhighlight: Makefile.common PLIST distinfo
        pkgsrc/textproc/libhighlight/patches: patch-src_gui-qt_highlight.pro
            patch-src_makefile

Log Message:
libhighlight: update to 4.11. Changes:

- updated astyle lib to version 3.4.13
- updated java definition
- updated solidity definition
- fix backslash symbol in man page
- src/makefile: added -std=c++17 to enable modern C++ features


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/textproc/libhighlight/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/textproc/libhighlight/patches/patch-src_makefile

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.29 pkgsrc/textproc/libhighlight/Makefile.common:1.30
--- pkgsrc/textproc/libhighlight/Makefile.common:1.29   Wed Nov  8 11:11:35 2023
+++ pkgsrc/textproc/libhighlight/Makefile.common        Mon Mar 18 18:56:40 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.29 2023/11/08 11:11:35 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.30 2024/03/18 18:56:40 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               4.10
+VERSION=               4.11
 CATEGORIES=            textproc
 MASTER_SITES=          http://www.andre-simon.de/zip/
 EXTRACT_SUFX=          .tar.bz2
@@ -15,7 +15,9 @@ COMMENT=              Converts source code to format
 LICENSE=               gnu-gpl-v3
 
 USE_TOOLS+=            gmake pkg-config
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
+FORCE_CXX_STD=         c++17
+USE_CXX_FEATURES=      c++17
 USE_LIBTOOL=           yes
 MAKE_FILE=             makefile
 

Index: pkgsrc/textproc/libhighlight/PLIST
diff -u pkgsrc/textproc/libhighlight/PLIST:1.24 pkgsrc/textproc/libhighlight/PLIST:1.25
--- pkgsrc/textproc/libhighlight/PLIST:1.24     Fri Oct 20 15:58:49 2023
+++ pkgsrc/textproc/libhighlight/PLIST  Mon Mar 18 18:56:40 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2023/10/20 15:58:49 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.25 2024/03/18 18:56:40 schmonz Exp $
 lib/libhighlight.la
 share/bash-completion/completions/highlight
 share/doc/highlight/AUTHORS
@@ -205,6 +205,7 @@ share/highlight/langDefs/miranda.lang
 share/highlight/langDefs/mod2.lang
 share/highlight/langDefs/mod3.lang
 share/highlight/langDefs/modelica.lang
+share/highlight/langDefs/mojo.lang
 share/highlight/langDefs/moon.lang
 share/highlight/langDefs/ms.lang
 share/highlight/langDefs/msl.lang

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.32 pkgsrc/textproc/libhighlight/distinfo:1.33
--- pkgsrc/textproc/libhighlight/distinfo:1.32  Wed Nov  8 11:11:35 2023
+++ pkgsrc/textproc/libhighlight/distinfo       Mon Mar 18 18:56:40 2024
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.32 2023/11/08 11:11:35 schmonz Exp $
+$NetBSD: distinfo,v 1.33 2024/03/18 18:56:40 schmonz Exp $
 
-BLAKE2s (highlight-4.10.tar.bz2) = 9e703a8553ebee5a6202e196d192dab16fe30c57d6ac5b4fbf4d4373d926673d
-SHA512 (highlight-4.10.tar.bz2) = 30e3590ea8673e9a6b6c8fc3c2b03fce6a708fa44dfb265a0495002ef4c0f87ccd22d107e64301644e3abfd023c5f695d3d524501eb6b3a0f99225a8b23f315f
-Size (highlight-4.10.tar.bz2) = 1498745 bytes
+BLAKE2s (highlight-4.11.tar.bz2) = 83a554aac0cc3afafe956fa330f31e8926529c6629eda1551aa3aedc4f35f4dd
+SHA512 (highlight-4.11.tar.bz2) = eb0c92e5dc3ecf280bf6e5a4e68ffb0289a09b3b92fb37756495a5c4e1936800b74385ea0eec2650cae2c690715cc37fd7eeff13e36615410af4c2edd9f2c868
+Size (highlight-4.11.tar.bz2) = 1502154 bytes
 SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
 SHA1 (patch-makefile) = 92f6514c39f6aa437f9beaafc10a1f6275e241b3
 SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
-SHA1 (patch-src_gui-qt_highlight.pro) = 48200cbff5c0004ecae5ed013de6eef65ab260fa
+SHA1 (patch-src_gui-qt_highlight.pro) = 34c41b702899ef916caa7fdb94c00103e0152959
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = a66c61de0ed3eff5fa9ac2da9d434fcd6c553b51
+SHA1 (patch-src_makefile) = 4052e2e44ae1681bede016929ad11d2095fbf89f

Index: pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro:1.6 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro:1.7
--- pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro:1.6     Wed Sep  6 18:06:23 2023
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro Mon Mar 18 18:56:40 2024
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_gui-qt_highlight.pro,v 1.6 2023/09/06 18:06:23 schmonz Exp $
+$NetBSD: patch-src_gui-qt_highlight.pro,v 1.7 2024/03/18 18:56:40 schmonz Exp $
 
 Restore non-.app macOS build settings from 3.59.
 
---- src/gui-qt/highlight.pro.orig      2023-08-28 20:06:54.000000000 +0000
+--- src/gui-qt/highlight.pro.orig      2024-03-15 14:46:32.000000000 +0000
 +++ src/gui-qt/highlight.pro
 @@ -89,8 +89,11 @@ macx-clang|macx-clang-arm64  {
      INCLUDEPATH += ../../include
-     INCLUDEPATH+=/usr/local/Cellar/boost/1.82.0_1/include
+     INCLUDEPATH+=/usr/local/Cellar/boost/1.84.0_1/include
  
--    QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0
+-    QMAKE_MACOSX_DEPLOYMENT_TARGET=14.0
 -    CONFIG += app_bundle
-+    ###QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0
++    ###QMAKE_MACOSX_DEPLOYMENT_TARGET=14.0
 +    ###CONFIG += app_bundle
 +    QT_CONFIG -= no-pkg-config
 +    CONFIG += link_pkgconfig

Index: pkgsrc/textproc/libhighlight/patches/patch-src_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.12 pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.13
--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.12        Mon Oct  3 18:09:12 2022
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile     Mon Mar 18 18:56:40 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_makefile,v 1.12 2022/10/03 18:09:12 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.13 2024/03/18 18:56:40 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig  2022-09-28 17:52:30.000000000 +0000
+--- src/makefile.orig  2024-03-15 14:46:32.000000000 +0000
 +++ src/makefile
 @@ -13,11 +13,11 @@
  # See src/gui-qt/highlight.pro for the Qt GUI compilation options
@@ -13,8 +13,8 @@ Use pkgsrc-specified compiler and flags.
  
  QMAKE ?= qmake
  
--CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
-+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
++#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
  
  #CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables 
-fstack-clash-protection