packages: add perl-net-telnet (closes: #10277)

[openwrt/svn-archive/archive.git] / mail / msmtp / Makefile

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 7ffed387edad6997d119945156ccfcddbb57aa55..8dfca7edb10c40752715997b7dd932a73c76b758 100644 (file)
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2009 David Cooper <dave@kupesoft.com>
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=msmtp
-PKG_VERSION:=1.4.17
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.24
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/msmtp
+PKG_MD5SUM:=3ed704fbd3e7419cab5c65bb7928d9ba
 
-PKG_MD5SUM:=b0b74f1144812b60688f590c62a0d3dd
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -38,6 +42,11 @@ define Package/msmtp
 $(call Package/msmtp/Default)
   DEPENDS+= +libopenssl
   TITLE+= (with SSL support)
+  VARIANT:=ssl
+endef
+
+define Package/msmtp/conffiles
+/etc/msmtprc
 endef
 
 define Package/msmtp/description
@@ -48,6 +57,7 @@ endef
 define Package/msmtp-nossl
 $(call Package/msmtp/Default)
   TITLE+= (without SSL support)
+  VARIANT:=nossl
 endef
 
 define Package/msmtp-nossl/description
@@ -55,54 +65,41 @@ $(call Package/msmtp/Default/description)
  This package is built without SSL support.
 endef
 
-define Build/Template
-
-$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
-       -$(MAKE) -C $(PKG_BUILD_DIR) clean
-       $(call Build/Configure/Default,$(3))
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       ( cd $(PKG_BUILD_DIR)/src; mv -f msmtp msmtp-$(2) )
-       touch $$@
-
-$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
-
-define Package/$(1)/install
-       $(INSTALL_DIR) $$(1)/etc
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \
-               $$(1)/etc/msmtprc
-       $(INSTALL_DIR) $$(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/msmtp-$(2) $$(1)/usr/bin/msmtp
-       $(INSTALL_DIR) $$(1)/usr/sbin
-       ln -sf /usr/bin/msmtp $$(1)/usr/sbin/sendmail
-endef
-
-endef
-
 CONFIGURE_ARGS += \
-       --without-libssl32 \
-       --without-libintl \
+       --disable-rpath \
+       --without-libintl-prefix \
        --without-libgsasl \
        --without-libidn
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_msmtp),)
-  define Build/with-ssl
-       $(call Build/Template,msmtp,with-ssl, \
-               --with-ssl=openssl \
-               --with-libssl-prefix="$(STAGING_DIR)/usr/include" \
-       )
-  endef
+MAKE_FLAGS :=
+
+ifeq ($(BUILD_VARIANT),ssl)
+       CONFIGURE_ARGS += \
+               --with-ssl=openssl
 endif
-$(eval $(Build/with-ssl))
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_msmtp-nossl),)
-  define Build/without-ssl
-       $(call Build/Template,msmtp-nossl,without-ssl, \
-               --with-ssl=no \
-       )
-  endef
+
+ifeq ($(BUILD_VARIANT),nossl)
+       CONFIGURE_ARGS += \
+               --with-ssl=no
 endif
-$(eval $(Build/without-ssl))
+
+define Package/msmtp/install
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \
+               $(1)/etc/msmtprc
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/msmtp $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpqueue/msmtp-{en,list,run}queue.sh $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+endef
+
+define Package/msmtp/postinst
+       ln -sf ../bin/msmtp $${IPKG_INSTROOT}/usr/sbin/sendmail
+endef
+
+Package/msmtp-nossl/conffiles = $(Package/msmtp/conffiles)
+Package/msmtp-nossl/install = $(Package/msmtp/install)
+Package/msmtp-nossl/postinst = $(Package/msmtp/postinst)
 
 $(eval $(call BuildPackage,msmtp))
 $(eval $(call BuildPackage,msmtp-nossl))
-