From owner-svn-ports-all@FreeBSD.ORG Sun Aug 25 12:19:30 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 071CF59D; Sun, 25 Aug 2013 12:19:30 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CED682AC9; Sun, 25 Aug 2013 12:19:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7PCJTKB063198; Sun, 25 Aug 2013 12:19:29 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7PCJTo2063197; Sun, 25 Aug 2013 12:19:29 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308251219.r7PCJTo2063197@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 25 Aug 2013 12:19:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325339 - head/mail/procmail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Aug 2013 12:19:30 -0000 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 # $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 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