MASSIVE merge from V3-RELEASE-BRANCH into HEAD. HEAD and V3-RELEASE are

now synced as of tag V3-0-3-BETA-1.

1 files changed, 20 insertions, 32 deletions

diff --git a/Makefile.conf b/Makefile.conf
index 4501b178..4d57cb35 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -1,21 +1,25 @@
 # Makefile.conf
 #
-# Copyright (c) 1996-2000 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it.   If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
+# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 1995-2003 by Internet Software Consortium
 #
-#             http://www.isc.org/isc-license-1.0.html. 
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
-# This file is part of the ISC DHCP distribution.   The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
+#   Internet Systems Consortium, Inc.
+#   950 Charter Street
+#   Redwood City, CA 94063
+#   <info@isc.org>
+#   http://www.isc.org/
 
 ## Defaults...
 SCRIPT = none
@@ -200,6 +204,7 @@ MINORVERSION=MinorVersion
 ## FreeBSD
 ##--freebsd--
 #CF = cf/freebsd.h
+#COPTS = -O -Wall -Wno-unused -Werror $(CC_OPTIONS)
 #SCRIPT=freebsd
 ##--freebsd--
 
@@ -216,7 +221,7 @@ MINORVERSION=MinorVersion
 #CF = cf/rhapsody.h
 #COPTS  = -Ddarwin -Wall -Wno-unused -Wno-implicit -Wno-comment \
 #	  -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
-##SCRIPT=rhapsody
+#SCRIPT=freebsd
 ##--darwin--
 
 ## NetBSD
@@ -225,28 +230,11 @@ MINORVERSION=MinorVersion
 #COPTS  = -Wall -Wstrict-prototypes -Wno-unused -Wno-comment \
 #	  -Wno-uninitialized -Werror \
 #	  -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
-#	  -Wcast-align -Wwrite-strings -Wconversion -Wmissing-prototypes \
-#	  -Wmissing-declarations -Wnested-externs \
-#	  -pipe $(BINDDEF) $(CC_OPTIONS)
-#SCRIPT=netbsd
-##MKDEP=makedepend
-##--netbsd--
-
-## NetBSD nocast
-## Some versions of the arm32 gcc have a problem in cast conversions.
-## The Alpha definitely has a problem - if you pass '6' where a size_t
-## is expected, you get a warning.   So on these architectures, we do
-## not ask for that sort of warning.
-##--netbsd-nocast--
-#CF = cf/netbsd.h
-#COPTS  = -Wall -Wstrict-prototypes -Wno-unused -Wno-comment \
-#	  -Wno-uninitialized -Werror \
-#	  -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
 #	  -Wwrite-strings -Wmissing-prototypes \
 #	  -Wmissing-declarations -Wnested-externs \
 #	  -pipe $(BINDDEF) $(CC_OPTIONS)
 #SCRIPT=netbsd
-##--netbsd-nocast--
+##--netbsd--
 
 ## Ultrix
 ##--ultrix--