--- old/build/git/build.sh	Fri Jun  6 21:51:52 2014
+++ new/build/git/build.sh	Fri Jun  6 21:51:52 2014
@@ -29,7 +29,7 @@
 . ../../lib/functions.sh
 
 PROG=git
-VER=1.8.4
+VER=2.0.0
 PKG=developer/versioning/git
 SUMMARY="$PROG - a free and open source, distributed version control system"
 DESC="$SUMMARY"
--- /dev/null	Fri Jun  6 21:51:52 2014
+++ new/build/isc-dhcp/build.sh	Fri Jun  6 21:51:52 2014
@@ -0,0 +1,59 @@
+#!/usr/bin/bash
+#
+# CDDL HEADER START
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2014 OmniTI Computer Consulting, Inc.  All rights reserved.
+#
+# Load support functions
+. ../../lib/functions.sh
+
+PROG=dhcp
+VER=4.3.0
+VERHUMAN=$VER
+PKG=network/service/isc-dhcp
+SUMMARY="ISC DHCP"
+DESC="$SUMMARY $VER"
+
+DEPENDS_IPS="system/library"
+
+BUILDARCH=32
+
+CONFIGURE_OPTS="--enable-use-sockets --enable-ipv4-pktinfo --prefix=$PREFIX --bindir=$PREFIX/bin --sbindir=$PREFIX/sbin"
+
+pre_package() {
+    # Make directories and install extra files before package construction.
+    logcmd mkdir -p $DESTDIR/usr/share/isc-dhcp/examples || \ logerr
+	"mkdir of $DESTDIR/usr/share/isc-dhcp/examples failed"
+    logcmd mkdir -p $DESTDIR/lib/svc/manifest/network || \ logerr
+	"mkdir of $DESTDIR/lib/svc/manifest/network failed"
+    logcmd mkdir -p $DESTDIR/var/db || logerr "mkdir of $DESTDIR/var/db failed"
+    logcmd touch $DESTDIR/var/db/dhcpd.leases
+    logcmd touch $DESTDIR/var/db/dhcpd6.leases
+    logcmd cp $SRCDIR/files/isc-dhcp.xml $DESTDIR/lib/svc/manifest/network || \
+	logerr "Cannot copy in manifest."
+}
+
+init
+download_source $PROG $PROG $VER
+patch_source
+prep_build
+build
+# Make directories in the proto area prior to the package being built.
+pre_package
+make_package
+clean_up
+
+# Vim hints
+# vim:ts=4:sw=4:et:
--- /dev/null	Fri Jun  6 21:51:52 2014
+++ new/build/isc-dhcp/files/isc-dhcp.xml	Fri Jun  6 21:51:52 2014
@@ -0,0 +1,198 @@
+<?xml version='1.0' ?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<!--
+
+	This file and its contents are supplied under the terms of the
+	Common Development and Distribution License ("CDDL"), version 1.0.
+	You may only use this file in accordance with the terms of version
+	1.0 of the CDDL.
+
+	A full copy of the text of the CDDL should have accompanied this
+	source.  A copy of the CDDL is also available via the Internet at
+	http://www.illumos.org/license/CDDL.
+
+	Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
+
+-->
+
+<!--	XXX KEBE SAYS we need more properties, and we may need a method
+	script to start these running.
+-->
+
+<service_bundle type='manifest' name='isc-dhcp'>
+
+<service name='network/service/dhcp' type='service' version='1'>
+	<dependency name='loopback'  grouping='require_all'
+	restart_on='none' type='service'>
+		<service_fmri value='svc:/network/loopback:default' />
+	</dependency>
+
+	<dependency name='physical'  grouping='require_all'
+	restart_on='none' type='service'>
+		<service_fmri value='svc:/network/physical:default' />
+	</dependency>
+
+	<dependency name='localfs'  grouping='require_all'
+	restart_on='none' type='service'>
+		<service_fmri value='svc:/system/filesystem/local:default' />
+	</dependency>
+
+	<instance name='ipv4' enabled='false'>
+	<exec_method name='start' type='method'
+	exec='/usr/sbin/dhcpd'
+	timeout_seconds='60' />
+	
+	<exec_method name='stop' type='method'
+	exec=':kill'
+	timeout_seconds='60' />
+	
+	<exec_method name='refresh' type='method'
+	exec=':kill -HUP'
+	timeout_seconds='60' />
+
+	<property_group name='general' type='framework'>
+		<propval name='action_authorization' type='astring'
+		value='omnios.smf.manage.dhcp' />
+	</property_group>
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>ISC DHCP server</loctext>
+		</common_name>
+
+		<documentation>
+			<manpage title='dhcpd' section='8' />
+			<doc_link name='isc.org' uri='http://isc.org' />
+		</documentation>
+	</template>
+	</instance>
+
+	<instance name='ipv6' enabled='false'>
+	<exec_method name='start' type='method'
+	exec='/usr/sbin/dhcpd -6'
+	timeout_seconds='60' />
+	
+	<exec_method name='stop' type='method'
+	exec=':kill'
+	timeout_seconds='60' />
+	
+	<exec_method name='refresh' type='method'
+	exec=':kill -HUP'
+	timeout_seconds='60' />
+
+	<property_group name='general' type='framework'>
+		<propval name='action_authorization' type='astring'
+		value='omnios.smf.manage.dhcp' />
+	</property_group>
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>ISC DHCPv6 server</loctext>
+		</common_name>
+
+		<documentation>
+			<manpage title='dhcpd' section='8' />
+			<doc_link name='isc.org' uri='http://isc.org' />
+		</documentation>
+	</template>
+	</instance>
+
+	<stability value='Evolving' />
+
+</service>
+
+<service name='network/service/dhcrelay' type='service' version='1'>
+	<dependency name='loopback'  grouping='require_all'
+	restart_on='none' type='service'>
+		<service_fmri value='svc:/network/loopback:default' />
+	</dependency>
+
+	<dependency name='physical'  grouping='require_all'
+	restart_on='none' type='service'>
+		<service_fmri value='svc:/network/physical:default' />
+	</dependency>
+
+	<dependency name='localfs'  grouping='require_all'
+	restart_on='none' type='service'>
+		<service_fmri value='svc:/system/filesystem/local:default' />
+	</dependency>
+
+	<instance name='ipv4' enabled='false'>
+	<exec_method name='start' type='method'
+	exec='/usr/sbin/dhcrelay %{server}'
+	timeout_seconds='60' />
+	
+	<exec_method name='stop' type='method'
+	exec=':kill'
+	timeout_seconds='60' />
+	
+	<exec_method name='refresh' type='method'
+	exec=':kill -HUP'
+	timeout_seconds='60' />
+
+	<property_group name='general' type='framework'>
+		<propval name='action_authorization' type='astring'
+		value='omnios.smf.manage.dhcp' />
+	</property_group>
+
+        <property_group name='application' type='application'>
+	  <!-- A space-separated server list is acceptable here for now. -->
+          <propval name='server' type='astring' value='' />
+        </property_group>
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>ISC DHCP relay</loctext>
+		</common_name>
+
+		<documentation>
+			<manpage title='dhcrelay' section='8' />
+			<doc_link name='isc.org' uri='http://isc.org' />
+		</documentation>
+	</template>
+	</instance>
+
+	<instance name='ipv6' enabled='false'>
+	<exec_method name='start' type='method'
+	exec='/usr/sbin/dhcrelay -6 -l %{lower} -u %{upper}'
+	timeout_seconds='60' />
+	
+	<exec_method name='stop' type='method'
+	exec=':kill'
+	timeout_seconds='60' />
+	
+	<exec_method name='refresh' type='method'
+	exec=':kill -HUP'
+	timeout_seconds='60' />
+
+	<property_group name='general' type='framework'>
+		<propval name='action_authorization' type='astring'
+		value='omnios.smf.manage.dhcp' />
+	</property_group>
+
+        <property_group name='application' type='application'>
+          <propval name='server' type='astring' value='' />
+	  <!--	For now, just accept one upper and one lower.
+		We'll need to do ranges later.
+	  -->
+          <propval name='upper' type='astring' value='' />
+          <propval name='lower' type='astring' value='' />
+        </property_group>
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>ISC DHCPv6 relay</loctext>
+		</common_name>
+
+		<documentation>
+			<manpage title='dhcpd' section='8' />
+			<doc_link name='isc.org' uri='http://isc.org' />
+		</documentation>
+	</template>
+	</instance>
+
+	<stability value='Evolving' />
+
+</service>
+
+</service_bundle>
--- /dev/null	Fri Jun  6 21:51:52 2014
+++ new/build/isc-dhcp/local.mog	Fri Jun  6 21:51:52 2014
@@ -0,0 +1,37 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2014 OmniTI Computer Consulting, Inc.  All rights reserved.
+#
+
+<transform dir	path=etc$ -> edit path etc usr/share/isc-dhcp/examples>
+<transform file	path=etc/.* -> edit path etc usr/share/isc-dhcp/examples>
+<transform dir	path=usr/include -> drop>
+<transform dir	path=usr/include/dhcpctl -> drop>
+<transform file	path=usr/include/dhcpctl/.* -> drop>
+<transform dir	path=usr/include/isc-dhcp -> drop>
+<transform file	path=usr/include/isc-dhcp/.* -> drop>
+<transform dir	path=usr/include/omapip -> drop>
+<transform file	path=usr/include/omapip/.* -> drop>
+<transform dir	path=usr/lib -> drop>
+<transform file	path=usr/lib/.* -> drop>
+<transform file	path=usr/sbin/dhclient -> drop>
+<transform file path=usr/share/man/man8/dhclient.8 -> drop>
+<transform dir	path=usr/share/man/man3 -> drop>
+<transform file	path=usr/share/man/man3/.* -> drop>
+<transform file	path=usr/share/man/man5/dhclient.* -> drop>
+<transform file	path=usr/share/man/man8/dhclient.* -> drop>
+<transform dir	path=var/db -> set group sys>
+<transform file	path=var/db/dhcp.leases -> set preserve true>
+<transform file	path=var/db/dhcp6.leases -> set preserve true>
+
+license LICENSE license=ISC
--- old/build/jeos/omnios-userland.p5m	Fri Jun  6 21:51:52 2014
+++ new/build/jeos/omnios-userland.p5m	Fri Jun  6 21:51:52 2014
@@ -32,7 +32,7 @@
 depend fmri=developer/parser/bison@2.7.1,5.11-@PVER@ type=incorporate
 depend fmri=developer/sunstudio12.1@12.1,5.11-@PVER@ type=incorporate
 depend fmri=developer/swig@2.0.11,5.11-@PVER@ type=incorporate
-depend fmri=developer/versioning/git@1.8,5.11-@PVER@ type=incorporate
+depend fmri=developer/versioning/git@2.0,5.11-@PVER@ type=incorporate
 depend fmri=developer/versioning/mercurial@2.7,5.11-@PVER@ type=incorporate
 depend fmri=driver/virtualization/kvm@1.0,5.11-@PVER@ type=incorporate
 depend fmri=editor/vim@7.4,5.11-@PVER@ type=incorporate
@@ -78,6 +78,7 @@
 depend fmri=network/dns/bind@9.9,5.11-@PVER@ type=incorporate
 depend fmri=network/dns/idnconv@1.0,5.11-@PVER@ type=incorporate
 depend fmri=network/rsync@3.1,5.11-@PVER@ type=incorporate
+depend fmri=network/service/isc-dhcp@4.3,5.11-@PVER@ type=incorporate
 depend fmri=release/name@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=release/notices@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=runtime/java@1.7.0,5.11-@PVER@ type=incorporate
