X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=mail%2Fdovecot%2FMakefile;h=79216d2b57b47ece6622f795fd056a82f59c2445;hp=d73344f242e7e9f13d1664565454ad5c96774580;hb=c132964714cdf1b7e9a2fe60bf37974219829953;hpb=599a67bfc8ec167537b9e97221b4e8fb5743ccf0

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d73344f242..79216d2b57 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,27 +1,28 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dovecot
-PKG_VERSION:=1.0.beta8
+PKG_VERSION:=1.2.10
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.dovecot.org/releases/
-PKG_MD5SUM:=6a87718a86ee1ae2334c75843dd9a7df
+PKG_SOURCE_URL:=http://www.dovecot.org/releases/1.2
+PKG_MD5SUM:=b7d0081b17ff6afae85e8dc14157fa57
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dovecot
   SECTION:=mail
   CATEGORY:=Mail
-  DEPENDS:=+libopenssl
+  DEPENDS:=+libopenssl +librt
   TITLE:=An IMAP and POP3 daemon
   URL:=http://www.dovecot.org/
 endef
@@ -30,29 +31,36 @@ define Package/dovecot/description
  Dovecot is a program which provides POP3 and IMAP services.
 endef
 
+CONFIGURE_ARGS += \
+	--without-gssapi \
+	--without-pam \
+	--with-moduledir=/usr/lib/dovecot/modules \
+	--with-notify=dnotify \
+
+CONFIGURE_VARS += \
+	RPCGEN= \
+	i_cv_signed_size_t=no \
+	i_cv_signed_time_t=no \
+	i_cv_gmtime_max_time_t=32 \
+	i_cv_mmap_plays_with_write=yes \
+	i_cv_fd_passing=yes \
+	i_cv_c99_vsnprintf=yes \
+	lib_cv_va_copy=yes \
+	lib_cv_va_copy=yes \
+	lib_cv___va_copy=yes \
+	lib_cv_va_val_copy=yes \
+
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
 		autoconf \
 	);
-	$(call Build/Configure/Default, \
-		--without-gssapi \
-		--with-moduledir=/usr/lib/dovecot/modules \
-		, \
-		ignore_signed_size=1 \
-	)
-endef
-
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+	$(call Build/Configure/Default)
 endef
 
 define Package/dovecot/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot
-	$(INSTALL_DIR) $(1)/etc/dovecot
-	$(INSTALL_DATA) ./files/dovecot.conf $(1)/etc/dovecot.conf
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dovecot-example.conf $(1)/etc/dovecot.conf
 	$(INSTALL_DIR) $(1)/usr/lib/dovecot
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/
 	$(INSTALL_DIR) $(1)/usr/sbin