Disabled LUA, devel/tolua++ is deeply broken because of LUA 5.1 to 5.2 update.

Also fixed build issues on NetBSD 6.x.
This commit is contained in:
imil 2013-10-13 12:07:29 +00:00
parent f6c0f8e622
commit 9a0dd167f2
2 changed files with 9 additions and 5 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2013/07/05 13:29:42 ryoon Exp $
# $NetBSD: Makefile,v 1.17 2013/10/13 12:07:29 imil Exp $
#
DISTNAME= conky-1.9.0
@ -16,10 +16,13 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config aclocal autoconf autoheader automake
CONFIGURE_ARGS+= --enable-imlib2 --enable-lua-imlib2
CONFIGURE_ARGS+= --enable-lua-cairo
CONFIGURE_ARGS+= --enable-imlib2
CONFIGURE_ARGS+= --enable-curl --enable-rss
CONFIGURE_ARGS+= --enable-weather-metar --enable-weather-xoap
# devel/tolua++ is deeply broken due to lua 5.1 to 5.2 update, disable lua
# support for now
CONFIGURE_ARGS+= --disable-lua
# CONFIGURE_ARGS+= --enable-lua-cairo --enable-lua-imlib2
EGDIR= share/examples/conky
OWN_DIRS= ${PKG_SYSCONFDIR}/conky
@ -43,7 +46,7 @@ post-install:
${INSTALL_DATA} files/conkyrc ${DESTDIR}${PREFIX}/${EGDIR}
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/tolua++/buildlink3.mk"
#.include "../../devel/tolua++/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.3 2013/01/26 22:07:42 wiz Exp $
$NetBSD: distinfo,v 1.4 2013/10/13 12:07:29 imil Exp $
SHA1 (conky-1.9.0.tar.bz2) = 2069cbdb8e7224fcbf3c6b1ddebf64a51634b4cc
RMD160 (conky-1.9.0.tar.bz2) = 2df0e60d4236ed667bdae876e11ba28d05914e25
@ -12,4 +12,5 @@ SHA1 (patch-src_core.c) = a64ff7cb05d7b6b62aea41e486c0a719e2c93faf
SHA1 (patch-src_fs.c) = 104fd3788f319689026702d6a149410184072e24
SHA1 (patch-src_netbsd.c) = b6af055adea3922a1a8aed8c6ab8795bd1fa2607
SHA1 (patch-src_netbsd.h) = 25f9c66eede8e4aaef475d6afcbf79440ec8d7bb
SHA1 (patch-src_read__tcp.c) = 32fca1b7fdfdb2568b056705c7129807e281b0cc
SHA1 (patch-src_text__object.h) = 7f7e3684e21f9618a8ede37525f4a48f47a92050