net/quagga: fix uClibc-0.9.32/pthreads issues, refresh patches

[openwrt/svn-archive/archive.git] / net / irssi / Makefile

diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 2e98227c345df18d15453fb6c35a09757aa1db72..b0572f61c4ba6cfc6ac702870f57fdfda9604d86 100644 (file)
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=irssi
-PKG_VERSION:=0.8.14
-PKG_RELEASE:=2
+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:=00efe7638dd596d5930dfa2aeae87b3a
+PKG_MD5SUM:=1dcb3f511b88df94b0c996f36668c7da
 
 PKG_FIXUP:=libtool
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/irssi/Default
@@ -24,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
 
@@ -34,71 +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 \
-               --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+=$(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
+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))