X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fweechat%2FMakefile;h=69a411fec14728cbb7a1e0c0879682c1dce9cd80;hb=3ead3de12f393ba9be5bea3d3fc43700d00d2639;hp=52b75bb67a96da1f41d1aa5e088e0f33d9d5f7fb;hpb=7129b1e30417668d9b4f570c3a7b68d627bcce54;p=packages.git

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 52b75bb67..69a411fec 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -13,19 +12,21 @@ PKG_VERSION:=0.2.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://weechat.flashtux.org/download/
+PKG_SOURCE_URL:=http://www.weechat.org/files/src
 PKG_MD5SUM:=ccdecf663b0050a23049acb4b9a76193
 
 PKG_FIXUP = libtool
+PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_weechat-mod-lua
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/weechat/Default
   SUBMENU:=Instant Messaging
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Lightweight IRC client
-  URL:=http://weechat.flashtux.org/
+  URL:=http://www.weechat.org/
 endef
 
 define Package/weechat/Default/description
@@ -36,7 +37,7 @@ endef
 define Package/weechat
 $(call Package/weechat/Default)
  MENU=1
- DEPENDS:=+libiconv +libgnutls +libncurses
+ DEPENDS:=+libgnutls +libncurses $(ICONV_DEPENDS)
 endef
 
 define Package/weechat/description
@@ -58,40 +59,42 @@ endef
 
 define Package/weechat-mod-lua
 $(call Package/weechat/Default)
- TITLE+= (LUA plugin)
- DEPENDS:=weechat +liblua
+ TITLE+= (Lua plugin)
+ DEPENDS:=weechat +liblua @BROKEN
 endef
 
 define Package/weechat-mod-lua/description
 $(call Package/weechat/Default/description)
- This packages contains an LUA scripting plugin for Weechat.
+ This packages contains an Lua scripting plugin for Weechat.
 endef
 
 
 CONFIGURE_ARGS+= \
 	--with-debug=0 \
-	--with-libgnutls-prefix=$(STAGING_DIR)/usr \
 	--without-doc-xsl-prefix \
-	--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
+	--with-libiconv-prefix="$(ICONV_PREFIX)" \
 	--without-libintl-prefix \
 	--disable-aspell \
 	--disable-perl \
 	--disable-python \
 	--disable-ruby \
 	LUACONFIG="" \
+	ac_cv_path_LIBGNUTLS_CONFIG="pkg-config gnutls" \
 
-CONFIGURE_VARS+= \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+TARGET_LDFLAGS += \
+	-L$(ICONV_PREFIX)/lib \
+	-Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_weechat-mod-lua),)
+ifneq ($(CONFIG_PACKAGE_weechat-mod-lua),)
   CONFIGURE_ARGS+= \
 	--enable-lua \
+	--enable-plugins \
+	--with-plugins="lua" \
 	--with-lua-inc="$(STAGING_DIR)/usr/include" \
-	--with-lua-lib="$(STAGING_DIR)/usr/lib" \
-	LUA_CFLAGS="-I$(STAGING_DIR)/usr/include/"
-	LUA_LFLAGS="-L$(STAGING_DIR)/usr/lib -llualib50 -llua50"
+	--with-lua-lib="$(STAGING_DIR)/usr/lib"
   CONFIGURE_VARS+= \
 	LIBS="-ldl -lm"
+  TARGET_LDFLAGS += -lcrypt
 else
   CONFIGURE_ARGS+= \
 	--disable-lua
@@ -105,7 +108,7 @@ define Build/Compile
 		all install
 endef
 
-define Package/weechat/install	
+define Package/weechat/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib/weechat/plugins
@@ -113,7 +116,7 @@ endef
 
 define BuildPlugin
 
-  define Package/weechat-mod-$(1)/install	
+  define Package/weechat-mod-$(1)/install
 	$(INSTALL_DIR) $$(1)/usr/lib/weechat/plugins
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/weechat/plugins/$(1).so* $$(1)/usr/lib/weechat/plugins/
   endef