Update weechat: 0.2.4 > 0.2.5

[openwrt/svn-archive/archive.git] / net / weechat / Makefile

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index f0e8101fbc0dda4367cc12c26a95ed3fee512e03..47c190ab368d39776355ba9b8484329d08a57705 100644 (file)
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weechat
-PKG_VERSION:=0.2.0
-PKG_RELEASE:=1
+PKG_VERSION:=0.2.5
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://weechat.flashtux.org/download/
-PKG_MD5SUM:=69c292237bebd4b7a1ff29c0f9c76380
+PKG_MD5SUM:=42f96620c3b2fd3dca9768d9ce16dd06
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -25,41 +25,39 @@ include $(INCLUDE_DIR)/package.mk
 define Package/weechat
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libncurses +liblua +libgnutls
+  DEPENDS:=+libiconv +libncurses +liblua +libgnutls
   TITLE:=Lightweight IRC client
   DESCRIPTION:=\
        Weechat is fast, light & extensible IRC client.
   URL:=http://weechat.flashtux.org/
 endef
 
-define Build/Configure 
-       $(call Build/Configure/Default, \
-               --with-debug=0 \
-               --with-libgnutls-prefix=$(STAGING_DIR)/usr \
-               --without-doc-xsl-prefix \
-               --without-libiconv-prefix \
-               --without-libintl-prefix \
-               --disable-aspell \
-               --enable-lua \
-               --with-lua-inc="$(STAGING_DIR)/usr/include" \
-               --with-lua-lib="$(STAGING_DIR)/usr/lib" \
-               --disable-perl \
-               --disable-python \
-               --disable-ruby \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+CONFIGURE_ARGS += \
+       --with-debug=0 \
+       --with-libgnutls-prefix=$(STAGING_DIR)/usr \
+       --without-doc-xsl-prefix \
+       --with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
+       --without-libintl-prefix \
+       --disable-aspell \
+       --enable-lua \
+       --with-lua-inc="$(STAGING_DIR)/usr/include" \
+       --with-lua-lib="$(STAGING_DIR)/usr/lib" \
+       --disable-perl \
+       --disable-python \
+       --disable-ruby \
+       , \
+       LIBS="-llua -ldl -lm -L$(STAGING_DIR)/usr/lib/libiconv/lib"
+
+MAKE_FLAGS += \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
+       all install
 
 define Package/weechat/install 
-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
-       install -d -m0755 $(1)/usr/lib/weechat/plugins
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/weechat/plugins/lua.so* $(1)/usr/lib/weechat/plugins/
+       $(INSTALL_DIR) $(1)/usr/lib/weechat/plugins
+       # FIXME : weechat is not configured to compile with lua since 0.2.4
+       #$(CP) $(PKG_INSTALL_DIR)/usr/lib/weechat/plugins/lua.so* $(1)/usr/lib/weechat/plugins/
 endef
- 
+
 $(eval $(call BuildPackage,weechat))