CVS commit: pkgsrc/textproc/libhighlight

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Oct 13 21:13:14 UTC 2024

Modified Files:
        pkgsrc/textproc/libhighlight: distinfo
        pkgsrc/textproc/libhighlight/patches: patch-extras_swig_makefile

Log Message:
Restore -lperl to fix p5-highlight build.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/textproc/libhighlight/patches/patch-extras_swig_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/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.36 pkgsrc/textproc/libhighlight/distinfo:1.37
--- pkgsrc/textproc/libhighlight/distinfo:1.36  Sun Sep 22 18:58:12 2024
+++ pkgsrc/textproc/libhighlight/distinfo       Sun Oct 13 21:13:13 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2024/09/22 18:58:12 schmonz Exp $
+$NetBSD: distinfo,v 1.37 2024/10/13 21:13:13 schmonz Exp $
 
 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-extras_swig_makefile) = 88fe264046c62e42cfac1867e3a7c3606c692b50
 SHA1 (patch-makefile) = 92f6514c39f6aa437f9beaafc10a1f6275e241b3
 SHA1 (patch-src_core_platform__fs.cpp) = be41ce38ac7365234fe68257dbee3b881f8e2b52
 SHA1 (patch-src_gui-qt_highlight.pro) = c3aa498e49ddaffd98149e67b34490480d0e4a7c

Index: pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile:1.4 pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile:1.5
--- pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile:1.4 Sun Sep 22 18:58:12 2024
+++ pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile     Sun Oct 13 21:13:14 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-extras_swig_makefile,v 1.4 2024/09/22 18:58:12 schmonz Exp $
+$NetBSD: patch-extras_swig_makefile,v 1.5 2024/10/13 21:13:14 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
@@ -13,7 +13,7 @@ Use pkgsrc-specified compiler and flags.
  
  HL_INC=../../src/include/
  HL_SRC=../../src/
-@@ -12,24 +12,24 @@ PERL_INC=$(shell perl -MExtUtils::Embed 
+@@ -12,24 +12,24 @@ PERL_INC=$(shell perl -MExtUtils::Embed
  PHP_INC=$(shell php-config --includes)
  
  lib-stamp:
@@ -37,7 +37,7 @@ Use pkgsrc-specified compiler and flags.
 -      ${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} -o highlight.so
++      ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lperl -o highlight.so
  
  php: lib-stamp
 -      swig -c++ -std=c++17 -php -o highlight_wrap.cpp highlight.i
@@ -45,7 +45,7 @@ Use pkgsrc-specified compiler and flags.
 -      ${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} -o highlight.so
++      ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lphp -o highlight.so
  
  clean: python-clean perl-clean php-clean
        rm -f *-stamp