- Update to 1.5.3

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

3 files changed, 12 insertions, 33 deletions

diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 664608f..f14c6fa 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	milter-greylist
-PORTVERSION=	1.4
+PORTVERSION=	1.5.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
 EXTRACT_SUFX=	.tgz
@@ -30,14 +30,18 @@ post-extract:
 	@${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/milter-greylist.sh > ${WRKSRC}/milter-greylist.sh
 
-pre-install:
+do-install:
 	@${MKDIR} ${PREFIX}/etc/mail
+	@${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
+	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
+	@${INSTALL_DATA} ${WRKSRC}/greylist.conf \
+			${PREFIX}/etc/mail/greylist.conf.sample
+	@${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} ${PREFIX}/etc/rc.d
-	@${INSTALL_SCRIPT} ${WRKSRC}/milter-greylist.sh ${PREFIX}/etc/rc.d/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
index dea8ed0..f3b0394 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,2 +1,2 @@
-MD5 (milter-greylist-1.4.tgz) = 97c8cb7c9ec3149d4f4388eb81dd4692
-SIZE (milter-greylist-1.4.tgz) = 93239
+MD5 (milter-greylist-1.5.3.tgz) = 522f3876aa57d6e4906a445123af311b
+SIZE (milter-greylist-1.5.3.tgz) = 94309
diff --git a/mail/milter-greylist/files/patch-Makefile.in b/mail/milter-greylist/files/patch-Makefile.in
index aee74bb..00542b0 100644
--- a/mail/milter-greylist/files/patch-Makefile.in
+++ b/mail/milter-greylist/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Jun  8 17:57:34 2004
-+++ Makefile.in	Sat Jun 12 10:47:56 2004
+--- Makefile.in.orig	Wed Jun 16 22:28:30 2004
++++ Makefile.in	Fri Jun 25 16:26:41 2004
 @@ -29,9 +29,9 @@
  # OF THE POSSIBILITY OF SUCH DAMAGE.
  #
@@ -13,28 +13,3 @@
  prefix=		@prefix@
  exec_prefix=	@exec_prefix@
  SYSCONFDIR=	@sysconfdir@
-@@ -80,23 +80,7 @@
- 	${INSTALL} -m 755 milter-greylist ${BINDIR}
- 	${INSTALL} -m 644 milter-greylist.8 ${MANDIR}/man8
- 	${INSTALL} -m 644 greylist.conf.5 ${MANDIR}/man5
--	${TEST} -f /etc/mail/greylist.conf -o -f /etc/mail/greylist.except || \
--	     ${INSTALL} -m 644 greylist.conf /etc/mail
--	${INSTALL} -d -m 755 -o ${USER} /var/milter-greylist
--	@${TEST} -f /var/db/greylist.db && (			 	   \
--		echo "	================================================"; \
--		echo "	  WARNING: the dump file location has changed,  "; \
--		echo "	  Please move /var/db/greylist.db, the default  "; \
--		echo "	  location is now in /var/milter-greylist/      "; \
--		echo "	================================================"; \
--	) || ${TRUE}
--	@${TEST} -f /etc/mail/greylist.except && (		 	   \
--		echo "	================================================"; \
--		echo "	 WARNING: the config file name has changed,     "; \
--		echo "	 Please rename /etc/mail/greylist.except, the   "; \
--		echo "	 default name is now in /etc/mail/greylist.conf "; \
--		echo "	================================================"; \
--	) || ${TRUE}
-+	${INSTALL} -m 644 greylist.conf ${SYSCONFDIR}/mail/greylist.conf.sample
- 
- depend:
- 	${MKDEP} ${CFLAGS} ${SRC}