From: Lionel Sambuc <lionel@minix3.org>
Date: Sat, 3 Nov 2012 21:39:34 +0000 (+0100)
Subject: Update README and file
X-Git-Tag: v3.2.1~215
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch04.html?a=commitdiff_plain;h=62273781471bb7ef7a3fb25817569f1d92b680d3;p=minix.git

Update README and file
---

diff --git a/external/README b/external/README
new file mode 100644
index 000000000..23a069fc2
--- /dev/null
+++ b/external/README
@@ -0,0 +1,117 @@
+$NetBSD: README,v 1.15 2012/06/14 04:14:36 riz Exp $
+
+Organization of Sources:
+
+This directory hierarchy is using an organization that separates
+source for programs that we have obtained from external third
+parties (where NetBSD is not the primary maintainer) from the
+system source.
+
+The hierarchy is grouped by license, and then package per license,
+and is organized as follows:
+
+	external/
+
+	    Makefile
+			Descend into the license sub-directories.
+
+	    <license>/
+			Per-license sub-directories.
+
+		Makefile
+			Descend into the package sub-directories.
+
+		<package>/
+			Per-package sub-directories.
+
+		    Makefile
+			Build the package.
+			
+		    dist/
+			The third-party source for a given package.
+
+		    bin/
+		    lib/
+		    sbin/
+			BSD makefiles "reach over" from these into
+			"../dist/".
+
+This arrangement allows for packages to be easily disabled or
+excised as necessary, either on a per-license or per-package basis.
+
+The licenses currently used are:
+
+	apache2		Apache 2.0 license.
+			http://www.opensource.org/licenses/apache2.0.php
+
+	atheros		Atheros License.
+
+	bsd		BSD (or equivalent) licensed software, possibly with
+			the "advertising clause".
+			http://www.opensource.org/licenses/bsd-license.php
+
+	cddl		Common Development and Distribution License (the sun
+			license which is based on the Mozilla Public License
+			version 1.1).
+			http://www.opensource.org/licenses/cddl1.php
+
+	gpl2		GNU Public License, version 2 (or earlier).
+			http://www.opensource.org/licenses/gpl-2.0.php
+
+	gpl3		GNU Public License, version 3.
+			http://www.opensource.org/licenses/gpl-3.0.html
+
+	historical	Lucent's old license:
+			http://www.opensource.org/licenses/historical.php
+			
+	ibm-public	IBM's public license:
+			http://www.opensource.org/licenses/ibmpl.php
+
+	intel-fw-eula	Intel firmware license with redistribution
+			restricted to OEM.
+
+	intel-fw-public	Intel firmware license permitting redistribution with
+			terms similar to BSD licensed software.
+
+	intel-public	Intel license permitting redistribution with
+			terms similar to BSD licensed software.
+
+	mit		MIT (X11) style license.
+			http://www.opensource.org/licenses/mit-license.php
+
+	public-domain	Non-license for code that has been explicitly put
+			into the Public Domain.
+
+	realtek		RealTek license.
+
+	zlib		Zlib (BSD-like) license.
+			http://www.zlib.net/zlib_license.html
+
+If a package has components covered by different licenses
+(for example, GPL2 and the LGPL), use the <license> subdirectory
+for the more restrictive license.
+
+If a package allows the choice of a license to use, we'll
+generally use the less restrictive license.
+
+If in doubt about where a package should be located, please
+contact <core@NetBSD.org> for advice.
+
+
+Migration Strategy:
+
+
+Eventually src/dist (and associated framework in other base source
+directories) and src/gnu will be migrated to this hierarchy.
+
+
+Maintenance Strategy:
+
+The sources under src/external/<license>/<package>/dist/ are
+generally a combination of a published distribution plus changes
+that we submit to the maintainers and that are not yet published
+by them.
+
+Make sure all changes made to the external sources are submitted
+to the appropriate maintainer, but only after coordinating with
+the NetBSD maintainers.
diff --git a/external/bsd/file/Makefile.inc b/external/bsd/file/Makefile.inc
index 53d39c35b..65fd87f64 100644
--- a/external/bsd/file/Makefile.inc
+++ b/external/bsd/file/Makefile.inc
@@ -4,11 +4,7 @@ DIST=${.CURDIR}/../dist
 WARNS=4
 
 BINDIR?= /usr/bin
-.if defined(__MINIX)
-USE_FORT?= no	# data-driven bugs?
-.else
 USE_FORT?= yes	# data-driven bugs?
-.endif
 
 TOOL_MKMAGIC?=	${.OBJDIR}/file
 
diff --git a/external/bsd/file/lib/Makefile b/external/bsd/file/lib/Makefile
index d1b3416bb..7bb93e04f 100644
--- a/external/bsd/file/lib/Makefile
+++ b/external/bsd/file/lib/Makefile
@@ -1,11 +1,7 @@
 #	$NetBSD: Makefile,v 1.2 2011/08/14 09:06:12 christos Exp $
 #
 
-.if defined(__MINIX)
-USE_FORT?= no	# data driven bugs?
-.else
 USE_FORT?= yes	# data driven bugs?
-.endif
 
 .include <bsd.own.mk>