Sat May 3 13:27:33 2014 UTC ()
Adapt to Lua multiversion support.


(alnsn)
diff -r1.46 -r1.47 pkgsrc/chat/weechat/Makefile
diff -r1.10 -r1.11 pkgsrc/chat/weechat/options.mk
cvs diff -r1.46 -r1.47 pkgsrc/chat/weechat/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/weechat/Makefile 2014/02/24 23:06:12 1.46
+++ pkgsrc/chat/weechat/Makefile 2014/05/03 13:27:33 1.47
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.46 2014/02/24 23:06:12 tonio Exp $ 1# $NetBSD: Makefile,v 1.47 2014/05/03 13:27:33 alnsn Exp $
2 2
3DISTNAME= weechat-0.4.3 3DISTNAME= weechat-0.4.3
 4PKGREVISION= 1
4CATEGORIES= chat 5CATEGORIES= chat
5MASTER_SITES= http://www.weechat.org/files/src/ 6MASTER_SITES= http://www.weechat.org/files/src/
6 7
7MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
8HOMEPAGE= http://www.weechat.org/ 9HOMEPAGE= http://www.weechat.org/
9COMMENT= Lightweight and user friendly curses based IRC client 10COMMENT= Lightweight and user friendly curses based IRC client
10LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
11EXTRACT_SUFX= .tar.bz2 12EXTRACT_SUFX= .tar.bz2
12 13
13BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 14BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
14 15
15USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
16USE_TOOLS+= msgfmt pkg-config 17USE_TOOLS+= msgfmt pkg-config
@@ -22,18 +23,19 @@ CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__ @@ -22,18 +23,19 @@ CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__
22LDFLAGS.SunOS+= -lsocket -lnsl -lintl 23LDFLAGS.SunOS+= -lsocket -lnsl -lintl
23 24
24CMAKE_ARGS+= -DENABLE_ASPELL:BOOL=OFF 25CMAKE_ARGS+= -DENABLE_ASPELL:BOOL=OFF
25CMAKE_ARGS+= -DENABLE_GUILE:BOOL=OFF 26CMAKE_ARGS+= -DENABLE_GUILE:BOOL=OFF
26CMAKE_ARGS+= -DENABLE_TCL:BOOL=OFF 27CMAKE_ARGS+= -DENABLE_TCL:BOOL=OFF
27CMAKE_ARGS+= -DENABLE_MAN:BOOL=ON 28CMAKE_ARGS+= -DENABLE_MAN:BOOL=ON
28CMAKE_ARGS+= -DMANDIR:STRING=${PKGMANDIR} 29CMAKE_ARGS+= -DMANDIR:STRING=${PKGMANDIR}
29CMAKE_ARGS+= -DLOCALEDIR:STRING=${PKGLOCALEDIR}/locale 30CMAKE_ARGS+= -DLOCALEDIR:STRING=${PKGLOCALEDIR}/locale
30 31
31.include "options.mk" 32.include "options.mk"
32 33
33.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 34.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
34.include "../../devel/gettext-lib/buildlink3.mk" 35.include "../../devel/gettext-lib/buildlink3.mk"
 36#.include "../../devel/readline/buildlink3.mk"
35.include "../../devel/libidn/buildlink3.mk" 37.include "../../devel/libidn/buildlink3.mk"
36.include "../../www/curl/buildlink3.mk" 38.include "../../www/curl/buildlink3.mk"
37.include "../../converters/libiconv/buildlink3.mk" 39.include "../../converters/libiconv/buildlink3.mk"
38.include "../../security/libgcrypt/buildlink3.mk" 40.include "../../security/libgcrypt/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/chat/weechat/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/weechat/options.mk 2013/06/09 21:19:02 1.10
+++ pkgsrc/chat/weechat/options.mk 2014/05/03 13:27:33 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.10 2013/06/09 21:19:02 tonio Exp $ 1# $NetBSD: options.mk,v 1.11 2014/05/03 13:27:33 alnsn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.weechat 3PKG_OPTIONS_VAR= PKG_OPTIONS.weechat
4PKG_SUPPORTED_OPTIONS= charset gnutls python lua wide-curses perl ruby 4PKG_SUPPORTED_OPTIONS= charset gnutls python lua wide-curses perl ruby
5PKG_SUGGESTED_OPTIONS= charset gnutls 5PKG_SUGGESTED_OPTIONS= charset gnutls
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= charset lua plugin python perl ruby 9PLIST_VARS+= charset lua plugin python perl ruby
10 10
11.if !empty(PKG_OPTIONS:Mcharset) 11.if !empty(PKG_OPTIONS:Mcharset)
12CMAKE_ARGS+= -DENABLE_CHARSET:BOOL=ON 12CMAKE_ARGS+= -DENABLE_CHARSET:BOOL=ON
13PLIST.charset= yes 13PLIST.charset= yes
14.else 14.else
@@ -24,26 +24,27 @@ CMAKE_ARGS+= -DENABLE_CHARSET:BOOL=OFF @@ -24,26 +24,27 @@ CMAKE_ARGS+= -DENABLE_CHARSET:BOOL=OFF
24.else 24.else
25.include "../../devel/ncurses/buildlink3.mk" 25.include "../../devel/ncurses/buildlink3.mk"
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mpython) 28.if !empty(PKG_OPTIONS:Mpython)
29.include "../../lang/python/extension.mk" 29.include "../../lang/python/extension.mk"
30CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=ON 30CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=ON
31PLIST.python= yes 31PLIST.python= yes
32.else 32.else
33CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=OFF 33CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=OFF
34.endif 34.endif
35 35
36.if !empty(PKG_OPTIONS:Mlua) 36.if !empty(PKG_OPTIONS:Mlua)
 37LUA_VERSIONS_INCOMPATIBLE= 52
37.include "../../lang/lua/buildlink3.mk" 38.include "../../lang/lua/buildlink3.mk"
38CMAKE_ARGS+= -DENABLE_LUA:BOOL=ON 39CMAKE_ARGS+= -DENABLE_LUA:BOOL=ON
39PLIST.lua= yes 40PLIST.lua= yes
40.else 41.else
41CMAKE_ARGS+= -DENABLE_LUA:BOOL=OFF 42CMAKE_ARGS+= -DENABLE_LUA:BOOL=OFF
42.endif 43.endif
43 44
44.if !empty(PKG_OPTIONS:Mperl) 45.if !empty(PKG_OPTIONS:Mperl)
45.include "../../lang/perl5/buildlink3.mk" 46.include "../../lang/perl5/buildlink3.mk"
46CMAKE_ARGS+= -DENABLE_PERL:BOOL=ON 47CMAKE_ARGS+= -DENABLE_PERL:BOOL=ON
47USE_TOOLS+= perl 48USE_TOOLS+= perl
48PLIST.perl= yes 49PLIST.perl= yes
49.else 50.else