X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fweechat%2FMakefile;h=67ef94ddce855d0295926416718266dbb6c3556d;hp=f0e8101fbc0dda4367cc12c26a95ed3fee512e03;hb=310447b3960b040b0e5eeb3b16dafa56e9268977;hpb=c71de9e170164cf3c9c9039930585da4c5e9325a

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index f0e8101fbc..67ef94ddce 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -9,57 +9,120 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weechat
-PKG_VERSION:=0.2.0
+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:=69c292237bebd4b7a1ff29c0f9c76380
-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
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/weechat
+define Package/weechat/Default
+  SUBMENU:=Instant Messaging
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+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 \
-	)
+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 \
+	--disable-perl \
+	--disable-python \
+	--disable-ruby \
+	LUACONFIG="" \
+
+CONFIGURE_VARS+= \
+	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+
+ifneq ($(SDK)$(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"
+  CONFIGURE_VARS+= \
+	LIBS="-ldl -lm"
+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 -d -m0755 $(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/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
+	$(INSTALL_DIR) $(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))