X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Firssi%2FMakefile;h=b0572f61c4ba6cfc6ac702870f57fdfda9604d86;hb=a63e6cbc65621972850c73c3bb5de1bc7a1b6ce9;hp=024bcfa637498066ec4180492955daf17497085e;hpb=75ea41a2c060b638aed79b8ce50de8f86505c1b3;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 024bcfa637..b0572f61c4 100644
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -1,53 +1,98 @@
 #
-# 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
 
 PKG_NAME:=irssi
-PKG_VERSION:=0.8.10
+PKG_VERSION:=0.8.15
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)a.tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://irssi.org/files/
-PKG_MD5SUM:=38e616bccb6a34ff6d91690317c2fa19
-PKG_CAT:=bzcat
+PKG_MD5SUM:=1dcb3f511b88df94b0c996f36668c7da
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=libtool
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/irssi
+define Package/irssi/Default
+  SUBMENU:=Instant Messaging
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+glib1 +libncurses
-  TITLE:=console irc client
+  DEPENDS:=+glib2 +libncurses
+  TITLE:=Console IRC client
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://irssi.org/
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--with-perl=no \
-		--with-glib1 \
-		--with-glib-prefix="$(STAGING_DIR)/usr" \
-		--with-textui \
-		--without-terminfo \
-		--without-bot \
-		--without-file-offset-size \
-		--without-ssl \
-		--disable-ssl \
-		--disable-ipv6 \
-		--disable-proxy \
-	)
+define Package/irssi/Default/description
+	Irssi is a terminal based IRC client for UNIX systems.
+endef
+
+define Package/irssi
+$(call Package/irssi/Default)
+  TITLE+= (with OpenSSL support)
+  DEPENDS+= +libopenssl
+  VARIANT:=ssl
+endef
+
+define Package/irssi/description
+$(call Package/irssi/Default/description)
+ This package is built with OpenSSL support.
+endef
+
+define Package/irssi-nossl
+$(call Package/irssi/Default)
+  TITLE+= (without OpenSSL support)
+  VARIANT:=nossl
 endef
 
-define Package/irssi/install	
-	install -d -m0755 $(1)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/src/fe-text/irssi $(1)/usr/bin/
+define Package/irssi-nossl/description
+$(call Package/irssi/Default/description)
+ This package is built without OpenSSL support.
 endef
 
+CONFIGURE_ARGS += \
+	--with-perl=no \
+	--with-glib-prefix="$(STAGING_DIR)/usr" \
+	--with-textui \
+	--without-terminfo \
+	--without-bot \
+	--disable-proxy
+
+EXTRA_CFLAGS+= \
+	$(TARGET_CPPFLAGS) \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include \
+	-I$(STAGING_DIR)/usr/lib/libintl/include
+
+EXTRA_LDFLAGS+= \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-lncurses
+
+ifeq ($(BUILD_VARIANT),ssl)
+	CONFIGURE_ARGS += \
+		--with-ssl="$(STAGING_DIR)/usr"
+endif
+
+ifeq ($(BUILD_VARIANT),nossl)
+	CONFIGURE_ARGS += \
+		--without-ssl \
+		--disable-ssl
+endif
+
+define Package/irssi/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fe-text/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME)
+endef
+
+Package/irssi-nossl/install = $(Package/irssi/install)
+
 $(eval $(call BuildPackage,irssi))
+$(eval $(call BuildPackage,irssi-nossl))