alpine: update to 2.25

[feed/packages.git] / mail / alpine / Makefile

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 26049dfd3397367adee70ddf6ec14607caafe9e7..97cb1ae379fb43e9a157c3f6ff0f638043ee2168 100644 (file)
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -8,21 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alpine
-PKG_VERSION:=2.21.9999
-PKG_RELEASE:=2
+PKG_VERSION:=2.25
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://repo.or.cz/alpine.git
-PKG_SOURCE_VERSION:=d3e6f3932f2af9deca8eed09e30a55e9bd524362
-PKG_MIRROR_HASH:=72f9e8c4c3ecbd5f73f527af98ad23f716fcede3af0ab0400c6e0bc9b1288e30
+PKG_SOURCE_URL:=http://alpine.x10host.com/alpine/release/src
+PKG_HASH:=658a150982f6740bb4128e6dd81188eaa1212ca0bf689b83c2093bb518ecf776
 
 PKG_MAINTAINER:=Antti Seppälä <a.seppala@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_FIXUP:=autoreconf
-
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
@@ -59,6 +55,7 @@ endef
 define Package/alpine-nossl
 $(call Package/alpine/Default)
   TITLE+= (without OpenSSL support)
+  DEPENDS+= @BROKEN
   VARIANT:=nossl
 endef
 
@@ -80,6 +77,7 @@ CONFIGURE_ARGS += \
        --disable-debug \
        --disable-mouse \
        --with-c-client-target=slx \
+       $(if $(CONFIG_IPV6),--with,--without)-ipv6
 
 CONFIGURE_VARS += \
        top_builddir=$(PKG_BUILD_DIR)
@@ -88,23 +86,11 @@ ifeq ($(BUILD_VARIANT),ssl)
        CONFIGURE_ARGS += \
                --with-ssl-include-dir=$(STAGING_DIR)/usr/include/openssl/. \
                --with-ssl-lib-dir=$(STAGING_DIR)/usr/lib
-endif
-
-ifeq ($(BUILD_VARIANT),nossl)
+else
        CONFIGURE_ARGS += \
                --without-ssl
 endif
 
-ifeq ($(CONFIG_BUILD_NLS),y)
-  DISABLE_NLS:=
-endif
-
-ifeq ($(CONFIG_IPV6),y)
-  DISABLE_IPV6:=
-else
-  DISABLE_IPV6:=--without-ipv6
-endif
-
 define Build/Compile
        ( cd $(PKG_BUILD_DIR)/pith ; \
                $(HOSTCC) help_h_gen.c -c -o help_h_gen.o ; \
@@ -117,7 +103,7 @@ endef
 
 define Package/alpine/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME)
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/alpine $(1)/usr/bin/
 endef
 
 Package/alpine-nossl/install = $(Package/alpine/install)