Makefile glue for DHCP v3 import.

sbin/dhclient/Makefile

@@ -1,23 +1,6 @@
+# Makefile for ISC DHCP client.
 # $FreeBSD$
 
-DIST_DIR= ${.CURDIR}/../../contrib/isc-dhcp
+SUBDIR= common dst minires omapip client
 
-.PATH: ${DIST_DIR}/client ${DIST_DIR}/common
-
-PROG=	dhclient
-SRCS=	clparse.c dhclient.c
-SRCS+=	alloc.c bpf.c conflex.c convert.c dispatch.c errwarn.c ethernet.c \
-	hash.c icmp.c inet.c inet_addr.c memory.c nit.c options.c packet.c \
-	parse.c print.c raw.c socket.c tables.c tree.c upf.c
-
-CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
-CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"' -Dwarn=dhcp_warn
-WARNS=	0
-
-SCRIPTS=	scripts/freebsd
-SCRIPTSNAME=	dhclient-script
-
-MAN=	dhclient.conf.5 dhclient.leases.5 dhcp-options.5
-MAN+=	dhclient.8 dhclient-script.8
-
-.include <bsd.prog.mk>
+.include <bsd.subdir.mk>

sbin/dhclient/Makefile.inc

@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+MAINTAINER=     murray
+WARNS=		0
+
+CLIENTBINDIR=	/sbin
+RUNDIR=		/var/run
+ETCDIR=		/etc
+DBDIR=		/var/db
+
+MANFILTER= perl -pe 's\#DBDIR\#${DBDIR}\#g;s\#ETCDIR\#${ETCDIR}\#g;s\#CLIENTBINDIR\#${CLIENTBINDIR}\#g;s\#RUNDIR\#${RUNDIR}\#g;'
+
+.if exists(${.OBJDIR}/../common)
+LIBDHCP=	${.OBJDIR}/../common/libdhcp.a
+.else
+LIBDHCP=	${.CURDIR}/../common/libdhcp.a
+.endif
+
+.if exists(${.OBJDIR}/../minires)
+LIBRES=		${.OBJDIR}/../minires/libres.a
+.else
+LIBRES=		${.CURDIR}/../minires/libres.a
+.endif
+
+.if exists(${.OBJDIR}/../omapip)
+LIBOMAPI=	${.OBJDIR}/../omapip/libomapi.a
+.else
+LIBOMAPI=	${.CURDIR}/../omapip/libomapi.a
+.endif
+
+.if exists(${.OBJDIR}/../dst)
+LIBDST= 	${.OBJDIR}/../dst/libdst.a
+.else
+LIBDST=		${.CURDIR}/../dst/libdst.a
+.endif
+
+.include "../Makefile.inc"

sbin/dhclient/client/Makefile

@@ -0,0 +1,23 @@
+# client
+# $FreeBSD$
+
+DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
+
+.PATH: ${DIST_DIR}/client
+
+PROG=	dhclient
+SRCS=	clparse.c dhclient.c
+
+CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
+CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"' -Dwarn=dhcp_warn
+
+DPADD=  ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST}
+LDADD=  ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} 
+
+SCRIPTS=	scripts/freebsd
+SCRIPTSNAME=	dhclient-script
+
+MAN=	dhclient.conf.5 dhclient.leases.5
+MAN+=	dhclient.8 dhclient-script.8
+
+.include <bsd.prog.mk>

sbin/dhclient/common/Makefile

@@ -0,0 +1,23 @@
+# common
+# $FreeBSD$
+
+DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
+
+.PATH: ${DIST_DIR}/common
+
+LIB=	dhcp
+NOPROFILE=		true
+INTERNALLIB=		true
+NOPIC=			true
+INTERNALSTATICLIB=	true
+
+SRCS=   raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c	\
+	socket.c lpf.c dlpi.c packet.c tr.c ethernet.c memory.c print.c	\
+	options.c inet.c tree.c tables.c alloc.c fddi.c ctrace.c dns.c	\
+	resolv.c execute.c discover.c comapi.c
+
+CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
+
+MAN=	dhcp-eval.5 dhcp-options.5
+
+.include <bsd.lib.mk>

sbin/dhclient/dst/Makefile

@@ -0,0 +1,20 @@
+# dst
+# $FreeBSD$
+
+DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
+
+.PATH: ${DIST_DIR}/dst
+
+LIB=	 dst
+NOPROFILE=		true
+INTERNALLIB=		true
+NOPIC=			true
+INTERNALSTATICLIB=	true
+NOMAN=			true
+
+SRCS=	 dst_support.c dst_api.c hmac_link.c md5_dgst.c base64.c prandom.c
+
+#CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHMAC_MD5 -DMINIRES_LIB
+CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR} -DHMAC_MD5 -DMINIRES_LIB
+
+.include <bsd.lib.mk>

sbin/dhclient/minires/Makefile

@@ -0,0 +1,21 @@
+# minires
+# $FreeBSD$
+
+DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
+
+.PATH: ${DIST_DIR}/minires
+
+LIB= res
+NOPROFILE=		true
+INTERNALLIB=		true
+NOPIC=			true
+INTERNALSTATICLIB=	true
+NOMAN=			true
+
+SRCS= 	res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c	     \
+        res_sendsigned.c res_findzonecut.c res_query.c res_mkquery.c	     \
+        ns_date.c ns_parse.c ns_sign.c ns_name.c ns_samedomain.c ns_verify.c
+
+CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR} -DHMAC_MD5 -DMINIRES_LIB
+
+.include <bsd.lib.mk>

sbin/dhclient/omapip/Makefile

@@ -0,0 +1,24 @@
+# omapip
+# $FreeBSD$
+
+DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
+
+.PATH: ${DIST_DIR}/omapip
+
+LIB=	 omapi
+NOPROFILE=		true
+INTERNALLIB=		true
+NOPIC=			true
+INTERNALSTATICLIB=	true
+NOMAN=			true
+
+SRCS=    protocol.c buffer.c alloc.c result.c connection.c errwarn.c \
+         listener.c dispatch.c generic.c support.c handle.c message.c \
+         convert.c hash.c auth.c inet_addr.c array.c trace.c mrtrace.c \
+         toisc.c
+
+CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
+
+MAN=	omapi.3
+
+.include <bsd.lib.mk>