- Update to 2.0

PR:		ports/82906
Submitted by:	Cyril Guibourg <aragorn+ports@teaser.fr> (maintainer)

6 files changed, 28 insertions, 47 deletions

diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index c30342f09b1e..6c9ccef9f5c3 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	milter-greylist
-PORTVERSION=	1.6
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
+DISTNAME=	milter-greylist-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	aragorn+ports@teaser.fr
@@ -18,11 +18,12 @@ COMMENT=	Easy-to-use greylist milter for sendmail
 MAN5=		greylist.conf.5
 MAN8=		milter-greylist.8
 
+CFLAGS+=	${PTHREAD_CFLAGS}
+LIBS+=		${PTHREAD_LIBS}
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-user=smmsp
-CFLAGS+=	${PTHREAD_CFLAGS}
-LIBS+=		${PTHREAD_LIBS}
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LIBS="${LIBS}"
 
 ALL_TARGET=	milter-greylist
@@ -46,14 +47,30 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/milter-greylist.sh ${PREFIX}/etc/rc.d/
 
 post-install:
-	@${MKDIR} /var/milter-greylist /var/db/milter-greylist
-	@${CHOWN} smmsp /var/milter-greylist /var/db/milter-greylist
+	@${MKDIR} /var/milter-greylist
+	@${CHOWN} smmsp /var/milter-greylist
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
 .endif
+
+	@${TEST} -f /var/db/milter-greylist/greylist.db && ( \
+		${ECHO} "************************************************************"; \
+		${ECHO} "************************************************************"; \
+		${ECHO} "**                                                        **"; \
+		${ECHO} "**                        WARNING                         **"; \
+		${ECHO} "**                                                        **"; \
+		${ECHO} "** The default dump file location has changed.            **"; \
+		${ECHO} "** Please move greylist.db from /var/db/milter-greylist/  **"; \
+		${ECHO} "** to /var/milter-greylist/ and update your greylist.conf **"; \
+		${ECHO} "** accordingly.                                           **"; \
+		${ECHO} "**                                                        **"; \
+		${ECHO} "************************************************************"; \
+		${ECHO} "************************************************************"; \
+	) || ${TRUE}
+
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
index e74f6cc587d8..4573bd82ff32 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,2 +1,2 @@
-MD5 (milter-greylist-1.6.tgz) = 9830e3a13aadf851a799131d9a40e931
-SIZE (milter-greylist-1.6.tgz) = 105679
+MD5 (milter-greylist-2.0.tgz) = c9eeb70a47cbd9f731e94d297d0f2e95
+SIZE (milter-greylist-2.0.tgz) = 115332
diff --git a/mail/milter-greylist/files/patch-dump.h b/mail/milter-greylist/files/patch-dump.h
deleted file mode 100644
index d612c53af3f8..000000000000
--- a/mail/milter-greylist/files/patch-dump.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dump.h.orig	Tue Jun  8 16:47:47 2004
-+++ dump.h	Sat Jun 12 10:47:56 2004
-@@ -46,7 +46,7 @@
- #include <arpa/inet.h>
- 
- #ifndef DUMPFILE
--#define DUMPFILE "/var/milter-greylist/greylist.db"
-+#define DUMPFILE "/var/db/milter-greylist/greylist.db"
- #endif
- 
- #ifndef DUMPFREQ
diff --git a/mail/milter-greylist/files/patch-greylist.conf b/mail/milter-greylist/files/patch-greylist.conf
deleted file mode 100644
index e6e0cf57efa3..000000000000
--- a/mail/milter-greylist/files/patch-greylist.conf
+++ /dev/null
@@ -1,11 +0,0 @@
---- greylist.conf.orig	Tue Nov  9 07:57:07 2004
-+++ greylist.conf	Mon Nov 15 22:04:12 2004
-@@ -109,7 +109,7 @@
- #socket "/var/milter-greylist/milter-greylist.sock"
- 
- # The dumpfile location
--#dumpfile "/var/milter-greylist/greylist.db"
-+#dumpfile "/var/db/milter-greylist/greylist.db"
- 
- # How often should we dump to the dumpfile (0: on each change, -1: never)
- #dumpfreq 10m
diff --git a/mail/milter-greylist/files/patch-milter-greylist.c b/mail/milter-greylist/files/patch-milter-greylist.c
deleted file mode 100644
index 78060529ac81..000000000000
--- a/mail/milter-greylist/files/patch-milter-greylist.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- milter-greylist.c.orig	Sat Nov 27 15:43:17 2004
-+++ milter-greylist.c	Sat Dec 11 14:17:14 2004
-@@ -56,10 +56,6 @@
- #endif
- #include <sysexits.h>
- 
--#if HAVE_GETOPT_H
--#include <getopt.h>
--#endif
--
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/stat.h>
diff --git a/mail/milter-greylist/pkg-plist b/mail/milter-greylist/pkg-plist
index fae00eb049e7..5a9dc9d00a92 100644
--- a/mail/milter-greylist/pkg-plist
+++ b/mail/milter-greylist/pkg-plist
@@ -4,10 +4,9 @@ etc/rc.d/milter-greylist.sh
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/greylist.conf
 @exec /bin/mkdir -p /var/milter-greylist
-@exec /bin/mkdir -p /var/db/milter-greylist
-@exec /usr/sbin/chown smmsp /var/milter-greylist /var/db/milter-greylist
+@exec /usr/sbin/chown smmsp /var/milter-greylist
+@exec [ -f /var/db/milter-greylist/greylist.db ] && printf '\n\n************************************************************\n************************************************************\n**                                                        **\n**                        WARNING                         **\n**                                                        **\n** The default dump file location has changed.            **\n** Please move greylist.db from /var/db/milter-greylist/  **\n** to /var/milter-greylist/ and update your greylist.conf **\n** accordingly.                                           **\n**                                                        **\n************************************************************\n************************************************************\n' ||true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @unexec /bin/rmdir %D/etc/mail 2>/dev/null || true
-@unexec /bin/rmdir /var/milter-greylist 2>/dev/null || true
-@unexec [ -f /var/db/milter-greylist/greylist.db ] || /bin/rmdir /var/db/milter-greylist || true
+@unexec [ -f /var/milter-greylist/greylist.db ] || /bin/rmdir /var/milter-greylist || true