[net] elinks: Moved elinks to main list and removed Web submenu, as it elinks was...

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

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 7abe6440e4bbc97a0eae21a0087a89778a474a6c..7d7fec8ea08ca0f539bcc6817ba6ce6b4f2303bc 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-2010 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,14 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=msmtp
-PKG_VERSION:=1.4.19
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.23
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/msmtp
-PKG_MD5SUM:=f0afdc943bf7c8a3a3bf3fe1a73072c4
+PKG_MD5SUM:=5fb7ae88186624cdb125d3efad3fdc16
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -29,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
@@ -49,7 +46,7 @@ $(call Package/msmtp/Default)
 endef
 
 define Package/msmtp/conffiles
-$(call Package/msmtp/Default/conffiles)
+/etc/msmtprc
 endef
 
 define Package/msmtp/description
@@ -63,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.
@@ -74,8 +67,8 @@ endef
 
 CONFIGURE_ARGS += \
        --disable-rpath \
-       --without-libssl32 \
-       --without-libintl \
+       --without-libssl32-prefix \
+       --without-libintl-prefix \
        --without-libgsasl \
        --without-libidn
 
@@ -97,17 +90,18 @@ define Package/msmtp/install
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \
                $(1)/etc/msmtprc
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/msmtp $(1)/usr/bin/msmtp
+       $(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/postinstall
+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/postinstall = $(Package/msmtp/postinstall)
+Package/msmtp-nossl/postinst = $(Package/msmtp/postinst)
 
 $(eval $(call BuildPackage,msmtp))
 $(eval $(call BuildPackage,msmtp-nossl))
-