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 a39e15ee8b2ef3a4897a908588196f875fb4c1b6..8dfca7edb10c40752715997b7dd932a73c76b758 100644 (file)
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=msmtp
-PKG_VERSION:=1.4.22
+PKG_VERSION:=1.4.24
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/msmtp
-PKG_MD5SUM:=de0a4e6f3133519b301fc114daf81f49
+PKG_MD5SUM:=3ed704fbd3e7419cab5c65bb7928d9ba
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
@@ -30,10 +30,6 @@ define Package/msmtp/Default
   URL:=http://msmtp.sourceforge.net/
 endef
 
-define Package/msmtp/Default/conffiles
-/etc/msmtprc
-endef
-
 define Package/msmtp/Default/description
  msmtp is an SMTP client. In the default mode, it transmits a mail to
  an SMTP server (for example at a free mail provider) which does the
@@ -50,7 +46,7 @@ $(call Package/msmtp/Default)
 endef
 
 define Package/msmtp/conffiles
-$(call Package/msmtp/Default/conffiles)
+/etc/msmtprc
 endef
 
 define Package/msmtp/description
@@ -64,10 +60,6 @@ $(call Package/msmtp/Default)
   VARIANT:=nossl
 endef
 
-define Package/msmtp-nossl/conffiles
-$(call Package/msmtp/Default/conffiles)
-endef
-
 define Package/msmtp-nossl/description
 $(call Package/msmtp/Default/description)
  This package is built without SSL support.
@@ -75,7 +67,6 @@ endef
 
 CONFIGURE_ARGS += \
        --disable-rpath \
-       --without-libssl32-prefix \
        --without-libintl-prefix \
        --without-libgsasl \
        --without-libidn
@@ -84,8 +75,7 @@ MAKE_FLAGS :=
 
 ifeq ($(BUILD_VARIANT),ssl)
        CONFIGURE_ARGS += \
-               --with-ssl=openssl \
-               --with-libssl-prefix="$(STAGING_DIR)/usr/include"
+               --with-ssl=openssl
 endif
 
 ifeq ($(BUILD_VARIANT),nossl)
@@ -107,9 +97,9 @@ 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))
-