Sun Oct 13 12:07:29 2013 UTC ()
Disabled LUA, devel/tolua++ is deeply broken because of LUA 5.1 to 5.2 update.
Also fixed build issues on NetBSD 6.x.


(imil)
diff -r1.16 -r1.17 pkgsrc/sysutils/conky/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/conky/distinfo
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/conky/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/conky/Makefile 2013/07/05 13:29:42 1.16
+++ pkgsrc/sysutils/conky/Makefile 2013/10/13 12:07:29 1.17
@@ -1,56 +1,59 @@ @@ -1,56 +1,59 @@
1# $NetBSD: Makefile,v 1.16 2013/07/05 13:29:42 ryoon Exp $ 1# $NetBSD: Makefile,v 1.17 2013/10/13 12:07:29 imil Exp $
2# 2#
3 3
4DISTNAME= conky-1.9.0 4DISTNAME= conky-1.9.0
5PKGREVISION= 13 5PKGREVISION= 13
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conky/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conky/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= imil@NetBSD.org 10MAINTAINER= imil@NetBSD.org
11HOMEPAGE= http://conky.sourceforge.net/ 11HOMEPAGE= http://conky.sourceforge.net/
12COMMENT= Free, light-weight system monitor for X 12COMMENT= Free, light-weight system monitor for X
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config aclocal autoconf autoheader automake 17USE_TOOLS+= pkg-config aclocal autoconf autoheader automake
18 18
19CONFIGURE_ARGS+= --enable-imlib2 --enable-lua-imlib2 19CONFIGURE_ARGS+= --enable-imlib2
20CONFIGURE_ARGS+= --enable-lua-cairo 
21CONFIGURE_ARGS+= --enable-curl --enable-rss 20CONFIGURE_ARGS+= --enable-curl --enable-rss
22CONFIGURE_ARGS+= --enable-weather-metar --enable-weather-xoap 21CONFIGURE_ARGS+= --enable-weather-metar --enable-weather-xoap
 22# devel/tolua++ is deeply broken due to lua 5.1 to 5.2 update, disable lua
 23# support for now
 24CONFIGURE_ARGS+= --disable-lua
 25# CONFIGURE_ARGS+= --enable-lua-cairo --enable-lua-imlib2
23 26
24EGDIR= share/examples/conky 27EGDIR= share/examples/conky
25OWN_DIRS= ${PKG_SYSCONFDIR}/conky 28OWN_DIRS= ${PKG_SYSCONFDIR}/conky
26CONF_FILES= ${EGDIR}/conky.conf ${PKG_SYSCONFDIR}/conky/conky.conf 29CONF_FILES= ${EGDIR}/conky.conf ${PKG_SYSCONFDIR}/conky/conky.conf
27CONF_FILES+= ${EGDIR}/conky_no_x11.conf ${PKG_SYSCONFDIR}/conky/conky_no_x11.conf 30CONF_FILES+= ${EGDIR}/conky_no_x11.conf ${PKG_SYSCONFDIR}/conky/conky_no_x11.conf
28 31
29.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
30 33
31.if ${OPSYS} == "NetBSD" 34.if ${OPSYS} == "NetBSD"
32CPPFLAGS+= -D_KMEMUSER 35CPPFLAGS+= -D_KMEMUSER
33.endif 36.endif
34 37
35# conky segfaults on system's curses 38# conky segfaults on system's curses
36PREFER_PKGSRC+= ncurses 39PREFER_PKGSRC+= ncurses
37 40
38pre-configure: 41pre-configure:
39 set -e; cd ${WRKSRC}; \ 42 set -e; cd ${WRKSRC}; \
40 aclocal; autoheader; automake -a --foreign -i; autoconf 43 aclocal; autoheader; automake -a --foreign -i; autoconf
41 44
42post-install: 45post-install:
43 ${INSTALL_DATA} files/conkyrc ${DESTDIR}${PREFIX}/${EGDIR} 46 ${INSTALL_DATA} files/conkyrc ${DESTDIR}${PREFIX}/${EGDIR}
44 47
45.include "../../devel/ncurses/buildlink3.mk" 48.include "../../devel/ncurses/buildlink3.mk"
46.include "../../devel/tolua++/buildlink3.mk" 49#.include "../../devel/tolua++/buildlink3.mk"
47.include "../../x11/libX11/buildlink3.mk" 50.include "../../x11/libX11/buildlink3.mk"
48.include "../../x11/libXext/buildlink3.mk" 51.include "../../x11/libXext/buildlink3.mk"
49.include "../../x11/libXdamage/buildlink3.mk" 52.include "../../x11/libXdamage/buildlink3.mk"
50.include "../../x11/libXft/buildlink3.mk" 53.include "../../x11/libXft/buildlink3.mk"
51.include "../../graphics/cairo/buildlink3.mk" 54.include "../../graphics/cairo/buildlink3.mk"
52.include "../../graphics/imlib2/buildlink3.mk" 55.include "../../graphics/imlib2/buildlink3.mk"
53.include "../../www/curl/buildlink3.mk" 56.include "../../www/curl/buildlink3.mk"
54.include "../../devel/glib2/buildlink3.mk" 57.include "../../devel/glib2/buildlink3.mk"
55.include "../../textproc/libxml2/buildlink3.mk" 58.include "../../textproc/libxml2/buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/conky/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/conky/distinfo 2013/01/26 22:07:42 1.3
+++ pkgsrc/sysutils/conky/distinfo 2013/10/13 12:07:29 1.4
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.3 2013/01/26 22:07:42 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2013/10/13 12:07:29 imil Exp $
2 2
3SHA1 (conky-1.9.0.tar.bz2) = 2069cbdb8e7224fcbf3c6b1ddebf64a51634b4cc 3SHA1 (conky-1.9.0.tar.bz2) = 2069cbdb8e7224fcbf3c6b1ddebf64a51634b4cc
4RMD160 (conky-1.9.0.tar.bz2) = 2df0e60d4236ed667bdae876e11ba28d05914e25 4RMD160 (conky-1.9.0.tar.bz2) = 2df0e60d4236ed667bdae876e11ba28d05914e25
5Size (conky-1.9.0.tar.bz2) = 626555 bytes 5Size (conky-1.9.0.tar.bz2) = 626555 bytes
6SHA1 (patch-configure.ac) = fab28e82ad01b2c346552af7537865e049098f2c 6SHA1 (patch-configure.ac) = fab28e82ad01b2c346552af7537865e049098f2c
7SHA1 (patch-data_Makefile.am) = af8df32076b8a389ee98e2550342dbb343f7bff3 7SHA1 (patch-data_Makefile.am) = af8df32076b8a389ee98e2550342dbb343f7bff3
8SHA1 (patch-src_Makefile.am) = f4e79c0f08a0886a061449b9a8a578173cda90db 8SHA1 (patch-src_Makefile.am) = f4e79c0f08a0886a061449b9a8a578173cda90db
9SHA1 (patch-src_config.h.in) = 31aa9cd4bd4ab775e6da633f86415ee8f5383538 9SHA1 (patch-src_config.h.in) = 31aa9cd4bd4ab775e6da633f86415ee8f5383538
10SHA1 (patch-src_conky.c) = e4c9173661cca437af0febbcae94eec72dc0ea4a 10SHA1 (patch-src_conky.c) = e4c9173661cca437af0febbcae94eec72dc0ea4a
11SHA1 (patch-src_core.c) = a64ff7cb05d7b6b62aea41e486c0a719e2c93faf 11SHA1 (patch-src_core.c) = a64ff7cb05d7b6b62aea41e486c0a719e2c93faf
12SHA1 (patch-src_fs.c) = 104fd3788f319689026702d6a149410184072e24 12SHA1 (patch-src_fs.c) = 104fd3788f319689026702d6a149410184072e24
13SHA1 (patch-src_netbsd.c) = b6af055adea3922a1a8aed8c6ab8795bd1fa2607 13SHA1 (patch-src_netbsd.c) = b6af055adea3922a1a8aed8c6ab8795bd1fa2607
14SHA1 (patch-src_netbsd.h) = 25f9c66eede8e4aaef475d6afcbf79440ec8d7bb 14SHA1 (patch-src_netbsd.h) = 25f9c66eede8e4aaef475d6afcbf79440ec8d7bb
 15SHA1 (patch-src_read__tcp.c) = 32fca1b7fdfdb2568b056705c7129807e281b0cc
15SHA1 (patch-src_text__object.h) = 7f7e3684e21f9618a8ede37525f4a48f47a92050 16SHA1 (patch-src_text__object.h) = 7f7e3684e21f9618a8ede37525f4a48f47a92050