From aragorn+ports@teaser.fr  Sat Jul  2 20:56:46 2005
Return-Path: <aragorn+ports@teaser.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ABCA416A41C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Jul 2005 20:56:46 +0000 (GMT)
	(envelope-from aragorn+ports@teaser.fr)
Received: from blackbox.babasse.net (jeuneurs-301-2-130.rtc.nerim.net [62.212.126.130])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 753A543D68
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Jul 2005 20:56:23 +0000 (GMT)
	(envelope-from aragorn+ports@teaser.fr)
Received: from blackbox.babasse.net (localhost [127.0.0.1])
	by blackbox.babasse.net (8.13.1/8.13.1) with ESMTP id j62KtmOX007793
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 2 Jul 2005 22:55:48 +0200 (CEST)
	(envelope-from aragorn+ports@teaser.fr)
Received: (from cyril@localhost)
	by blackbox.babasse.net (8.13.1/8.13.1/Submit) id j62KtPQo007789;
	Sat, 2 Jul 2005 22:55:25 +0200 (CEST)
	(envelope-from aragorn+ports@teaser.fr)
Message-Id: <200507022055.j62KtPQo007789@blackbox.babasse.net>
Date: Sat, 2 Jul 2005 22:55:25 +0200 (CEST)
From: Cyril Guibourg <aragorn+ports@teaser.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] mail/milter-greylist: update to 2.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         82906
>Category:       ports
>Synopsis:       [MAINTAINER] mail/milter-greylist: update to 2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 02 21:00:32 GMT 2005
>Closed-Date:    Wed Jul 06 16:50:51 GMT 2005
>Last-Modified:  Wed Jul 06 16:50:51 GMT 2005
>Originator:     Cyril Guibourg
>Release:        FreeBSD 4.11-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD blackbox.babasse.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #6: Sun Jun  5 22:50:47 CEST
>Description:
- Update to 2.0

Added file(s):
- milter-greylist-2.0.tgz

Removed file(s):
- files/patch-dump.h
- files/patch-greylist.conf
- files/patch-milter-greylist.c

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- milter-greylist-2.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/milter-greylist/Makefile /home/cyril/ports/milter-greylist/Makefile
--- /usr/ports/mail/milter-greylist/Makefile	Fri Jul  1 22:55:49 2005
+++ /home/cyril/ports/milter-greylist/Makefile	Fri Jul  1 23:34:41 2005
@@ -2,14 +2,14 @@
 # Date created:				27 Apr 2004
 # Whom:					Cyril Guibourg
 #
-# $FreeBSD: ports/mail/milter-greylist/Makefile,v 1.14 2005/06/30 11:55:19 flz Exp $
+# $FreeBSD: ports/mail/milter-greylist/Makefile,v 1.13 2005/04/12 03:26:00 obrien Exp $
 #
 
 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 @@
 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 @@
 	@${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 -ruN --exclude=CVS /usr/ports/mail/milter-greylist/distinfo /home/cyril/ports/milter-greylist/distinfo
--- /usr/ports/mail/milter-greylist/distinfo	Mon Dec 27 17:27:07 2004
+++ /home/cyril/ports/milter-greylist/distinfo	Fri Jul  1 23:36:00 2005
@@ -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 -ruN --exclude=CVS /usr/ports/mail/milter-greylist/files/patch-dump.h /home/cyril/ports/milter-greylist/files/patch-dump.h
--- /usr/ports/mail/milter-greylist/files/patch-dump.h	Tue Jun 15 08:49:58 2004
+++ /home/cyril/ports/milter-greylist/files/patch-dump.h	Thu Jan  1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/mail/milter-greylist/files/patch-greylist.conf /home/cyril/ports/milter-greylist/files/patch-greylist.conf
--- /usr/ports/mail/milter-greylist/files/patch-greylist.conf	Fri Dec 17 07:17:24 2004
+++ /home/cyril/ports/milter-greylist/files/patch-greylist.conf	Thu Jan  1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/mail/milter-greylist/files/patch-milter-greylist.c /home/cyril/ports/milter-greylist/files/patch-milter-greylist.c
--- /usr/ports/mail/milter-greylist/files/patch-milter-greylist.c	Fri Dec 17 07:17:24 2004
+++ /home/cyril/ports/milter-greylist/files/patch-milter-greylist.c	Thu Jan  1 01:00:00 1970
@@ -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>
Binary files /usr/ports/mail/milter-greylist/milter-greylist-2.0.tgz and /home/cyril/ports/milter-greylist/milter-greylist-2.0.tgz differ
diff -ruN --exclude=CVS /usr/ports/mail/milter-greylist/pkg-plist /home/cyril/ports/milter-greylist/pkg-plist
--- /usr/ports/mail/milter-greylist/pkg-plist	Tue Jun 15 08:49:58 2004
+++ /home/cyril/ports/milter-greylist/pkg-plist	Fri Jul  1 23:34:34 2005
@@ -4,10 +4,9 @@
 %%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
--- milter-greylist-2.0.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jul 6 16:50:43 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=82906 
>Unformatted:
