Index: head/etc/mtree/BSD.include.dist
===================================================================
--- head/etc/mtree/BSD.include.dist	(revision 67522)
+++ head/etc/mtree/BSD.include.dist	(revision 67523)
@@ -1,92 +1,94 @@
 # $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     arpa
     ..
     cam
         scsi
         ..
     ..
     dev
         ppbus
         ..
         usb
         ..
     ..
     g++
         std
         ..
     ..
+    isc
+    ..
     isofs
         cd9660
         ..
     ..
     machine
     ..
     msdosfs
     ..
     net
     ..
     netatalk
     ..
     netatm
     ..
     netgraph
     ..
     netinet
     ..
     netinet6
     ..
     netipx
     ..
     netkey
     ..
     netnatm
     ..
     netncp
     ..
     netns
     ..
     nfs
     ..
     ntfs
     ..
     nwfs
     ..
     objc
     ..
     openssl
     ..
     pccard
     ..
     posix4
     ..
     protocols
     ..
     readline
     ..
     rpc
     ..
     rpcsvc
     ..
     security
     ..
     ss
     ..
     sys
     ..
     ufs
         ffs
         ..
         mfs
         ..
         ufs
         ..
     ..
     vm
     ..
 ..
Index: head/lib/Makefile
===================================================================
--- head/lib/Makefile	(revision 67522)
+++ head/lib/Makefile	(revision 67523)
@@ -1,69 +1,69 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
 #
 # csu must be built before all shared libaries for ELF.
 # libcom_err must be built before libkrb, libpam and libss.
 # libcrypt must be built before libkrb, libpam and libskey.
 # msun must be built before libg++ and libstdc++.
 # libmd must be built before libatm, libopie, libradius, libskey, and
 # libtacplus.
 # libncurses must be built before libdialog, libedit and libreadline.
 # libopie must be built before libpam.
 # libradius must be built before libpam.
 # libskey must be built before libpam.
 # libtacplus must be built before libpam.
 # libutil must be built before libpam.
 #
 # Otherwise, the SUBDIR list should be in alphabetical order.
 
 SUBDIR=	${_csu} libcom_err ${_libcrypt} msun libmd \
 	libncurses libradius libskey libtacplus libutil \
 	${_compat} libalias libatm ${_libbind} libc ${_libc_r} libcalendar \
 	libcam libcompat libdevstat libdisk libedit libfetch libform \
-	libftpio libgnumalloc ${_libio} libipsec libipx libkvm libmenu \
+	libftpio libgnumalloc ${_libio} libipsec libipx libisc libkvm libmenu \
 	${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
 	libposix1e libresolv librpcsvc libsmdb libsmutil libss \
 	libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
 _csu=csu/${MACHINE_ARCH}-${OBJFORMAT}
 .elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
 _csu=csu/${MACHINE_ARCH}
 .endif
 
 .if !defined(NOLIBC_R)
 _libc_r=	libc_r
 .endif
 
 .if !defined(NO_BIND)
 _libbind=	libbind
 .endif
 
 _libcrypt=	libcrypt
 .if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) && !defined(NO_DESCRYPT)
 # Build both libraries. They have different names, so no harm,
 # and this avoids having stale libscrypt.*
 _libcrypt+=	../secure/lib/libcrypt
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
 _compat=	compat
 _libncp=	libncp
 _libvgl=	libvgl
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
 _libio=		libio
 .endif
 
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
     defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
 _libtelnet=	libtelnet
 .endif
 
 .include <bsd.subdir.mk>
Index: head/lib/libisc/Makefile
===================================================================
--- head/lib/libisc/Makefile	(nonexistent)
+++ head/lib/libisc/Makefile	(revision 67523)
@@ -0,0 +1,135 @@
+# $FreeBSD$
+
+BIND_DIR=	${.CURDIR}/../../contrib/bind
+
+LIB=		isc
+SHLIB_MAJOR=	1
+SHLIB_MINOR=	0
+
+.PATH:		${BIND_DIR}/lib/isc
+SRCS=		assertions.c ev_connects.c ev_files.c ev_streams.c \
+		ev_timers.c ev_waits.c eventlib.c heap.c tree.c \
+		logging.c memcluster.c bitncmp.c
+
+# contrib/bind/include/* must not override any real system includes
+CFLAGS+=	-I${BIND_DIR}/port/freebsd/include -I${BIND_DIR}/include
+CFLAGS+=	-Wall -Wmissing-prototypes
+
+INCS=		${BIND_DIR}/include/isc/assertions.h \
+		${BIND_DIR}/include/isc/eventlib.h \
+		${BIND_DIR}/include/isc/heap.h \
+		${BIND_DIR}/include/isc/logging.h \
+		${BIND_DIR}/include/isc/memcluster.h \
+		${BIND_DIR}/include/isc/misc.h \
+		${BIND_DIR}/include/isc/tree.h
+INCDIR=		/usr/include/isc
+
+MAN3=		assertions.3 bitncmp.3 eventlib.3 heap.3 \
+		logging.3 memcluster.3 tree.3
+CLEANFILES+=	${MAN3}
+
+MLINKS+=	assertions.3 ENSURE.3 \
+		assertions.3 ENSURE_ERR.3 \
+		assertions.3 INSIST.3 \
+		assertions.3 INSIST_ERR.3 \
+		assertions.3 INVARIANT.3 \
+		assertions.3 INVARIANT_ERR.3 \
+		assertions.3 REQUIRE.3 \
+		assertions.3 REQUIRE_ERR.3 \
+		assertions.3 assertion_type_to_text.3 \
+		assertions.3 set_assertion_failure_callback.3 \
+		eventlib.3 evAddTime.3 \
+		eventlib.3 evCancelConn.3 \
+		eventlib.3 evCancelRW.3 \
+		eventlib.3 evClearIdleTimer.3 \
+		eventlib.3 evClearTimer.3 \
+		eventlib.3 evCmpTime.3 \
+		eventlib.3 evConnFunc.3 \
+		eventlib.3 evConnect.3 \
+		eventlib.3 evConsIovec.3 \
+		eventlib.3 evConsTime.3 \
+		eventlib.3 evCreate.3 \
+		eventlib.3 evDefer.3 \
+		eventlib.3 evDeselectFD.3 \
+		eventlib.3 evDestroy.3 \
+		eventlib.3 evDispatch.3 \
+		eventlib.3 evDo.3 \
+		eventlib.3 evDrop.3 \
+		eventlib.3 evFileFunc.3 \
+		eventlib.3 evGetNext.3 \
+		eventlib.3 evHold.3 \
+		eventlib.3 evInitID.3 \
+		eventlib.3 evLastEventTime.3 \
+		eventlib.3 evListen.3 \
+		eventlib.3 evMainLoop.3 \
+		eventlib.3 evNowTime.3 \
+		eventlib.3 evPrintf.3 \
+		eventlib.3 evRead.3 \
+		eventlib.3 evResetTimer.3 \
+		eventlib.3 evSelectFD.3 \
+		eventlib.3 evSetDebug.3 \
+		eventlib.3 evSetIdleTimer.3 \
+		eventlib.3 evSetTimer.3 \
+		eventlib.3 evStreamFunc.3 \
+		eventlib.3 evSubTime.3 \
+		eventlib.3 evTestID.3 \
+		eventlib.3 evTimeRW.3 \
+		eventlib.3 evTimeSpec.3 \
+		eventlib.3 evTimeVal.3 \
+		eventlib.3 evTimerFunc.3 \
+		eventlib.3 evTouchIdleTimer.3 \
+		eventlib.3 evTryAccept.3 \
+		eventlib.3 evUnhold.3 \
+		eventlib.3 evUntimeRW.3 \
+		eventlib.3 evUnwait.3 \
+		eventlib.3 evWaitFor.3 \
+		eventlib.3 evWaitFunc.3 \
+		eventlib.3 evWrite.3 \
+		heap.3 heap_decreased.3 \
+		heap.3 heap_delete.3 \
+		heap.3 heap_element.3 \
+		heap.3 heap_for_each.3 \
+		heap.3 heap_free.3 \
+		heap.3 heap_increased.3 \
+		heap.3 heap_insert.3 \
+		heap.3 heap_new.3 \
+		logging.3 log_add_channel.3 \
+		logging.3 log_category_is_active.3 \
+		logging.3 log_close_stream.3 \
+		logging.3 log_dec_references.3 \
+		logging.3 log_free_channel.3 \
+		logging.3 log_free_context.3 \
+		logging.3 log_get_filename.3 \
+		logging.3 log_get_stream.3 \
+		logging.3 log_inc_references.3 \
+		logging.3 log_new_context.3 \
+		logging.3 log_new_file_channel.3 \
+		logging.3 log_new_null_channel.3 \
+		logging.3 log_new_syslog_channel.3 \
+		logging.3 log_open_stream.3 \
+		logging.3 log_option.3 \
+		logging.3 log_remove_channel.3 \
+		logging.3 log_set_file_owner.3 \
+		logging.3 log_vwrite.3 \
+		logging.3 log_write.3 \
+		memcluster.3 memget.3 \
+		memcluster.3 memput.3 \
+		memcluster.3 memstats.3 \
+		tree.3 tree_add.3 \
+		tree.3 tree_delete.3 \
+		tree.3 tree_init.3 \
+		tree.3 tree_mung.3 \
+		tree.3 tree_srch.3 \
+		tree.3 tree_trav.3
+
+.include <bsd.lib.mk>
+
+# This has to come after the .include <bsd.lib.mk>. Not sure why.
+
+.SUFFIXES:	.mdoc .3
+.mdoc.3:
+		sed -e 's/@INDOT@//g' \
+		    -e 's/@SYSCALL_EXT@/2/g' \
+		    -e 's/@SYS_OPS_EXT@/8/g' \
+		    < ${.ALLSRC} > ${.TARGET}
+

Property changes on: head/lib/libisc/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/share/mk/bsd.libnames.mk
===================================================================
--- head/share/mk/bsd.libnames.mk	(revision 67522)
+++ head/share/mk/bsd.libnames.mk	(revision 67523)
@@ -1,95 +1,96 @@
 # $FreeBSD$
 #
 # The include file <bsd.libnames.mk> define library names. 
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this 
 # file where necessary.
 
 
 LIBCRT0?=	${DESTDIR}${LIBDIR}/crt0.o
 LIBKZHEAD?=	${DESTDIR}${LIBDIR}/kzhead.o
 LIBKZTAIL?=	${DESTDIR}${LIBDIR}/kztail.o
 
 LIBALIAS?=	${DESTDIR}${LIBDIR}/libalias.a
 LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
 LIBC?=		${DESTDIR}${LIBDIR}/libc.a
 LIBC_PIC=	${DESTDIR}${LIBDIR}/libc_pic.a
 LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a
 LIBCAM?=	${DESTDIR}${LIBDIR}/libcam.a
 LIBCIPHER?=	${DESTDIR}${LIBDIR}/libcipher.a	# XXX in secure dist, not base
 LIBCOM_ERR=	${DESTDIR}${LIBDIR}/libcom_err.a
 LIBCOMPAT?=	${DESTDIR}${LIBDIR}/libcompat.a
 LIBCRYPT?=	${DESTDIR}${LIBDIR}/libcrypt.a
 LIBCRYPTO?=	${DESTDIR}${LIBDIR}/libcrypto.a	# XXX in secure dist, not base
 LIBCURSES?=	${DESTDIR}${LIBDIR}/libcurses.a
 LIBDES?=	${DESTDIR}${LIBDIR}/libdes.a	# XXX in secure dist, not base
 LIBDEVSTAT?=	${DESTDIR}${LIBDIR}/libdevstat.a
 LIBDIALOG?=	${DESTDIR}${LIBDIR}/libdialog.a
 LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
 LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
 LIBF2C?=	${DESTDIR}${LIBDIR}/libf2c.a
 LIBFL?=		"don't use LIBFL, use LIBL"
 LIBFORMS?=	${DESTDIR}${LIBDIR}/libforms.a
 LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
 LIBGPLUSPLUS?=	${DESTDIR}${LIBDIR}/libg++.a
 LIBGCC?=	${DESTDIR}${LIBDIR}/libgcc.a
 LIBGCC_PIC?=	${DESTDIR}${LIBDIR}/libgcc_pic.a
 LIBGMP?=	${DESTDIR}${LIBDIR}/libgmp.a
 LIBGNUREGEX?=	${DESTDIR}${LIBDIR}/libgnuregex.a
 LIBHISTORY?=	${DESTDIR}${LIBDIR}/libhistory.a
 LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
 LIBIPX?=	${DESTDIR}${LIBDIR}/libipx.a
+LIBISC?=	${DESTDIR}${LIBDIR}/libisc.a
 LIBKDB?=	${DESTDIR}${LIBDIR}/libkdb.a	# XXX in secure dist, not base
 LIBKRB?=	${DESTDIR}${LIBDIR}/libkrb.a	# XXX in secure dist, not base
 LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
 LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 LIBLN?=		"don't use LIBLN, use LIBL"
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
 LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a
 LIBMP?=		${DESTDIR}${LIBDIR}/libmp.a
 LIBMYTINFO?=	"don't use LIBMYTINFO, use LIBNCURSES"
 LIBNCP?=	${DESTDIR}${LIBDIR}/libncp.a
 LIBNCURSES?=	${DESTDIR}${LIBDIR}/libncurses.a
 LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnetgraph.a
 LIBOBJC?=	${DESTDIR}${LIBDIR}/libobjc.a
 LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
 
 # The static PAM library doesn't know its secondary dependencies,
 # so we have to specify them explictly.
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
 MINUSLPAM?=	-lpam
 .if defined(NOSHARED) && ${NOSHARED} != "no" && ${NOSHARED} != "NO"
 .ifdef MAKE_KERBEROS4
 LIBPAM+=	${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
 MINUSLPAM+=	-lkrb -lcrypto -lcom_err
 .endif
 LIBPAM+=	${LIBRADIUS} ${LIBTACPLUS} ${LIBSKEY} ${LIBCRYPT} ${LIBMD} \
 		${LIBUTIL} ${LIBOPIE}
 MINUSLPAM+=	-lradius -ltacplus -lskey -lcrypt -lmd -lutil -lopie
 .endif
 
 LIBPC?=		${DESTDIR}${LIBDIR}/libpc.a	# XXX doesn't exist
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
 LIBPERL?=	${DESTDIR}${LIBDIR}/libperl.a
 LIBPLOT?=	${DESTDIR}${LIBDIR}/libplot.a	# XXX doesn't exist
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
 LIBREADLINE?=	${DESTDIR}${LIBDIR}/libreadline.a
 LIBRESOLV?=	${DESTDIR}${LIBDIR}/libresolv.a	# XXX doesn't exist
 LIBRPCSVC?=	${DESTDIR}${LIBDIR}/librpcsvc.a
 LIBSCRYPT?=	"don't use LIBSCRYPT, use LIBCRYPT"
 LIBDESCRYPT?=	"don't use LIBDESCRYPT, use LIBCRYPT"
 LIBSCSI?=	${DESTDIR}${LIBDIR}/libscsi.a
 LIBSKEY?=	${DESTDIR}${LIBDIR}/libskey.a
 LIBSS?=		${DESTDIR}${LIBDIR}/libss.a
 LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a	# XXX in secure dist, not base
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
 LIBTACPLUS?=	${DESTDIR}${LIBDIR}/libtacplus.a
 LIBTCL?=	${DESTDIR}${LIBDIR}/libtcl.a
 LIBTELNET?=	${DESTDIR}${LIBDIR}/libtelnet.a
 LIBTERMCAP?=	${DESTDIR}${LIBDIR}/libtermcap.a
 LIBTERMLIB?=	"don't use LIBTERMLIB, use LIBTERMCAP"
 LIBUTIL?=	${DESTDIR}${LIBDIR}/libutil.a
 LIBWRAP?=	${DESTDIR}${LIBDIR}/libwrap.a
 LIBXPG4?=	${DESTDIR}${LIBDIR}/libxpg4.a
 LIBY?=		${DESTDIR}${LIBDIR}/liby.a
 LIBZ?=		${DESTDIR}${LIBDIR}/libz.a