Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Mar 2014 10:58:28 +0200 (CEST)
From:      dirk.meyer@dinoex.sub.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/188069: [PATCH] mail/milter-greylist for staging
Message-ID:  <201403300858.s2U8wS6p028867@home8.dinoex.sub.de>
Resent-Message-ID: <201403300900.s2U900N7044566@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188069
>Category:       ports
>Synopsis:       [PATCH] mail/milter-greylist for staging
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 30 09:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dirk Meyer
>Release:        FreeBSD 9.2-RELEASE
>Organization:
privat
>Environment:

	FreeBSD ports

>Description:

	convert port to staging
	undo silent install
	add trailing / to install for robustness
	update LICENSE

>How-To-Repeat:
>Fix:

	apply patch:

Index: Makefile
===================================================================
--- Makefile	(revision 349338)
+++ Makefile	(working copy)
@@ -11,7 +11,7 @@
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Easy-to-use greylist milter for sendmail and postfix
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 CONFLICTS=	milter-greylist-devel-[1-9]*.*
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -19,7 +19,6 @@
 MAKE_JOBS_UNSAFE=	yes
 
 ##
-NO_STAGE=	yes
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
 #   WITH_SENDMAIL_BASE=yes
@@ -40,8 +39,8 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
-MAN5=		greylist.conf.5
-MAN8=		milter-greylist.8
+PLIST_FILES+=	man/man5/greylist.conf.5.gz \
+		man/man8/milter-greylist.8.gz
 .endif
 .if ${PORT_OPTIONS:MSPF}
 BUILD_DEPENDS+=	libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
@@ -86,41 +85,24 @@
 USE_RC_SUBR=	milter-greylist
 
 do-install:
-	@${MKDIR} ${PREFIX}/etc/mail
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 .if ${PORT_OPTIONS:MMANPAGES}
-	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
-	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${STAGEDIR}${PREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${STAGEDIR}${PREFIX}/man/man8/
 .endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/libexec
-	@${INSTALL_DATA} ${WRKSRC}/greylist.conf \
-			${PREFIX}/etc/mail/greylist.conf.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${STAGEDIR}${PREFIX}/libexec/
+	${INSTALL_DATA} ${WRKSRC}/greylist.conf \
+		${STAGEDIR}${PREFIX}/etc/mail/greylist.conf.sample
 
 post-install:
-	@${MKDIR} /var/milter-greylist
-	@${CHOWN} -R mailnull:mailnull /var/milter-greylist
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/greylist.conf ${STAGEDIR}${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 "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403300858.s2U8wS6p028867>