From owner-cvs-ports@FreeBSD.ORG Sat Aug 4 18:51:34 2007 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2F4916A41F for ; Sat, 4 Aug 2007 18:51:34 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with SMTP id 5F72113C457 for ; Sat, 4 Aug 2007 18:51:34 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 22010 invoked by uid 399); 4 Aug 2007 18:51:33 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTP; 4 Aug 2007 18:51:33 -0000 X-Originating-IP: 127.0.0.1 Message-ID: <46B4CAB3.4030205@FreeBSD.org> Date: Sat, 04 Aug 2007 11:51:31 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.6 (X11/20070803) MIME-Version: 1.0 To: Gabor Kovesdan References: <200708041137.l74BbP9F084093@repoman.freebsd.org> In-Reply-To: <200708041137.l74BbP9F084093@repoman.freebsd.org> X-Enigmail-Version: 0.95.1 OpenPGP: id=D5B2F0FB Content-Type: multipart/mixed; boundary="------------040404060701040003090004" Cc: cvs-ports@FreeBSD.org, portmgr@freebsd.org, freebsd-ports@freebsd.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports CHANGES UPDATING ports/Mk bsd.commands.mk bsd.destdir.mk bsd.emacs.mk bsd.gnome.mk bsd.mail.mk bsd.openssl.mk bsd.port.mk bsd.port.subdir.mk bsd.python.mk bsd.ruby.mk ports/Tools/scripts security-check.awk X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2007 18:51:34 -0000 This is a multi-part message in MIME format. --------------040404060701040003090004 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Gabor Kovesdan wrote: > gabor 2007-08-04 11:37:24 UTC > > FreeBSD ports repository > > Modified files: > . CHANGES UPDATING > Mk bsd.emacs.mk bsd.gnome.mk bsd.mail.mk > bsd.openssl.mk bsd.port.mk > bsd.port.subdir.mk bsd.python.mk > bsd.ruby.mk > Tools/scripts security-check.awk > Added files: > Mk bsd.commands.mk bsd.destdir.mk > Log: > - Extract command variable definitions from bsd.port.mk, they are now stored in > bsd.commands.mk and can be easily reused within the infrastructure. > - Revert old DESTDIR implementation. > - Add a new, fully chrooted DESTDIR implementation as bsd.destdir.mk. > > Sponsored by: Google Summer of Code 2007 > Approved by: portmgr (pav) > > Revision Changes Path > 1.77 +17 -1 ports/CHANGES > 1.1 +99 -0 ports/Mk/bsd.commands.mk (new) > 1.1 +222 -0 ports/Mk/bsd.destdir.mk (new) > 1.68 +3 -3 ports/Mk/bsd.emacs.mk > 1.143 +8 -8 ports/Mk/bsd.gnome.mk > 1.3 +3 -3 ports/Mk/bsd.mail.mk > 1.35 +7 -7 ports/Mk/bsd.openssl.mk > 1.578 +168 -450 ports/Mk/bsd.port.mk > 1.71 +35 -40 ports/Mk/bsd.port.subdir.mk > 1.99 +2 -2 ports/Mk/bsd.python.mk > 1.163 +3 -3 ports/Mk/bsd.ruby.mk > 1.3 +10 -40 ports/Tools/scripts/security-check.awk > 1.532 +18 -1 ports/UPDATING > > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/CHANGES.diff?&r1=1.76&r2=1.77&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.commands.mk > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.destdir.mk > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.emacs.mk.diff?&r1=1.67&r2=1.68&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.gnome.mk.diff?&r1=1.142&r2=1.143&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.mail.mk.diff?&r1=1.2&r2=1.3&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.openssl.mk.diff?&r1=1.34&r2=1.35&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk.diff?&r1=1.577&r2=1.578&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.subdir.mk.diff?&r1=1.70&r2=1.71&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.python.mk.diff?&r1=1.98&r2=1.99&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.ruby.mk.diff?&r1=1.162&r2=1.163&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Tools/scripts/security-check.awk.diff?&r1=1.2&r2=1.3&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/UPDATING.diff?&r1=1.531&r2=1.532&f=h This is nice work, but it seems to require the attached patch. Without it I get the following error messages: "/usr/ports/Mk/bsd.port.mk", line 1092: Could not find /Mk/bsd.commands.mk -p: not found "/usr/ports/Mk/bsd.port.mk", line 1139: warning: " -p" returned non-zero status -s: not found "/usr/ports/Mk/bsd.port.mk", line 1147: warning: " -s" returned non-zero status -r: not found -e: not found "/usr/ports/Mk/bsd.port.mk", line 1152: warning: " -r | -e 's/[-(].*//'" returned non-zero status /^#define __FreeBSD_version/ {print $3}: not found "/usr/ports/Mk/bsd.port.mk", line 1158: warning: " '/^#define __FreeBSD_version/ {print $3}' < /usr/include/sys/param.h" returned non-zero status /var/db/ports//options: not found "/usr/ports/Mk/bsd.port.mk", line 1217: warning: " "/var/db/ports//options"" returned non-zero status make: fatal errors encountered -- cannot continue hth, Doug -- This .signature sanitized for your protection --------------040404060701040003090004 Content-Type: text/plain; name="portsdir.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="portsdir.diff" Index: bsd.port.mk =================================================================== RCS file: /usr/local/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.578 diff -u -r1.578 bsd.port.mk --- bsd.port.mk 4 Aug 2007 11:37:23 -0000 1.578 +++ bsd.port.mk 4 Aug 2007 18:46:39 -0000 @@ -1089,6 +1089,8 @@ # Most port authors should not need to understand anything after this point. # +PORTSDIR?= /usr/ports + .include "${PORTSDIR}/Mk/bsd.commands.mk" # --------------040404060701040003090004--