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

diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 9b5724ed89..b0572f61c4 100644
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -1,22 +1,23 @@
 #
-# 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.13
+PKG_VERSION:=0.8.15
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://irssi.org/files/
-PKG_MD5SUM:=0d6fc2203832b514eff014fffd574664
+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
 
@@ -25,7 +26,8 @@ define Package/irssi/Default
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+glib2 +libncurses
-  TITLE:=console irc client
+  TITLE:=Console IRC client
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://irssi.org/
 endef
 
@@ -35,73 +37,62 @@ endef
 
 define Package/irssi
 $(call Package/irssi/Default)
-  TITLE+= (without OpenSSL support)
+  TITLE+= (with OpenSSL support)
+  DEPENDS+= +libopenssl
+  VARIANT:=ssl
 endef
 
 define Package/irssi/description
 $(call Package/irssi/Default/description)
- This package is built without OpenSSL support.
+ This package is built with OpenSSL support.
 endef
 
-define Package/irssi-openssl
+define Package/irssi-nossl
 $(call Package/irssi/Default)
-  TITLE+= (with OpenSSL support)
-  DEPENDS+= +libopenssl
+  TITLE+= (without OpenSSL support)
+  VARIANT:=nossl
 endef
 
-define Package/irssi-openssl/description
+define Package/irssi-nossl/description
 $(call Package/irssi/Default/description)
- This package is built with OpenSSL support.
-endef
-
-define Build/Template
-
-$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(call Build/Configure/Default, \
-		--with-perl=no \
-		--with-glib-prefix="$(STAGING_DIR)/usr" \
-		--with-textui \
-		--without-terminfo \
-		--without-bot \
-		--without-file-offset-size \
-		--disable-ipv6 \
-		--disable-proxy \
-		$(3))
-	$(MAKE) -C $(PKG_BUILD_DIR)
-	( cd $(PKG_BUILD_DIR); mv -f src/fe-text/irssi $(PKG_NAME)-$(2) )
-	touch $$@
-
-$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
-
-define Package/$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(2)  $$(1)/usr/bin/$(PKG_NAME)
-endef
+ This package is built without OpenSSL support.
 endef
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/include -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
+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
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_irssi),)
-  define Build/without-ssl
-    $(call Build/Template,irssi,without-ssl, \
+ifeq ($(BUILD_VARIANT),nossl)
+	CONFIGURE_ARGS += \
 		--without-ssl \
-		--disable-ssl \
-    )
-  endef
+		--disable-ssl
 endif
-$(eval $(Build/without-ssl))
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_irssi-openssl),)
-  define Build/with-openssl
-    $(call Build/Template,irssi-openssl,with-openssl, \
-        --with-ssl="$(STAGING_DIR)/usr" \
-    )
-  endef
-endif
-$(eval $(Build/with-openssl))
 
-$(eval $(call BuildPackage,irssi))
-$(eval $(call BuildPackage,irssi-openssl))
+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))