pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/libhighlight Update to 4.3. From the changelog:
details: https://anonhg.NetBSD.org/pkgsrc/rev/d989e9eb2c60
branches: trunk
changeset: 386239:d989e9eb2c60
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Mon Oct 03 18:09:12 2022 +0000
description:
Update to 4.3. From the changelog:
- added support for Carbon
- added support for Fortran77 star comments comments (#208)
- added support for PowerShell block comments (#210)
- fixed Python formatted string pattern (#212)
- added new shell completion generation script (#137)
- W32: fixed Windows compilation headers (#138)
diffstat:
textproc/libhighlight/Makefile.common | 4 +-
textproc/libhighlight/PLIST | 6 +-
textproc/libhighlight/distinfo | 14 +-
textproc/libhighlight/patches/patch-makefile | 92 ++++++-----
textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro | 6 +-
textproc/libhighlight/patches/patch-src_makefile | 17 +-
6 files changed, 81 insertions(+), 58 deletions(-)
diffs (truncated from 306 to 300 lines):
diff -r 4d7fd92304ce -r d989e9eb2c60 textproc/libhighlight/Makefile.common
--- a/textproc/libhighlight/Makefile.common Mon Oct 03 16:40:32 2022 +0000
+++ b/textproc/libhighlight/Makefile.common Mon Oct 03 18:09:12 2022 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.20 2022/07/13 00:52:30 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.21 2022/10/03 18:09:12 schmonz Exp $
# used by textproc/highlight/Makefile
# used by textproc/libhighlight/Makefile
# used by textproc/p5-highlight/Makefile
DISTNAME= highlight-${VERSION}
-VERSION= 4.2
+VERSION= 4.3
CATEGORIES= textproc
MASTER_SITES= http://www.andre-simon.de/zip/
EXTRACT_SUFX= .tar.bz2
diff -r 4d7fd92304ce -r d989e9eb2c60 textproc/libhighlight/PLIST
--- a/textproc/libhighlight/PLIST Mon Oct 03 16:40:32 2022 +0000
+++ b/textproc/libhighlight/PLIST Mon Oct 03 18:09:12 2022 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.18 2022/07/13 00:52:30 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.19 2022/10/03 18:09:12 schmonz Exp $
lib/libhighlight.la
+share/bash-completion/completions/highlight
share/doc/highlight/AUTHORS
share/doc/highlight/COPYING
share/doc/highlight/ChangeLog.adoc
@@ -59,6 +60,7 @@
share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.scss
share/examples/highlight/filetypes.conf
share/examples/highlight/lsp.conf
+share/fish/vendor_completions.d/highlight.fish
share/highlight/langDefs/abap.lang
share/highlight/langDefs/abc.lang
share/highlight/langDefs/abnf.lang
@@ -95,6 +97,7 @@
share/highlight/langDefs/bnf.lang
share/highlight/langDefs/boo.lang
share/highlight/langDefs/c.lang
+share/highlight/langDefs/carbon.lang
share/highlight/langDefs/ceylon.lang
share/highlight/langDefs/charmm.lang
share/highlight/langDefs/chill.lang
@@ -550,3 +553,4 @@
share/highlight/themes/zellner.theme
share/highlight/themes/zenburn.theme
share/highlight/themes/zmrok.theme
+share/zsh/site-functions/_highlight
diff -r 4d7fd92304ce -r d989e9eb2c60 textproc/libhighlight/distinfo
--- a/textproc/libhighlight/distinfo Mon Oct 03 16:40:32 2022 +0000
+++ b/textproc/libhighlight/distinfo Mon Oct 03 18:09:12 2022 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.24 2022/07/13 00:52:30 schmonz Exp $
+$NetBSD: distinfo,v 1.25 2022/10/03 18:09:12 schmonz Exp $
-BLAKE2s (highlight-4.2.tar.bz2) = d1cdd84c7a1cd3c6bf10103cccc12e05dbff650357f6161feacc0870fe4c8ae5
-SHA512 (highlight-4.2.tar.bz2) = 6b9a193975c108bca4228188b8f3ddb395eb1cedd689b44fb18bfa7d4cb878cf6148b2275ef2881973fbd7e08b9038e866aad7c406e975fa3d1a59470b6a3867
-Size (highlight-4.2.tar.bz2) = 1479166 bytes
+BLAKE2s (highlight-4.3.tar.bz2) = 892ca1db58a55cd7b38f7887d28a018024a4db9fc289440eb6ad2683d4173d23
+SHA512 (highlight-4.3.tar.bz2) = c0c83b8e17d7bf042d858da9e5cbca611ef5de63da278d052be6f4c6be9818055f2868739e1d02d5734008eb3a25d879580ae7d418196f5bfbfd5e4ff0a693c2
+Size (highlight-4.3.tar.bz2) = 1482114 bytes
SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
-SHA1 (patch-makefile) = c1b34c7b16900a16a2c218e6b440036f9b48d53b
+SHA1 (patch-makefile) = f2fb560b6fb7f49882f0c83e5aed47ca69bdf74b
SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
-SHA1 (patch-src_gui-qt_highlight.pro) = 3976f5eba8c3e818c45453377644e003dc3d0744
+SHA1 (patch-src_gui-qt_highlight.pro) = 8aaf8a937cf3579479b2d87415fb6b50766f2599
SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f
SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = 9d5d4db4c6bf7d1e13544011c569486e68d8de24
+SHA1 (patch-src_makefile) = a66c61de0ed3eff5fa9ac2da9d434fcd6c553b51
diff -r 4d7fd92304ce -r d989e9eb2c60 textproc/libhighlight/patches/patch-makefile
--- a/textproc/libhighlight/patches/patch-makefile Mon Oct 03 16:40:32 2022 +0000
+++ b/textproc/libhighlight/patches/patch-makefile Mon Oct 03 18:09:12 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-makefile,v 1.7 2022/07/13 00:52:31 schmonz Exp $
+$NetBSD: patch-makefile,v 1.8 2022/10/03 18:09:12 schmonz Exp $
Use pkgsrc-provided paths and tools.
---- makefile.orig 2022-03-22 20:58:01.000000000 +0000
+--- makefile.orig 2022-09-28 17:52:30.000000000 +0000
+++ makefile
@@ -7,7 +7,7 @@
DESTDIR =
@@ -11,29 +11,36 @@
-PREFIX = /usr
+#PREFIX = /usr
- # Location of the highlight data files:
- data_dir = ${PREFIX}/share/highlight/
-@@ -19,7 +19,7 @@ bin_dir = ${PREFIX}/bin/
+ # Data file directory
+ data_dir = ${PREFIX}/share/
+@@ -22,7 +22,7 @@ bin_dir = ${PREFIX}/bin/
lib_dir = ${PREFIX}/lib/
# Location of the highlight man pages:
--man_dir = ${PREFIX}/share/man/
+-man_dir = ${data_dir}man/
+man_dir = ${PREFIX}/${PKGMANDIR}/
- # Location of the highlight documentation:
- doc_dir = ${PREFIX}/share/doc/highlight/
-@@ -28,8 +28,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
- examples_dir = ${doc_dir}extras/
+ # Documentation directory
+ doc_dir = ${data_dir}doc/
+@@ -34,11 +34,12 @@ hl_doc_dir = ${doc_dir}highlight/
+ examples_dir = ${hl_doc_dir}extras/
+
+ # Location of system-wide config files:
+-ifeq (${PREFIX},/usr)
+- conf_dir = /etc/
+-else
+- conf_dir = ${PREFIX}/etc/
+-endif
++#ifeq (${PREFIX},/usr)
++# conf_dir = /etc/
++#else
++# conf_dir = ${PREFIX}/etc/
++#endif
++conf_dir = ${PREFIX}/share/examples/
# Location of the highlight config files:
--conf_dir = /etc/highlight/
--#conf_dir = ${PREFIX}/etc/highlight/
-+#conf_dir = /etc/highlight/
-+conf_dir = ${PREFIX}/share/examples/highlight/
-
- # Location of additional gui files
- desktop_apps = ${PREFIX}/share/applications/
-@@ -37,10 +37,10 @@ desktop_icons = ${PREFIX}/share/icons/hi
+ hl_conf_dir = ${conf_dir}highlight/
+@@ -58,10 +59,10 @@ desktop_icons = ${data_dir}icons/hicolor
# Commands:
GZIP=gzip -9f
@@ -47,28 +54,31 @@
+RMDIR=${RM} -r -f
all cli:
- ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -85,19 +85,12 @@ install:
- ${DESTDIR}${data_dir}themes/base16 \
- ${DESTDIR}${data_dir}langDefs \
- ${DESTDIR}${data_dir}plugins
+ ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${hl_data_dir} HL_CONFIG_DIR=${hl_conf_dir}
+@@ -109,22 +110,15 @@ install:
+ ${DESTDIR}${hl_data_dir}themes/base16 \
+ ${DESTDIR}${hl_data_dir}langDefs \
+ ${DESTDIR}${hl_data_dir}plugins
- ${MKDIR} ${DESTDIR}${man_dir}man1/
- ${MKDIR} ${DESTDIR}${man_dir}man5/
+ ${MKDIR} ${DESTDIR}${bash_comp_dir}
+ ${MKDIR} ${DESTDIR}${fish_comp_dir}
+ ${MKDIR} ${DESTDIR}${zsh_comp_dir}
- ${MKDIR} ${DESTDIR}${bin_dir}
- ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
- ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir}
- ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/
- ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/
- ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/
+ ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${hl_data_dir}langDefs/
+ ${INSTALL_DATA} ./*.conf ${DESTDIR}${hl_conf_dir}
+ ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${hl_data_dir}themes/
+ ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${hl_data_dir}themes/base16/
+ ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${hl_data_dir}plugins/
- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/
- ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1
- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
- ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5
- ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
- ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir}
-@@ -114,15 +107,27 @@ install:
+ ${INSTALL_DATA} ./sh-completion/highlight.bash ${DESTDIR}${bash_comp_dir}highlight
+ ${INSTALL_DATA} ./sh-completion/highlight.fish ${DESTDIR}${fish_comp_dir}
+@@ -145,12 +139,11 @@ install:
${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes
${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir}
${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir}
@@ -82,6 +92,10 @@
@echo "Execute 'make install-gui' to install the highlight GUI ('make gui')."
@echo "Do not hesitate to report problems. Unknown bugs are hard to fix."
+@@ -169,6 +162,19 @@ install-gui:
+ ${INSTALL_DATA} ./src/gui-qt/highlight.png ${DESTDIR}${desktop_icons}
+ ${INSTALL_PROGRAM} ./src/highlight-gui ${DESTDIR}${bin_dir}
+
+install-cli:
+ @echo "Installing files for the CLI..."
+ ${MKDIR} ${DESTDIR}${bin_dir}
@@ -95,17 +109,17 @@
+ @echo "Done."
+ @echo "Type highlight --help or man highlight for instructions."
+
- install-gui:
- @echo "Installing files for the GUI..."
- ${MKDIR} ${DESTDIR}${data_dir} \
-@@ -147,8 +152,8 @@ uninstall:
- ${RMDIR} ${DESTDIR}${doc_dir}
- ${RMDIR} ${DESTDIR}${conf_dir}
+ install-lib-shared:
+ ${INSTALL_DATA} ./src/libhighlight.so.4.0 ${DESTDIR}${lib_dir}
+
+@@ -178,8 +184,8 @@ uninstall:
+ ${RMDIR} ${DESTDIR}${hl_doc_dir}
+ ${RMDIR} ${DESTDIR}${hl_conf_dir}
${RMDIR} ${DESTDIR}${examples_dir}
- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz
- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz
+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1*
+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5*
+ rm -rf ${DESTDIR}${bash_comp_dir}highlight.bash
+ rm -rf ${DESTDIR}${fish_comp_dir}highlight.fish
- rm -rf ${DESTDIR}${bin_dir}highlight
- rm -rf ${DESTDIR}${bin_dir}highlight-gui
diff -r 4d7fd92304ce -r d989e9eb2c60 textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
--- a/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro Mon Oct 03 16:40:32 2022 +0000
+++ b/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro Mon Oct 03 18:09:12 2022 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_gui-qt_highlight.pro,v 1.2 2022/07/13 00:52:31 schmonz Exp $
+$NetBSD: patch-src_gui-qt_highlight.pro,v 1.3 2022/10/03 18:09:12 schmonz Exp $
Restore non-.app macOS build settings from 3.59.
---- src/gui-qt/highlight.pro.orig 2022-03-22 20:58:01.000000000 +0000
+--- src/gui-qt/highlight.pro.orig 2022-09-28 17:52:30.000000000 +0000
+++ src/gui-qt/highlight.pro
@@ -80,8 +80,11 @@ macx-clang {
INCLUDEPATH += ../../include
- INCLUDEPATH+=/usr/local/Cellar/boost/1.76.0/include
+ INCLUDEPATH+=/usr/local/Cellar/boost/1.78.0_1/include
- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13
- CONFIG += app_bundle
diff -r 4d7fd92304ce -r d989e9eb2c60 textproc/libhighlight/patches/patch-src_makefile
--- a/textproc/libhighlight/patches/patch-src_makefile Mon Oct 03 16:40:32 2022 +0000
+++ b/textproc/libhighlight/patches/patch-src_makefile Mon Oct 03 18:09:12 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_makefile,v 1.11 2020/12/18 18:45:08 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.12 2022/10/03 18:09:12 schmonz Exp $
Use pkgsrc-specified compiler and flags.
---- src/makefile.orig 2020-11-13 20:00:38.000000000 +0000
+--- src/makefile.orig 2022-09-28 17:52:30.000000000 +0000
+++ src/makefile
@@ -13,11 +13,11 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
@@ -18,12 +18,16 @@
#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
-@@ -68,14 +68,17 @@ ifdef PIC
+@@ -68,16 +68,20 @@ ifdef PIC
CFLAGS+=-fPIC
endif
+-ifneq ($(OS), Windows_NT)
-LDFLAGS = -ldl
+-endif
++#ifneq ($(OS), Windows_NT)
+#LDFLAGS = -ldl
++#endif
# Do not strip by default (Mac OS X lazy pointer issues)
# Add -static to avoid linking with shared libs (can cause trouble when highlight
# is run as service)
@@ -31,6 +35,7 @@
#LDFLAGS= -Wl,--as-needed
-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
++
+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
+LIBTOOL=libtool --tag=CXX
+
@@ -38,7 +43,7 @@
# Data directories (data dir, configuration file dir)
CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
-@@ -103,18 +106,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
+@@ -105,18 +109,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
${GUI_QT_DIR}showtextfile.cpp
@@ -61,7 +66,7 @@
cd gui-qt && \
${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
$(MAKE)
-@@ -123,7 +126,7 @@ $(OBJECTFILES) : makefile
+@@ -125,7 +129,7 @@ $(OBJECTFILES) : makefile
datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
@@ -70,7 +75,7 @@
platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
Home |
Main Index |
Thread Index |
Old Index