- Update to 0.10.3

Changelog:
	*  GCC4 compatibility patches
	* Use of a temporary file to handle log rotation correctly.

PR:		125256
Submitted by:	Xavier Beaudouin <kiwi@oav.net> (maintainer)

6 files changed, 25 insertions, 75 deletions

diff --git a/mail/lmtpd/Makefile b/mail/lmtpd/Makefile
index 562d49daea0d..77e716bc1e05 100644
--- a/mail/lmtpd/Makefile
+++ b/mail/lmtpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lmtpd
-PORTVERSION=	0.10.2
+PORTVERSION=	0.10.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} ftp://ftp.oav.net/pll/
 MASTER_SITE_SUBDIR=	pll
@@ -104,9 +104,11 @@ post-install:
 		${PREFIX}/etc/lmtpd.conf.dist
 	${INSTALL_SCRIPT} ${WRKSRC}/lmtpdlogsum/lmtpdlogsum.pl \
 		${PREFIX}/bin/lmtpdlogsum
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}/msg
 	${INSTALL_DATA} ${WRKSRC}/sql/* ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/txt/* ${EXAMPLESDIR}/msg
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
diff --git a/mail/lmtpd/distinfo b/mail/lmtpd/distinfo
index 6b02b02094a8..04a1331979e4 100644
--- a/mail/lmtpd/distinfo
+++ b/mail/lmtpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (lmtpd-0.10.2.tar.gz) = 6d8b8556756c820d35102755e3913639
-SHA256 (lmtpd-0.10.2.tar.gz) = 8b2f89945747498c1213a4c2b19eb0eded60bfe66c3a868e4692db213df3cf38
-SIZE (lmtpd-0.10.2.tar.gz) = 486769
+MD5 (lmtpd-0.10.3.tar.gz) = b824d882ee461d18a95b564ee4f3b835
+SHA256 (lmtpd-0.10.3.tar.gz) = 865decd9fdc98359bf826da3f5f6c534abf26cfec3392050ebff704dccad968e
+SIZE (lmtpd-0.10.3.tar.gz) = 539857
diff --git a/mail/lmtpd/files/patch-lmtpconf.c b/mail/lmtpd/files/patch-lmtpconf.c
deleted file mode 100644
index f07f5a0aafb7..000000000000
--- a/mail/lmtpd/files/patch-lmtpconf.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- lmtpconf.c.org	2004-10-26 17:59:50.000000000 +0200
-+++ lmtpconf.c	2006-12-24 11:23:03.000000000 +0100
-@@ -197,6 +197,7 @@
-   return rl;
- }
- 
-+static int readconf1(char *file, struct fstate *state, struct conf *spec);
- 
- static int setval(void *val, int type, char *args) {
-   switch(type) {
-@@ -392,8 +393,6 @@
-     return 0;
-   case FLAGS_INCLUDE: 
-     if (args) {
--      static int readconf1(char *file, struct fstate *state,
--			   struct conf *spec);
-       struct conf_state *cstate = val;
-       char *filename = args;
-       int ret = -1;
diff --git a/mail/lmtpd/files/patch-re-re.c b/mail/lmtpd/files/patch-re-re.c
deleted file mode 100644
index d5336aae3feb..000000000000
--- a/mail/lmtpd/files/patch-re-re.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- re/re.c.orig	2004-10-26 17:59:51.000000000 +0200
-+++ re/re.c	2006-12-24 11:29:14.000000000 +0100
-@@ -44,8 +44,8 @@
- extern RE re_rfc822;
- extern RE re_true;
- extern RE re_false;
--extern RE re_error;
--extern RE re_error_memory;
-+static RE re_error;
-+static RE re_error_memory;
- #if WITH_TRE
- extern RE re_tre_extended;
- char *re_tre_init(void);
diff --git a/mail/lmtpd/files/patch-sieve-sievelex.c b/mail/lmtpd/files/patch-sieve-sievelex.c
deleted file mode 100644
index ff03d247d7f5..000000000000
--- a/mail/lmtpd/files/patch-sieve-sievelex.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- sieve/sievelex.c.orig	Mon Sep 12 10:59:53 2005
-+++ sieve/sievelex.c	Wed Sep 14 20:12:03 2005
-@@ -24,6 +24,8 @@
- static char const rcsid[] UNUSED =
- "$Id: sievelex.c,v 1.10 2005/09/12 08:59:53 lwa Exp $";
- 
-+#include <sys/types.h>
-+
- #define WITH_SIEVE_REGEX
- 
- #ifdef WITH_SIEVE_REGEX
-@@ -1727,8 +1729,9 @@
- 
- LOCAL int sieve_handle_test_list(struct sieve_state *state, int doit, int type) {
-   struct token Pt;
-+  int value;
-   sieve_lex(state, &Pt, 0);
--  int value = (type == SIEVE_ALLOF);
-+  value = (type == SIEVE_ALLOF);
-   if (Pt.op == '(') {
-     do {
-       int test = sieve_test(state, doit);
diff --git a/mail/lmtpd/pkg-plist b/mail/lmtpd/pkg-plist
index 4ab6d1ca9b93..7d6f376fee4c 100644
--- a/mail/lmtpd/pkg-plist
+++ b/mail/lmtpd/pkg-plist
@@ -10,20 +10,22 @@ share/nls/fr_FR.UTF-8/filtercheck.cat
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/log.sql
-%%EXAMPLESDIR%%/mysqllog.mysql
-%%EXAMPLESDIR%%/overquota.sql
-%%EXAMPLESDIR%%/msg/README
-%%EXAMPLESDIR%%/msg/bounce.en.txt
-%%EXAMPLESDIR%%/msg/bounce.fr.txt
-%%EXAMPLESDIR%%/msg/debug.en.txt
-%%EXAMPLESDIR%%/msg/debug.fr.txt
-%%EXAMPLESDIR%%/msg/logmsg.fr.txt
-%%EXAMPLESDIR%%/msg/quotamsg.en.txt
-%%EXAMPLESDIR%%/msg/quotamsg.es.txt
-%%EXAMPLESDIR%%/msg/quotamsg.fr.txt
-%%EXAMPLESDIR%%/msg/quotamsg.it.txt
-%%EXAMPLESDIR%%/msg/virus.en.txt
-%%EXAMPLESDIR%%/msg/virus.fr.txt
-@dirrm %%EXAMPLESDIR%%/msg
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MANIFEST
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mysqllog.mysql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overquota.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/MANIFEST
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/bounce.en.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/bounce.fr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/debug.en.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/debug.fr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/logmsg.fr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/quotamsg.en.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/quotamsg.es.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/quotamsg.fr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/quotamsg.it.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/virus.en.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msg/virus.fr.txt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/msg
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%