CVS commit: pkgsrc/textproc/highlight

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov 30 15:13:20 UTC 2017

Modified Files:
        pkgsrc/textproc/highlight: distinfo
        pkgsrc/textproc/highlight/patches: patch-examples_swig_makefile

Log Message:
p5-highlight: pass CXXFLAGS and LDFLAGS.

Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/highlight/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/highlight/patches/patch-examples_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/highlight/distinfo
diff -u pkgsrc/textproc/highlight/distinfo:1.8 pkgsrc/textproc/highlight/distinfo:1.9
--- pkgsrc/textproc/highlight/distinfo:1.8      Wed Nov  4 01:59:30 2015
+++ pkgsrc/textproc/highlight/distinfo  Thu Nov 30 15:13:19 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:59:30 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/11/30 15:13:19 wiz Exp $
 
 SHA1 (highlight-3.18.tar.bz2) = 985d0a3c707e3251fe50ffff66e11a8563777202
 RMD160 (highlight-3.18.tar.bz2) = 960b2a9ed6071b0f48ef45da2d006f5f00d9b578
 SHA512 (highlight-3.18.tar.bz2) = 1f939e117209e96d021216addc281ca7f265822f053f577ed7cb11b8ac9a1762bf84f8e1f9f5e67277004573b98e4b8732f48549aa674fe6801bfc1c0627b930
 Size (highlight-3.18.tar.bz2) = 619669 bytes
-SHA1 (patch-examples_swig_makefile) = a252ca1f5a53d2edc590f2ccda8abfd42e32b965
+SHA1 (patch-examples_swig_makefile) = fb10a544d5807b1dbf67d028852d5c5cbf0f9bde
 SHA1 (patch-makefile) = 1cf4c6225b36e822a40ec10917384367914ecb0f
 SHA1 (patch-src_makefile) = 592b8a2934d7e4c7f3c5a241737f4d09215932a4

Index: pkgsrc/textproc/highlight/patches/patch-examples_swig_makefile
diff -u pkgsrc/textproc/highlight/patches/patch-examples_swig_makefile:1.1 pkgsrc/textproc/highlight/patches/patch-examples_swig_makefile:1.2
--- pkgsrc/textproc/highlight/patches/patch-examples_swig_makefile:1.1  Mon Aug 18 01:21:49 2014
+++ pkgsrc/textproc/highlight/patches/patch-examples_swig_makefile      Thu Nov 30 15:13:19 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-examples_swig_makefile,v 1.1 2014/08/18 01:21:49 schmonz Exp $
+$NetBSD: patch-examples_swig_makefile,v 1.2 2017/11/30 15:13:19 wiz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
@@ -13,3 +13,28 @@ Use pkgsrc-specified compiler and flags.
  
  HL_INC=../../src/include/
  HL_SRC=../../src/
+@@ -18,18 +18,18 @@ lib-stamp:
+ 
+ python: lib-stamp
+       swig -c++ -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
++      ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC} 
++      ${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
+-      ${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
++      ${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
+ 
+ php: lib-stamp
+       swig -c++ -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
++      ${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
+ 
+ clean: python-clean perl-clean php-clean
+       rm -f *-stamp