--- a/packages/templates/net/ChangeLog
+++ b/packages/templates/net/ChangeLog
@@ -1,95 +1,12 @@
-2001-11-27  Jonathan Larmour  <jlarmour@redhat.com>
-
-	 current.ect: Provide default for CYGBLD_ISO_STRING_BSD_FUNCS_HEADER
-
-2001-09-27  Jonathan Larmour  <jlarmour@redhat.com>
-
-	* current.ect: Don't include uitron. Not appropriate for base net
-	template.
-
-2001-09-26  Jesper Skov  <jskov@redhat.com>
-
-	* current.ect: DNS header moved.
-
-2001-09-24  Jesper Skov  <jskov@redhat.com>
-
-	* current.ect: Added DNS package.
-
-2001-08-21  Jonathan Larmour  <jlarmour@redhat.com>
-
-	* current.ect: Pre-infer CYGBLD_ISO_PMUTEXTYPES_HEADER.
+2003-02-14  Jonathan Larmour  <jifl@eCosCentric.com>
 
-2000-11-03  Jonathan Larmour  <jlarmour@redhat.com>
-
-	* current.ect: Update inferred values for current CDL
-
-2000-08-03  Gary Thomas  <gthomas@redhat.com>
-
-	* current.ect: Ethernet drivers have moved.
-
-2000-07-04  Jonathan Larmour  <jlarmour@redhat.co.uk>
-
-	* current.ect: Add memalloc package
-
-2000-06-07  Nick Garnett  <nickg@cygnus.co.uk>
-
-	* current.ect: Modified to work with ISOINFRA package, divided
-	LIBC and fileio package.
-
-2000-05-31  Jesper Skov  <jskov@redhat.com>
-
-	* current.ect: renamed watchdog package.
-
-2000-04-07  Hugo Tyson  <hmt@cygnus.co.uk>
+	* Move files from templates/new_net/ to templates/net/
 
-	* ecos.db: Re-organize device packages.  This is a massive change
-	involving deleting all the sources for serial and ethernet drivers
-	from where they used to live in
-	    packages/io/serial/current/src/ARCH/PLATFORM.[ch]
-	    packages/net/drivers/eth/PLATFORM/current/src/...
-	and reinstating them in
-	    packages/devs/serial/ARCH/PLATFORM/current/src/...
-	    packages/devs/eth/ARCH/PLATFORM/current/src/...
-
-	All these new packages are properly defined in ecos.db, and are
-	all of type "hardware" so that a "target" can grab them.
-	
-	This directory layout is descriptive of the devices we have right
-	now, arch and platform are separate levels just to make it easier
-	to navigate in the filesystem and similar to the HAL structure in
-	the filesystem.
-
-	It is *not* prescriptive of future work; for example, the mythical
-	common highly-portable 16550 serial driver which works on many
-	targets would be called "devs/serial/s16550/current", or a serial
-	device for a particular board (cogent springs to mind) that can
-	work with different CPUs fitted is "devs/serial/cogent/current".
+	* current.ect: Update inferred values.
 
-	Changelogs have been preserved and replicated over all the new
-	packages, so that no history is lost.
-
-	The contents of individual source files are unchanged; they build
-	in just the same emvironment except for a very few cases where the
-	config file name changed in this movement.
+2002-01-28  Gary Thomas  <gthomas@redhat.com>
 
-	Targets in ecos.db have been redefined to bring in all relevant
-	hardware packages including net and serial drivers (but the newly
-	included packages are only active if their desired parent is
-	available.)
-	
-	The names of CDL options (and their #defines of course) stay the
-	same for the serial drivers, for backward compatibility.
-
-	* templates/*/current.ect: these have had CYGPKG_IO_SERIAL added
-	rather than it being in (almost) all target definitions.
-	
-2000-04-05  Jesper Skov  <jskov@redhat.com>
-
-	* current.ect: Wallclock moved.
-
-2000-02-08  Gary Thomas  <gthomas@cygnus.co.uk>
-
-	* templates/net: New template with optional network package.
+	* current.ect: New configuration, using new FreeBSD based stack.
 
 //===========================================================================
 //####ECOSGPLCOPYRIGHTBEGIN####

--- a/packages/templates/net/current.ect
+++ b/packages/templates/net/current.ect
@@ -31,7 +31,7 @@ cdl_configuration template_net {
     package     CYGPKG_ERROR current ;
     package     CYGPKG_IO_FILEIO current ;
     package     CYGPKG_NET current ;
-    package     CYGPKG_NET_OPENBSD_STACK current ;
+    package     CYGPKG_NET_FREEBSD_STACK current ;
     package     CYGPKG_NS_DNS current ;
     package     CYGPKG_IO_ETH_DRIVERS current ;
 };
@@ -199,3 +199,31 @@ cdl_option CYGBLD_ISO_PMUTEXTYPES_HEADER
 cdl_option CYGBLD_ISO_STRING_BSD_FUNCS_HEADER {
     inferred_value 1 <cyg/libc/string/bsdstring.h>
 };
+
+cdl_option CYGBLD_ISO_POSIX_CLOCK_TYPES_HEADER {
+    inferred_value 1 <cyg/posix/time.h>
+};
+
+cdl_option CYGBLD_ISO_POSIX_CLOCKS_HEADER {
+    inferred_value 1 <cyg/posix/time.h>
+};
+
+cdl_option CYGBLD_ISO_PTHREAD_MUTEX_HEADER {
+    inferred_value 1 <cyg/posix/mutex.h>
+};
+
+cdl_option CYGBLD_ISO_NAME_MAX_HEADER {
+    inferred_value 1 <cyg/fileio/limits.h>
+};
+
+cdl_option CYGBLD_ISO_NETDB_PROTO_HEADER {
+    inferred_value 1 <net/netdb.h>
+};
+
+cdl_option CYGBLD_ISO_NETDB_SERV_HEADER {
+    inferred_value 1 <net/netdb.h>
+};
+
+cdl_component CYGPKG_KERNEL_THREADS_DESTRUCTORS {
+    inferred_value 1
+};