diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/weechat | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/weechat')
| -rw-r--r-- | package/weechat/Config.in | 26 | ||||
| -rw-r--r-- | package/weechat/Makefile | 19 |
2 files changed, 10 insertions, 35 deletions
diff --git a/package/weechat/Config.in b/package/weechat/Config.in deleted file mode 100644 index 4073c3979..000000000 --- a/package/weechat/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -#menu "weechat........................... Lightweight IRC client" - -config ADK_PACKAGE_WEECHAT - prompt "weechat........................... Lightweight IRC client" - tristate - default n - select ADK_PACKAGE_LIBNCURSES - select ADK_PACKAGE_LIBICONV - help - Fast, light & extensible IRC client - - http://weechat.flashtux.org - -config ADK_COMPILE_WEECHAT_WITH_TLS - prompt " Enable TLS support" - bool - select ADK_PACKAGE_LIBGNUTLS - depends on ADK_PACKAGE_WEECHAT - -config ADK_COMPILE_WEECHAT_WITH_LUA - prompt " Enable LUA scripting" - bool - select ADK_PACKAGE_LIBLUA - depends on ADK_PACKAGE_WEECHAT - -#endmenu diff --git a/package/weechat/Makefile b/package/weechat/Makefile index 59529b51e..6fd545c95 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -10,18 +10,21 @@ PKG_MD5SUM:= 73d6bc211ac32c597f0d278506480a20 PKG_DESCR:= Lightweight IRC client PKG_SECTION:= net PKG_DEPENDS:= libncurses libiconv -PKG_URL:= http://weechat.flashtux.org/download/ -PKG_SITES:= http://weechat.flashtux.org/download/ - -include ${TOPDIR}/mk/package.mk - +PKG_BUILDDEP+= ncurses libiconv ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y) PKG_DEPENDS+= gnutls +PKG_BUILDDEP+= gnutls endif ifeq (${ADK_COMPILE_WEECHAT_WITH_LUA},y) PKG_DEPENDS+= liblua +PKG_BUILDDEP+= lua endif +PKG_URL:= http://weechat.flashtux.org/download/ +PKG_SITES:= http://weechat.flashtux.org/download/ + +include ${TOPDIR}/mk/package.mk + $(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -35,7 +38,6 @@ ifneq (${ADK_COMPILE_WEECHAT_WITH_LUA},y) DISABLE_LUA:= --disable-lua endif -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= ${ENABLE_TLS} \ --with-debug=0 \ --disable-perl \ @@ -43,11 +45,10 @@ CONFIGURE_ARGS+= ${ENABLE_TLS} \ --disable-ruby \ --with-libiconv-prefix='${STAGING_DIR}/usr' \ ${DISABLE_LUA} -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses ${IDIR_WEECHAT}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses \ + ${IDIR_WEECHAT}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk |