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
Doug Barton
dougb at FreeBSD.org
Sat Aug 4 18:51:34 UTC 2007
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
-------------- next part --------------
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"
#
More information about the cvs-ports
mailing list