diff options
| author | schmonz <schmonz@pkgsrc.org> | 2018-05-27 11:50:26 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2018-05-27 11:50:26 +0000 |
| commit | 64eb4b018376d5df4af2c4ed00c984e0fa959417 (patch) | |
| tree | cd40b65c78183360164d52f1b75fb478de2af243 /textproc | |
| parent | 41188fef5caf6cfbe46e79cb25882c44cf80fafc (diff) | |
| download | pkgsrc-64eb4b018376d5df4af2c4ed00c984e0fa959417.tar.gz | |
Use swig3 to get Perl bindings building again on NetBSD. Bump
PKGREVISION.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/libhighlight/distinfo | 4 | ||||
| -rw-r--r-- | textproc/libhighlight/patches/patch-extras_swig_makefile | 13 | ||||
| -rw-r--r-- | textproc/p5-highlight/Makefile | 5 |
3 files changed, 13 insertions, 9 deletions
diff --git a/textproc/libhighlight/distinfo b/textproc/libhighlight/distinfo index 60a3460a443..288f7e0a9fe 100644 --- a/textproc/libhighlight/distinfo +++ b/textproc/libhighlight/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.1 2018/05/03 13:13:51 schmonz Exp $ +$NetBSD: distinfo,v 1.2 2018/05/27 11:50:26 schmonz Exp $ SHA1 (highlight-3.43.tar.bz2) = 471976f309339f9b6a17ee9501b9d3b0a47872da RMD160 (highlight-3.43.tar.bz2) = 73d53b819e16a9796af44fe346f464d7743c3ee9 SHA512 (highlight-3.43.tar.bz2) = 77ad159963de64ef3c4732ad70c63ceafe7002c43d8b045e61361f52e56467933790c70e88570e0c866503a621496de2c80934c7f8141721545ff43c807968d1 Size (highlight-3.43.tar.bz2) = 1311318 bytes -SHA1 (patch-extras_swig_makefile) = 53e0793dab41fecafd3360564a951ddd4187e894 +SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f SHA1 (patch-makefile) = 693fe29c416e4e5ee63e279f4abb27799ce0d6e0 SHA1 (patch-src_core_platform__fs.cpp) = 65b7f4b665b820eec4b835474bd308e49080526e SHA1 (patch-src_makefile) = 040bbcddb6e83e4d2c4f9039f55d543c8f7a2ea4 diff --git a/textproc/libhighlight/patches/patch-extras_swig_makefile b/textproc/libhighlight/patches/patch-extras_swig_makefile index f3749e512b8..8f28f537824 100644 --- a/textproc/libhighlight/patches/patch-extras_swig_makefile +++ b/textproc/libhighlight/patches/patch-extras_swig_makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-extras_swig_makefile,v 1.1 2018/05/03 13:13:51 schmonz Exp $ +$NetBSD: patch-extras_swig_makefile,v 1.2 2018/05/27 11:50:26 schmonz Exp $ Use pkgsrc-specified compiler and flags. ---- extras/swig/makefile.orig 2013-09-24 20:24:04.000000000 +0000 +--- extras/swig/makefile.orig 2018-04-30 12:17:04.000000000 +0000 +++ extras/swig/makefile @@ -1,6 +1,6 @@ @@ -24,23 +24,26 @@ Use pkgsrc-specified compiler and flags. touch $@ python: lib-stamp - swig -c++ -python -o highlight_wrap.cpp highlight.i +- 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 ++ swig3.0 -c++ -python -o highlight_wrap.cpp highlight.i + ${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 +- 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 ++ 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 php: lib-stamp - swig -c++ -php -o highlight_wrap.cpp highlight.i +- 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 ++ 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 diff --git a/textproc/p5-highlight/Makefile b/textproc/p5-highlight/Makefile index c1051507080..acaa045e8db 100644 --- a/textproc/p5-highlight/Makefile +++ b/textproc/p5-highlight/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.8 2018/05/03 13:13:51 schmonz Exp $ +# $NetBSD: Makefile,v 1.9 2018/05/27 11:50:26 schmonz Exp $ .include "../../textproc/libhighlight/Makefile.common" +PKGREVISION= 1 PKGNAME= p5-highlight-${VERSION} COMMENT+= (Perl bindings) -BUILD_DEPENDS+= swig-[0-9]*:../../devel/swig +BUILD_DEPENDS+= swig3-[0-9]*:../../devel/swig3 BUILD_DIRS= extras/swig BUILD_TARGET= perl |