X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fweechat%2FMakefile;h=292f4b9d6b5ec1eaa2abf6f1799103530350a851;hp=47c190ab368d39776355ba9b8484329d08a57705;hb=000820f06c53e50430a64c3a59f0e94b9b1cb04e;hpb=7484882ff5d64c4ef88b5e7bfd367b34c67129ce

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 47c190ab36..292f4b9d6b 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -1,63 +1,127 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weechat
-PKG_VERSION:=0.2.5
-PKG_RELEASE:=2
+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_MD5SUM:=42f96620c3b2fd3dca9768d9ce16dd06
-PKG_CAT:=bzcat
+PKG_MD5SUM:=ccdecf663b0050a23049acb4b9a76193
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
+PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_weechat-mod-lua
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/weechat
+define Package/weechat/Default
+  SUBMENU:=Instant Messaging
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libiconv +libncurses +liblua +libgnutls
   TITLE:=Lightweight IRC client
-  DESCRIPTION:=\
-  	Weechat is fast, light & extensible IRC client.
   URL:=http://weechat.flashtux.org/
 endef
 
-CONFIGURE_ARGS += \
+define Package/weechat/Default/description
+ Weechat is fast, light & extensible IRC client.
+endef
+
+
+define Package/weechat
+$(call Package/weechat/Default)
+ MENU=1
+ DEPENDS:=+libiconv +libgnutls +libncurses
+endef
+
+define Package/weechat/description
+$(call Package/weechat/Default/description)
+endef
+
+
+define Package/weechat-mod-charset
+$(call Package/weechat/Default)
+ TITLE+= (charset plugin)
+ DEPENDS:=weechat
+endef
+
+define Package/weechat-mod-charset/description
+$(call Package/weechat/Default/description)
+ This packages contains a charset plugin for Weechat.
+endef
+
+
+define Package/weechat-mod-lua
+$(call Package/weechat/Default)
+ TITLE+= (Lua plugin)
+ DEPENDS:=weechat +liblua
+endef
+
+define Package/weechat-mod-lua/description
+$(call Package/weechat/Default/description)
+ 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" \
 	--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"
+	LUACONFIG="" \
 
-MAKE_FLAGS += \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install
+CONFIGURE_VARS+= \
+	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
+
+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"
+  CONFIGURE_VARS+= \
+	LIBS="-ldl -lm"
+  TARGET_LDFLAGS += -lcrypt
+else
+  CONFIGURE_ARGS+= \
+	--disable-lua
+endif
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(LUA_FLAGS) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		LUACONFIG="" \
+		all install
+endef
 
 define Package/weechat/install	
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
 	$(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
+
+define BuildPlugin
+
+  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
+
+  $$(eval $$(call BuildPackage,weechat-mod-$(1)))
 endef
 
 $(eval $(call BuildPackage,weechat))
+$(eval $(call BuildPlugin,charset))
+$(eval $(call BuildPlugin,lua))