From owner-p4-projects@FreeBSD.ORG Sat Aug 4 22:28:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45D6316A41F; Sat, 4 Aug 2007 22:28:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AA1216A41A for ; Sat, 4 Aug 2007 22:28:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1904513C45B for ; Sat, 4 Aug 2007 22:28:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l74MSSSc082839 for ; Sat, 4 Aug 2007 22:28:28 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l74MSSQK082817 for perforce@freebsd.org; Sat, 4 Aug 2007 22:28:28 GMT (envelope-from gabor@freebsd.org) Date: Sat, 4 Aug 2007 22:28:28 GMT Message-Id: <200708042228.l74MSSQK082817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 124696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2007 22:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=124696 Change 124696 by gabor@gabor_server on 2007/08/04 22:27:55 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#12 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#7 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#8 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.mail.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#39 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#11 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#7 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#6 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#4 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#14 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#12 (text+ko) ==== @@ -10,6 +10,22 @@ All ports committers are allowed to commit to this file. +20070804: +AUTHOR: gabor@FreeBSD.org +The following functional changes were made to bsd.*.mk and to +Tools/scripts/security-check.awk: + + * The variable definitions that cover command line tools, e.g. MKDIR, were + extracted from bsd.port.mk into bsd.commands.mk, so that we can + reuse them within the infrastructure later. + + * The old DESTDIR implementation was removed both from the infrastructure, + and from the individual ports. Variables like TARGETDIR should not longer + be used. + + * A new DESTDIR implementation has been added, implemented in bsd.destdir.mk. + The new implementation puts no requirements on the individual ports. + 20070730: AUTHOR: python@FreeBSD.org @@ -1385,4 +1401,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.76 2007/07/30 09:40:55 alexbl Exp $ +$FreeBSD: ports/CHANGES,v 1.77 2007/08/04 11:37:23 gabor Exp $ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.67 2007/07/16 18:05:18 nobutaka Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.68 2007/08/04 11:37:23 gabor Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#8 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.142 2007/07/23 09:35:27 rafan Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.143 2007/08/04 11:37:23 gabor Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $ # ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.mail.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.2 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.mail.mk,v 1.3 2007/08/04 11:37:23 gabor Exp $ # # Please view me with 4 column tabs! ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#3 (text+ko) ==== @@ -2,7 +2,7 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.34 2006/10/08 09:38:38 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.35 2007/08/04 11:37:23 gabor Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#39 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.577 2007/07/27 21:40:11 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.579 2007/08/04 19:48:34 pav Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -604,11 +604,11 @@ # "man/mann/bar.n", set "MAN1=foo.1" and "MANN=bar.n". # The available sections chars are "123456789LN". # MAN_ -# - If your port does not install all man pages for all -# languages in MANLANG, language specific pages for +# - If your port does not install all man pages for all +# languages in MANLANG, language specific pages for # a language can be specified with this. For example, # if the port installs foo.1 in English, Japanese, and -# German, bar.1 in English only, and baz.3 in German +# German, bar.1 in English only, and baz.3 in German # only, set # MANLANG= "" de ja # MAN1= foo.1 @@ -1069,7 +1069,7 @@ # CHECKSUM_ALGORITHMS # - Different checksum algorithms to check for verifying the # integrity of the distfiles. The absence of the algorithm -# in distinfo doesn't make it fail. +# in distinfo doesn't make it fail. # Default: md5 sha256 # NO_CHECKSUM - Don't verify the checksum. Typically used when # when you noticed the distfile you just fetched has @@ -2051,6 +2051,9 @@ LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} . endif . endif +.endif + +.if defined(USE_XLIB) || defined(USE_XORG) # Add explicit X options to avoid problems with false positives in configure .if defined(GNU_CONFIGURE) CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#11 (text+ko) ==== @@ -2,7 +2,7 @@ # ex:ts=4 # # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.70 2007/05/25 00:09:37 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.71 2007/08/04 11:37:24 gabor Exp $ # # The include file contains the default targets # for building ports subdirectories. ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#7 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.98 2007/07/30 17:52:58 pav Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.99 2007/08/04 11:37:24 gabor Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#6 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.162 2007/07/15 09:39:05 stas Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.163 2007/08/04 11:37:24 gabor Exp $ # .if !defined(Ruby_Include) ==== //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#4 (text+ko) ==== ==== //depot/projects/soc2006/gabor_destdir/UPDATING#14 (text+ko) ==== @@ -6,6 +6,23 @@ time you update your ports collection, before attempting any port upgrades. +20070804: + AFFECTS: users of DESTDIR + AUTHOR: gabor@FreeBSD.org + +DESTDIR is a feature, that allows installation of ports into separate +environments, like jails. The previous implementation, introduced in the +August 2006, had some problems and was very expensive to maintain. It was +completely rolled back, and replaced with a brand new implementation utilizing +chroot. + +When DESTDIR is set, the system will chroot into the specified directory, mount +devfs, null mount the ports tree, then proceed with building and installing. +Your kernel must support nullfs (is available as loadable kernel module on +default installation). The target environment must be a full FreeBSD +installation. For advanced use, read comments at the beginning of +bsd.destdir.mk. + 20070730: AFFECTS: users of py-* AUTHOR: python@FreeBSD.org @@ -5489,4 +5506,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.531 2007/07/30 09:40:56 alexbl Exp $ +$FreeBSD: ports/UPDATING,v 1.532 2007/08/04 11:37:23 gabor Exp $