Bug 188069 - [PATCH] mail/milter-greylist for staging
Summary: [PATCH] mail/milter-greylist for staging
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dirk Meyer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-30 10:00 UTC by dirk.meyer
Modified: 2014-04-09 13:40 UTC (History)
0 users

See Also:


Attachments
file.diff (3.16 KB, patch)
2014-03-30 10:00 UTC, dirk.meyer
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description dirk.meyer 2014-03-30 10:00:00 UTC
	convert port to staging
	undo silent install
	add trailing / to install for robustness
	update LICENSE

Fix: apply patch:
Comment 1 Edwin Groothuis freebsd_committer 2014-03-30 10:00:03 UTC
Maintainer of mail/milter-greylist,

Please note that PR ports/188069 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/188069

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer 2014-03-30 10:00:04 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Dirk Meyer freebsd_committer 2014-03-30 10:10:28 UTC
Responsible Changed
From-To: freebsd-ports-bugs->dinoex

I will take care of followups
Comment 4 m.tsatsenko 2014-04-09 11:23:55 UTC
Approved.
Thanks!

-- 
Mikhail
Comment 5 dfilter service freebsd_committer 2014-04-09 13:29:38 UTC
Author: dinoex
Date: Wed Apr  9 12:29:22 2014
New Revision: 350686
URL: http://svnweb.freebsd.org/changeset/ports/350686
QAT: https://qat.redports.org/buildarchive/r350686/

Log:
  - use STAGEDIR
  - update LICENSE
  - undo silent install
  - robust INSTALL
  PR:		188069

Modified:
  head/mail/milter-greylist/Makefile

Modified: head/mail/milter-greylist/Makefile
==============================================================================
--- head/mail/milter-greylist/Makefile	Wed Apr  9 12:29:08 2014	(r350685)
+++ head/mail/milter-greylist/Makefile	Wed Apr  9 12:29:22 2014	(r350686)
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 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 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 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 @@ POSTFIX_DESC=		Use Postfix instead of Se
 .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 @@ SUB_FILES+=	pkg-message
 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"
 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Dirk Meyer freebsd_committer 2014-04-09 13:39:52 UTC
State Changed
From-To: feedback->closed

committed, thanks.