Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Aug 2013 12:19:29 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r325339 - head/mail/procmail
Message-ID:  <201308251219.r7PCJTo2063197@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sun Aug 25 12:19:29 2013
New Revision: 325339
URL: http://svnweb.freebsd.org/changeset/ports/325339

Log:
  - Try to unbreak parallel builds (-jX) by using better make(1) syntax
  - Fix an apparent typo: OPTIONS_SET should be OPTIONS_DEFINE
  - Remove bogus, superfluous trailing slashes after directory names
  - Make INSTALL_DATA commands atomic and $cwd-agnostic while here
  
  Approved by:	miwi, bapt (portmgr, implicit)

Modified:
  head/mail/procmail/Makefile

Modified: head/mail/procmail/Makefile
==============================================================================
--- head/mail/procmail/Makefile	Sun Aug 25 11:50:03 2013	(r325338)
+++ head/mail/procmail/Makefile	Sun Aug 25 12:19:29 2013	(r325339)
@@ -1,4 +1,4 @@
-# Created by: adam
+# Created by: Adam David <adam@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	procmail
@@ -17,10 +17,7 @@ MASTER_SITES=	ftp://ftp.ucsb.edu/pub/mir
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Local mail delivery agent
 
-OPTIONS_SET=	DOCS EXAMPLES
-
 INSTALL_TARGET=	install-suid install.man
-MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		formail.1 lockfile.1 procmail.1
 MAN5=		procmailex.5 procmailrc.5 procmailsc.5
@@ -29,19 +26,24 @@ PORTDOCS=	FAQ FEATURES HISTORY KNOWN_BUG
 PORTEXAMPLES=	1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
 		advanced dirname forward local_procmail_lmtp.m4 mailstat
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h
+# Allow parallel builds (-jX) to work
+	@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} \
+		-E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|'
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	cd ${WRKSRC}/examples/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>



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