- Take maintainership

- rename [files/milter-greylist.sh -> files/milter-greylist.in, pkg-message -> files/pkg-message.in]
- Bump PORTREVISION
- drop 5.x support
- use SUB_FILES for pkg-message processing
- make use of @dirrmtry in pkg-plist

PR:             ports/125657
Approved by:    araujo (mentor, implicit)

4 files changed, 10 insertions, 61 deletions

diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index 4dd8582b5529..564424f475fb 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -7,12 +7,13 @@
 
 PORTNAME=	milter-greylist-devel
 DISTVERSION=	2.0b1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
 DISTNAME=	milter-greylist-${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	Easy-to-use greylist milter for sendmail (development)
 
 MAN5=		greylist.conf.5
@@ -27,15 +28,11 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LIBS="${LIBS}"
 
 ALL_TARGET=	milter-greylist
 
-USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+USE_RC_SUBR=	milter-greylist
+SUB_FILES+=	pkg-message
 
 CONFLICTS=	milter-greylist-[1-9]*.*
 
-post-extract:
-	@${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/milter-greylist.sh > ${WRKSRC}/milter-greylist.sh
-
 do-install:
 	@${MKDIR} ${PREFIX}/etc/mail
 	@${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/bin
@@ -43,18 +40,18 @@ do-install:
 	@${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
 	@${CHOWN} smmsp /var/milter-greylist
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
+.if !defined (NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
 .endif
-
 	@${TEST} -f /var/db/milter-greylist/greylist.db && ( \
 		${ECHO} "***********************************************************"; \
 		${ECHO} "***********************************************************"; \
@@ -68,7 +65,6 @@ post-install:
 		${ECHO} "***********************************************************"; \
 		${ECHO} "***********************************************************"; \
 	) || ${TRUE}
-
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/milter-greylist-devel/files/milter-greylist.sh b/mail/milter-greylist-devel/files/milter-greylist.sh
index 2bed442fc1d0..e69de29bb2d1 100644
--- a/mail/milter-greylist-devel/files/milter-greylist.sh
+++ b/mail/milter-greylist-devel/files/milter-greylist.sh
@@ -1,32 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/milter-greylist-devel/files/Attic/milter-greylist.sh,v 1.1 2005-02-03 18:42:24 ume Exp $
-
-# PROVIDE: miltergreylist
-# REQUIRE: LOGIN
-# BEFORE: sendmail
-# KEYWORD: milter-greylist
-
-# Define these miltergreylist_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/miltergreylist
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-miltergreylist_enable=${miltergreylist_enable-"NO"}
-miltergreylist_runas=${miltergreylist_runas-"smmsp"}
-miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
-miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"}
-miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"}
-miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
--f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
-
-. %%RC_SUBR%%
-
-name="miltergreylist"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/bin/milter-greylist"
-
-load_rc_config $name
-
-run_rc_command "$1"
diff --git a/mail/milter-greylist-devel/pkg-message b/mail/milter-greylist-devel/pkg-message
index dae05df0cf4e..e69de29bb2d1 100644
--- a/mail/milter-greylist-devel/pkg-message
+++ b/mail/milter-greylist-devel/pkg-message
@@ -1,14 +0,0 @@
-
-------------------------------------------------------------------------
-                              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.
-
- 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 4b66c694e30e..d5e2cb2e5b4d 100644
--- a/mail/milter-greylist-devel/pkg-plist
+++ b/mail/milter-greylist-devel/pkg-plist
@@ -1,12 +1,11 @@
 bin/milter-greylist
 etc/mail/greylist.conf.sample
-etc/rc.d/milter-greylist.sh
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/greylist.conf
+%%PORTEXAMPLES%%%%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
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry etc/mail
 @unexec [ -f /var/milter-greylist/greylist.db ] || /bin/rmdir /var/milter-greylist || true