- Update to 2.0b1

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

5 files changed, 36 insertions, 51 deletions

diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index 65ab8049c1c9..c123517e15ce 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	milter-greylist
-PORTVERSION=	1.7.5
+PORTNAME=	milter-greylist-devel
+DISTVERSION=	2.0b1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
-PKGNAMESUFFIX=	-devel
+DISTNAME=	milter-greylist-${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	aragorn+ports@teaser.fr
@@ -18,9 +18,13 @@ COMMENT=	Easy-to-use greylist milter for sendmail (development)
 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
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LIBS="${LIBS}"
 
 ALL_TARGET=	milter-greylist
 
@@ -51,6 +55,21 @@ post-install:
 	@${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/                              **"; \
+		${ECHO} "**                                                       **"; \
+		${ECHO} "***********************************************************"; \
+		${ECHO} "***********************************************************"; \
+	) || ${TRUE}
+
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/milter-greylist-devel/distinfo b/mail/milter-greylist-devel/distinfo
index ab3e1d56aee1..5986a58c28a7 100644
--- a/mail/milter-greylist-devel/distinfo
+++ b/mail/milter-greylist-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (milter-greylist-1.7.5.tgz) = b0f0bd40a799b6745226a386d52c03b6
-SIZE (milter-greylist-1.7.5.tgz) = 113031
+MD5 (milter-greylist-2.0b1.tgz) = 928d7a131c56f579380c22edfc53fa3f
+SIZE (milter-greylist-2.0b1.tgz) = 113598
diff --git a/mail/milter-greylist-devel/files/patch-Makefile.in b/mail/milter-greylist-devel/files/patch-Makefile.in
deleted file mode 100644
index 8ec4d553edb7..000000000000
--- a/mail/milter-greylist-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.in.orig	Sun Dec 19 09:11:21 2004
-+++ Makefile.in	Tue Dec 28 14:36:39 2004
-@@ -29,9 +29,9 @@
- # OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- 
--CFLAGS= 	@CFLAGS@ -D_BSD_SOURCE
--LDFLAGS=	@LDFLAGS@
--LIBS= 		@LIBS@
-+CFLAGS= 	-O2 -pthread
-+LDFLAGS=	-pthread
-+LIBS= 		-lmilter
- prefix=		@prefix@
- exec_prefix=	@exec_prefix@
- SYSCONFDIR=	@sysconfdir@
-@@ -40,16 +40,16 @@
- MANDIR=		@mandir@
- USER=		@USER@
- 
--CC=		@CC@
--MKDEP=		@MKDEP@
-+#CC=		@CC@
-+#MKDEP=		@MKDEP@
- RM=		@RM@
- MV=		@MV@
--TEST=		@TEST@
-+#TEST=		@TEST@
- SED=		@SED@
--INSTALL=	@INSTALL@
--LEX=		@LEX@
--YACC=		@YACC@
--TRUE=		@TRUE@
-+#INSTALL=	@INSTALL@
-+#LEX=		@LEX@
-+#YACC=		@YACC@
-+#TRUE=		@TRUE@
- 
- OBJ= 		milter-greylist.o pending.o sync.o \
- 		conf_yacc.o dump_yacc.o conf.o autowhite.o dump.o spf.o acl.o
diff --git a/mail/milter-greylist-devel/pkg-message b/mail/milter-greylist-devel/pkg-message
index 398094ce4230..dae05df0cf4e 100644
--- a/mail/milter-greylist-devel/pkg-message
+++ b/mail/milter-greylist-devel/pkg-message
@@ -1,10 +1,14 @@
-===> IMPORTANT NOTE
 
-     A sample configuration file has been installed in ${PREFIX}/etc/mail
-     directory. Copy and edit it to suit your needs before launching
-     milter-greylist.
+------------------------------------------------------------------------
+                              IMPORTANT NOTE
 
-     To run milter-greylist from startup, add miltergreylist_enable="YES"
-     in your /etc/rc.conf or your /etc/rc.conf.local
+ A sample configuration file has been installed in ${PREFIX}/etc/mail
+ directory. Copy and edit it to suit your needs before launching
+ milter-greylist.
 
-     See ${DOCSDIR}/README for operation details.
+ To run milter-greylist from startup, add miltergreylist_enable="YES"
+ in your /etc/rc.conf or your /etc/rc.conf.local
+
+ See ${DOCSDIR}/README for operation details.
+
+------------------------------------------------------------------------
diff --git a/mail/milter-greylist-devel/pkg-plist b/mail/milter-greylist-devel/pkg-plist
index 688b0775bd0d..4b66c694e30e 100644
--- a/mail/milter-greylist-devel/pkg-plist
+++ b/mail/milter-greylist-devel/pkg-plist
@@ -5,6 +5,7 @@ etc/rc.d/milter-greylist.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/greylist.conf
 @exec /bin/mkdir -p /var/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/                              **\n***                                                       **\n************************************************************\n************************************************************\n' ||true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @unexec /bin/rmdir %D/etc/mail 2>/dev/null || true