18 files changed, 620 insertions, 102 deletions

diff --git a/net-mgmt/wide-dhcp/Makefile b/net-mgmt/wide-dhcp/Makefile
index dcde69475b77..86a87ad881f9 100644
--- a/net-mgmt/wide-dhcp/Makefile
+++ b/net-mgmt/wide-dhcp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         21 November 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.6 1996/12/03 03:34:37 asami Exp $
+# $Id: Makefile,v 1.7 1996/12/28 23:39:28 asami Exp $
 #
 
 DISTNAME=       dhcp-1.3beta
@@ -19,6 +19,8 @@ EXTRACT_ONLY=	dhcp-1.3beta.tar.gz
 IGNOREFILES=	tzfile.h
 MAKE_ENV=	OSTYPE=`uname`
 
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/wide-dhcps.sh.sample
+
 post-patch:
 	if [ ! -f ${WRKSRC}/server/tzfile.h ]; then \
 		${CP} ${DISTDIR}/tzfile.h ${WRKSRC}/server/; \
@@ -34,6 +36,21 @@ post-install:
 	@${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample
 	@${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample
 	@${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/
+	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
+		echo "Installing ${STARTUP_SCRIPT} startup file.";	\
+		echo '#!/bin/sh' > ${STARTUP_SCRIPT};			\
+		echo 'if [ -f /etc/dhcpdb.pool -a -f /etc/dhcpdb.relay \'\
+			>> ${STARTUP_SCRIPT};				\
+		echo '		-a -x /usr/local/sbin/dhcps ]; then'	\
+			>> ${STARTUP_SCRIPT};				\
+		echo "	${PREFIX}/sbin/dhcps [Intarface Name]"		\
+			>> ${STARTUP_SCRIPT};				\
+		echo "	echo -n ' dhcps'"				\
+			>> ${STARTUP_SCRIPT};				\
+		echo 'fi' >> ${STARTUP_SCRIPT};				\
+		chmod 755 ${STARTUP_SCRIPT};				\
+		chown bin.bin ${STARTUP_SCRIPT};                        \
+	fi
 	@if [ ! -c /dev/bpf1 ]; then \
 	    echo "**********************************************************";\
 	    echo "*                      W a r n i n g                     *";\
diff --git a/net-mgmt/wide-dhcp/files/patch-aa b/net-mgmt/wide-dhcp/files/patch-aa
index 26f4afbd61dd..4c7a1baa9d40 100644
--- a/net-mgmt/wide-dhcp/files/patch-aa
+++ b/net-mgmt/wide-dhcp/files/patch-aa
@@ -1,6 +1,6 @@
 --- client/Makefile.FreeBSD.orig	Mon Oct  9 14:34:12 1995
-+++ client/Makefile.FreeBSD	Thu Jan 11 11:48:49 1996
-@@ -1,6 +1,9 @@
++++ client/Makefile.FreeBSD	Fri Mar 28 17:25:06 1997
+@@ -1,14 +1,22 @@
  INCLUDE = ../server/dhcp.h dhcpc.h common.h ../server/common_subr.h dhcpc_subr.h
  OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
 -LDFLAGS =
@@ -9,10 +9,13 @@
 +LIBEXEC=	${PREFIX}/libexec 
 +MAN=		${PREFIX}/man
  
- CC = gcc
+-CC = gcc
 -CFLAGS = -Wall -g -I. -I../server #-DDEBUG
+-#CC = cc
++#CC = gcc
 +CFLAGS += -Wall -I. -I../server #-DDEBUG
-@@ -9,6 +12,11 @@
++CC = cc
+ #CFLAGS = -g -I. -I../server #-DDEBUG
  
  dhcpc: ${OBJ}
  	${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
diff --git a/net-mgmt/wide-dhcp/files/patch-ac b/net-mgmt/wide-dhcp/files/patch-ac
index 0712b9589a04..fca7851badb7 100644
--- a/net-mgmt/wide-dhcp/files/patch-ac
+++ b/net-mgmt/wide-dhcp/files/patch-ac
@@ -1,20 +1,41 @@
 --- client/dhcpc_subr.c.orig	Fri Nov  3 01:39:55 1995
-+++ client/dhcpc_subr.c	Mon Aug  5 01:41:27 1996
-@@ -63,6 +63,9 @@
++++ client/dhcpc_subr.c	Thu Mar 27 11:39:50 1997
+@@ -63,6 +63,12 @@
  #ifdef __osf__
  #include <net/pfilt.h>
  #endif
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
++#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
++#include <net/if_var.h>
++#endif
 +#endif
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
  #include <netinet/if_ether.h>
-@@ -273,7 +276,11 @@
+@@ -70,6 +76,8 @@
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
+ #include <arpa/inet.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+ 
+ #include "dhcp.h"
+ #include "common.h"
+@@ -159,6 +167,8 @@
+ 
+ int config_if();
+ void set_route();
++void set_resolv();
++void set_hostname();
+ void make_decline();
+ void make_release();
+ Long generate_xid();
+@@ -273,7 +283,11 @@
    tmp = 0;
    bcopy(&tmp, sarp->arp_spa, sarp->arp_pln);
    bcopy(&target->s_addr, sarp->arp_tpa, sarp->arp_pln);
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version >= 199703 && __FreeBSD_version <= 219999)
 +  sether->ether_type = ETHERTYPE_ARP;
 +#else
    sether->ether_type = htons(ETHERTYPE_ARP);
@@ -22,11 +43,11 @@
  
    if (ether_write(ifp->fd, sbuf, ETHERHL + sizeof(struct ether_arp)) < 0) {
      return(0);                               /* it is harmless to return 0 */
-@@ -341,7 +348,11 @@
+@@ -341,7 +355,11 @@
    bcopy(&ipaddr->s_addr, sarp->arp_spa, sarp->arp_pln);
    bcopy(&ipaddr->s_addr, sarp->arp_tpa, sarp->arp_pln);
  
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  sether->ether_type = ETHERTYPE_ARP;
 +#else
    sether->ether_type = htons(ETHERTYPE_ARP);
@@ -34,7 +55,7 @@
  
    if (ether_write(ifp->fd, sbuf, ETHERHL + sizeof(struct ether_arp)) < 0) {
      return(-1);
-@@ -1387,7 +1398,7 @@
+@@ -1387,7 +1405,7 @@
    /* get haddr of interface */
    intface.haddr.htype = ETHER;
    intface.haddr.hlen = 6;
@@ -43,7 +64,7 @@
    if (ioctl(dhcpif.fd, SIOCGIFADDR, &ifr) < 0) {
      syslog(LOG_WARNING, "ioctl(SIOCGIFADDR) error in initialize(): %m");
      return(-1);
-@@ -1535,8 +1546,8 @@
+@@ -1535,8 +1553,8 @@
      ((struct sockaddr_in *)&ridreq.ifr_addr)->sin_addr.s_addr;
  
    if (current_addr.s_addr == addr->s_addr &&
@@ -54,16 +75,16 @@
      close(sockfd);
      return(1);
    }
-@@ -1660,7 +1671,7 @@
+@@ -1660,7 +1678,7 @@
  /*
   * set routing table
   */
 -#ifndef BSDOS
-+#if !defined(BSDOS) && (__FreeBSD__ != 2)
++#if !defined(BSDOS) && (__FreeBSD__ < 2)
  void
  set_route(param)
    struct dhcp_param *param;
-@@ -1730,6 +1741,10 @@
+@@ -1730,6 +1748,10 @@
    register char *cp = m_rtmsg.m_space;
    register int l;
  
@@ -74,11 +95,55 @@
    bzero(&so_dst, sizeof(struct sockaddr));
    bzero(&so_mask, sizeof(struct sockaddr));
    bzero(&so_gate, sizeof(struct sockaddr));
-@@ -1897,7 +1912,11 @@
+@@ -1772,6 +1794,43 @@
+ 
+ #endif
+ 
++void
++set_resolv(param)
++struct dhcp_param *param;
++{
++    FILE *fp;
++    int i;
++
++    if (param == NULL) {
++	return;
++    }
++
++    /*
++     * set resolv.conf
++     */
++    if (param->dns_domain != NULL && param->dns_server != NULL) {
++	if(param->dns_server->num && param->dns_server->addr != NULL) {
++	    if((fp = fopen(_PATH_RESCONF, "w")) == NULL) {
++		return;
++	    }
++	    fprintf(fp, "domain %s\n", param->dns_domain);
++	    for(i = 0; i < param->dns_server->num; i++) {
++		fprintf(fp,"nameserver %s\n",inet_ntoa(param->dns_server->addr[i]));
++	    }
++	    fclose(fp);
++	}
++    }
++}
++
++void
++set_hostname(param)
++struct dhcp_param *param;
++{
++	if (param->hostname != NULL) {
++		sethostname(param->hostname,strlen(param->hostname));
++	}
++	return;
++}
+ 
+ void
+ make_decline(lsbuf, reqspecp)
+@@ -1897,7 +1956,11 @@
      lsether->ether_shost[i] = intface.haddr.haddr[i];
  #endif
    }
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  lsether->ether_type = ETHERTYPE_IP;
 +#else
    lsether->ether_type = htons(ETHERTYPE_IP);
@@ -86,11 +151,11 @@
  
    return;
  }
-@@ -2199,7 +2218,11 @@
+@@ -2199,7 +2262,11 @@
      snd.ether->ether_shost[i] = intface.haddr.haddr[i];
  #endif
    }
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  snd.ether->ether_type = ETHERTYPE_IP;
 +#else
    snd.ether->ether_type = htons(ETHERTYPE_IP);
@@ -98,11 +163,11 @@
  
    return;
  }
-@@ -2372,7 +2395,11 @@
+@@ -2372,7 +2439,11 @@
      snd.ether->ether_shost[i] = intface.haddr.haddr[i];
  #endif
    }
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  snd.ether->ether_type = ETHERTYPE_IP;
 +#else
    snd.ether->ether_type = htons(ETHERTYPE_IP);
@@ -110,21 +175,21 @@
  
    return(0);
  }
-@@ -2391,7 +2418,7 @@
+@@ -2391,7 +2462,7 @@
    struct msghdr msg;
    struct iovec bufvec[1];
    int bufsize = DFLTDHCPLEN;
 -#ifdef BSDOS
-+#if defined(BSDOS) || (__FreeBSD__ == 2)
++#if defined(BSDOS) || (__FreeBSD__ >= 2)
    int on;
  #endif
  
-@@ -2417,7 +2444,7 @@
+@@ -2417,7 +2488,7 @@
        return(-1);
      }
  
 -#ifdef BSDOS
-+#if defined(BSDOS) || (__FreeBSD__ == 2)
++#if defined(BSDOS) || (__FreeBSD__ >= 2)
      on = 1;
      if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0) {
        close(sockfd);
diff --git a/net-mgmt/wide-dhcp/files/patch-ae b/net-mgmt/wide-dhcp/files/patch-ae
index 0481ca24cd4a..355586233d15 100644
--- a/net-mgmt/wide-dhcp/files/patch-ae
+++ b/net-mgmt/wide-dhcp/files/patch-ae
@@ -1,14 +1,16 @@
---- server/Makefile.FreeBSD.org	Sat Jan 20 20:53:25 1996
-+++ server/Makefile.FreeBSD	Sat Jan 20 20:56:27 1996
+--- server/Makefile.FreeBSD.orig	Mon Nov  6 16:18:41 1995
++++ server/Makefile.FreeBSD	Fri Mar 28 17:26:44 1997
 @@ -1,13 +1,25 @@
  OBJ = dhcps.o database.o hash.o ctime.o getmac.o common_subr.o \
        interface.o delarp.o
 -LDFLAGS =
-+LDFLAGS = -lkvm
- CC = gcc
+-CC = gcc
 -CFLAGS = -g -Wall #-DCOMPAT_RFC1541 #-DNOICMPCHK
+-#CC = cc
++LDFLAGS = -lkvm
++#CC = gcc
 +CFLAGS += -Wall #-DCOMPAT_RFC1541 #-DNOICMPCHK
- #CC = cc
++CC = cc
  #CFLAGS = -g #-DCOMPAT_RFC1541 #-DNOICMPCHK
 +SBIN=		${PREFIX}/sbin
 +LIBEXEC=	${PREFIX}/libexec
diff --git a/net-mgmt/wide-dhcp/files/patch-ag b/net-mgmt/wide-dhcp/files/patch-ag
index 4995b3060932..8971d5a1c61d 100644
--- a/net-mgmt/wide-dhcp/files/patch-ag
+++ b/net-mgmt/wide-dhcp/files/patch-ag
@@ -1,9 +1,13 @@
---- relay/Makefile.FreeBSD.org	Sat Jan 20 20:44:01 1996
-+++ relay/Makefile.FreeBSD	Sat Jan 20 20:49:14 1996
-@@ -3,10 +3,20 @@
+--- relay/Makefile.FreeBSD.orig	Mon Oct  9 15:09:37 1995
++++ relay/Makefile.FreeBSD	Fri Mar 28 17:26:07 1997
+@@ -1,12 +1,22 @@
+ OBJ = relay.o getmac.o common_subr.o interface.o
+-CC = gcc
 -CFLAGS = -g -Wall -I. -I../server
+-#CC = cc
++#CC = gcc
 +CFLAGS += -Wall -I. -I../server
- #CC = cc
++CC = cc
  #CFLAGS = -g -I. -I../server
 -LDFLAGS =
 +LDFLAGS = -lkvm
diff --git a/net-mgmt/wide-dhcp/files/patch-aq b/net-mgmt/wide-dhcp/files/patch-aq
index ba80d96d5705..2ed36637b3b8 100644
--- a/net-mgmt/wide-dhcp/files/patch-aq
+++ b/net-mgmt/wide-dhcp/files/patch-aq
@@ -1,9 +1,12 @@
---- tools/Makefile.FreeBSD.org	Sat Jan 20 21:44:16 1996
-+++ tools/Makefile.FreeBSD	Sat Jan 20 21:48:39 1996
-@@ -2,9 +2,17 @@
+--- tools/Makefile.FreeBSD.orig	Mon Oct  9 15:00:53 1995
++++ tools/Makefile.FreeBSD	Fri Mar 28 17:27:46 1997
+@@ -1,10 +1,18 @@
+-CC = gcc
 -CFLAGS = -g -Wall -I. -I../server
+-#CC = cc
++#CC = gcc
 +CFLAGS += -Wall -I. -I../server
- #CC = cc
++CC = cc
  #CFLAGS = -g -I. -I../server
 +SBIN=		${PREFIX}/sbin
 +LIBEXEC=	${PREFIX}/libexec
diff --git a/net-mgmt/wide-dhcp/files/patch-as b/net-mgmt/wide-dhcp/files/patch-as
index fd057ececff7..d41aee411404 100644
--- a/net-mgmt/wide-dhcp/files/patch-as
+++ b/net-mgmt/wide-dhcp/files/patch-as
@@ -1,22 +1,163 @@
 --- client/dhcpc.c.orig	Fri Nov  3 01:40:40 1995
-+++ client/dhcpc.c	Tue Mar 26 18:06:39 1996
-@@ -1760,6 +1760,7 @@
++++ client/dhcpc.c	Thu Mar 27 15:11:20 1997
+@@ -53,6 +53,12 @@
+ #ifndef sun
+ #include <net/bpf.h>
+ #endif
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
++#include <net/if_var.h>
++#endif
++#endif
+ #include <netinet/in.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/if_ether.h>
+@@ -86,6 +92,7 @@
+ struct dhcp_reqspec reqspec;
+ struct if_info intface;
+ struct dhcp_param *param_list;
++int f_resolv, f_hostname;
+ 
+ int (*fsm[MAX_STATES])();
+ 
+@@ -227,6 +234,14 @@
+ 		((brdaddr.s_addr != 0) ? &brdaddr : NULL)) != 1) {
+     set_route(paramp);
+   }
++#ifdef __FreeBSD__
++  if (f_resolv) {
++	set_resolv(param_list);
++  }
++  if (f_hostname) {
++	set_hostname(param_list);
++  }
++#endif
+ #endif
+ 
+   return;
+@@ -264,15 +279,8 @@
+   /*
+    * split conditions into pieces for debugging
+    */
+-#ifndef sun
+-  if (ntohs(rcv.ip->ip_len) < DFLTBOOTPLEN + UDPHL + IPHL)
+-    return(0);
+-  if (ntohs(rcv.udp->uh_ulen) < DFLTBOOTPLEN + UDPHL)
+-    return(0);
+-#else
+   if (rcv.udp->uh_dport != dhcpc_port)
+     return(0);
+-#endif 
+   if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
+     return(0);
+   if (rcv.udp->uh_sum != 0 &&
+@@ -321,15 +329,8 @@
+   /*
+    * split conditions into pieces for debugging
+    */
+-#ifndef sun
+-  if (ntohs(rcv.ip->ip_len) < DFLTBOOTPLEN + UDPHL + IPHL)
+-    return(0);
+-  if (ntohs(rcv.udp->uh_ulen) < DFLTBOOTPLEN + UDPHL)
+-    return(0);
+-#else
+   if (rcv.udp->uh_dport != dhcpc_port)
+     return(0);
+-#endif 
+   if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
+     return(0);
+   if (rcv.udp->uh_sum != 0 &&
+@@ -1740,7 +1741,11 @@
+ void
+ usage()
+ {
+-  fprintf(stderr, "Usage: dhcpc [-d] if_name\n");
++#ifdef __FreeBSD__
++  fprintf(stderr, "Usage: dhcpc [-v] [-drn] if_name\n");
++#else
++  fprintf(stderr, "Usage: dhcpc [-v] [-d] if_name\n");
++#endif
+   exit(1);
+ }
+ 
+@@ -1760,17 +1765,42 @@
  {
    int debug = 0;
    int n = 0;
++  int count;
 +  FILE *pid_file;
    struct if_info ifinfo;
++#ifdef __FreeBSD__
++  char pid_filename[MAXPATHLEN];
++#endif
  
    bzero(&reqspec, sizeof(reqspec));
-@@ -1789,6 +1790,11 @@
-       ioctl(n, TIOCNOTTY, (char *) 0);
+   bzero(&ifinfo, sizeof(ifinfo));
++#ifdef __FreeBSD__
++#define COM_OPTS        "vdrn"
++#else
++#define COM_OPTS        "vd"
++#endif
++
+   if (argc < 2) usage();
+-  --argc, ++argv;
+-  if (argv[0][0] == '-' && argv[0][1] == 'v') version();
+-  if (argv[0][0] == '-' && argv[0][1] == 'd') {
+-    debug = 1;
+-    --argc, ++argv;
++
++  while ((count = getopt(argc, argv, COM_OPTS)) != EOF) {
++    switch (count) {
++      case 'v':
++        version();
++      case 'd':
++        debug = 1;
++        break;
++#ifdef __FreeBSD__
++      case 'r':
++        f_resolv = 1;
++        break;
++      case 'n':
++        f_hostname = 1;
++        break;
++#endif
++    }
+   }
++  argc -= optind;
++  argv += optind;
+ 
+   if (argc < 1) usage();
+   strcpy(ifinfo.name, argv[0]);
+@@ -1790,6 +1820,19 @@
        close(n);
      }
-+  }
+   }
 +  /* initialization works well, so recored its own pid */
++#ifdef __FreeBSD__
++  strncpy(pid_filename, PATH_PID, MAXPATHLEN);
++  strncat(pid_filename, "/dhcpc.", (MAXPATHLEN - strlen(pid_filename)));
++  strncat(pid_filename, ifinfo.name, (MAXPATHLEN - strlen(pid_filename)));
++  strncat(pid_filename, ".pid", (MAXPATHLEN - strlen(pid_filename)));
++  if ((pid_file = fopen(pid_filename, "w")) != NULL) {
++#else
 +  if ((pid_file = fopen(PATH_PID, "w")) != NULL) {
++#endif
 +    fprintf(pid_file, "%d\n", (int) getpid());
 +    fclose(pid_file);
-   }
++  }
  
    /*
+    * set request specification
+@@ -1802,6 +1845,11 @@
+   reqspec.reqlist.list[reqspec.reqlist.len++] = SUBNET_MASK;
+   reqspec.reqlist.list[reqspec.reqlist.len++] = ROUTER;
+   reqspec.reqlist.list[reqspec.reqlist.len++] = BRDCAST_ADDR;
++#ifdef __FreeBSD__
++  reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_DOMAIN;
++  reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_SERVER;
++  reqspec.reqlist.list[reqspec.reqlist.len++] = HOSTNAME;
++#endif
+   
+   return(dhcp_client(&ifinfo));
+ }
diff --git a/net-mgmt/wide-dhcp/pkg-descr b/net-mgmt/wide-dhcp/pkg-descr
index 9d7e015a0cb8..b234ca344ec2 100644
--- a/net-mgmt/wide-dhcp/pkg-descr
+++ b/net-mgmt/wide-dhcp/pkg-descr
@@ -24,25 +24,48 @@
 
 ------------------------------
 
-**Attention for this ports file>**
+** Attention for this ports file **
 
-   To use DHCP, your kernel  must  be rebuilt  with the following line
-   added to your kernel config file (/sys/i386/conf/<YourMachine>):
+	   To use DHCP, your kernel must be rebuilt with the following
+	line added to your kernel config file (/sys/i386/conf/<YourMachine>):
 
 pseudo-device	bpfilter	4	#Berkeley packet filter
 
-   and make bpf devices in your /dev directory: /dev/bpf[0-3].
+	and make bpf devices in your /dev directory: /dev/bpf[1-3].
 
 cd /dev
-./MAKEDEV bpf0
 ./MAKEDEV bpf1
 ./MAKEDEV bpf2
 ./MAKEDEV bpf3
 
-**Acknowledgements to this ports file**
+** CHECK_SUM Problem under FreeBSD 2.1.x **
+
+	  This port collection is use tzfile.h from FreeBSD-current source
+	tree. Because this file is frequently changed, md5 check sum of
+	this file in files/md5 is ``IGNORE''.
+
+	  If you use this port collection ***under FreeBSD 2.1-stable***:
+	2.1.0-RELEASE, 2.1.5-RELASE, 2.1.6-RELEASE, 2.1.7-RELEASE,
+	please make with ``make NO_CHECKSUM=yes'', or use latest
+	bsd.ports.mk and bsd.port.subdir.mk files in /usr/share/mk.
+
+** additional function **
+
+	   DHCP client(dhcpc) in this port is supported "dynamic change
+	/etc/resolv.conf and hostname via DHCP infomation".
+
+		  o `-r' is recreate /etc/resolv.conf
+		         (resolv.conf file is overwritten.)
+		  o `-n' is reset HOSTNAME
+
+** Acknowledgements to this ports file **
 	Special thanks to:
 		Hirotaka TAKETA<taketa@csk.co.jp>
 		Hajimu UMEMOTO<ume@calm.imasy.or.jp>
+		Tamotsu KANOH<kanoh@kanoh.iijnet.or.jp>
+		Junichi SATOH<junichi@astec.co.jp>
+		Hisashi HIRAMOTO<hiramoto@phys.chs.nihon-u.ac.jp>
+		Takeshi TAGUCHI<taguchi@tohoku.iij.ad.jp>
 
 - Yoshiro MIHIRA
 (sanpei@yy.cs.keio.ac.jp)
diff --git a/net-mgmt/wide-dhcp/pkg-plist b/net-mgmt/wide-dhcp/pkg-plist
index fe214f9bb898..07c62d1fe6ae 100644
--- a/net-mgmt/wide-dhcp/pkg-plist
+++ b/net-mgmt/wide-dhcp/pkg-plist
@@ -15,6 +15,7 @@ share/dhcp/intro.dhcp
 share/dhcp/dhcpdb.pool.sample
 share/dhcp/dhcpdb.relay.sample
 share/dhcp/dhcpdb.server.sample
+etc/rc.d/wide-dhcps.sh.sample
 @exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ; echo "dhcps		67/udp    # dhcp server") > /etc/services
 @unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ) > /etc/services
 @exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcpc /etc/services.bak ; echo "dhcpc		68/udp    # dhcp client") > /etc/services
diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index dcde69475b77..86a87ad881f9 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         21 November 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.6 1996/12/03 03:34:37 asami Exp $
+# $Id: Makefile,v 1.7 1996/12/28 23:39:28 asami Exp $
 #
 
 DISTNAME=       dhcp-1.3beta
@@ -19,6 +19,8 @@ EXTRACT_ONLY=	dhcp-1.3beta.tar.gz
 IGNOREFILES=	tzfile.h
 MAKE_ENV=	OSTYPE=`uname`
 
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/wide-dhcps.sh.sample
+
 post-patch:
 	if [ ! -f ${WRKSRC}/server/tzfile.h ]; then \
 		${CP} ${DISTDIR}/tzfile.h ${WRKSRC}/server/; \
@@ -34,6 +36,21 @@ post-install:
 	@${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample
 	@${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample
 	@${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/
+	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
+		echo "Installing ${STARTUP_SCRIPT} startup file.";	\
+		echo '#!/bin/sh' > ${STARTUP_SCRIPT};			\
+		echo 'if [ -f /etc/dhcpdb.pool -a -f /etc/dhcpdb.relay \'\
+			>> ${STARTUP_SCRIPT};				\
+		echo '		-a -x /usr/local/sbin/dhcps ]; then'	\
+			>> ${STARTUP_SCRIPT};				\
+		echo "	${PREFIX}/sbin/dhcps [Intarface Name]"		\
+			>> ${STARTUP_SCRIPT};				\
+		echo "	echo -n ' dhcps'"				\
+			>> ${STARTUP_SCRIPT};				\
+		echo 'fi' >> ${STARTUP_SCRIPT};				\
+		chmod 755 ${STARTUP_SCRIPT};				\
+		chown bin.bin ${STARTUP_SCRIPT};                        \
+	fi
 	@if [ ! -c /dev/bpf1 ]; then \
 	    echo "**********************************************************";\
 	    echo "*                      W a r n i n g                     *";\
diff --git a/net/wide-dhcp/files/patch-aa b/net/wide-dhcp/files/patch-aa
index 26f4afbd61dd..4c7a1baa9d40 100644
--- a/net/wide-dhcp/files/patch-aa
+++ b/net/wide-dhcp/files/patch-aa
@@ -1,6 +1,6 @@
 --- client/Makefile.FreeBSD.orig	Mon Oct  9 14:34:12 1995
-+++ client/Makefile.FreeBSD	Thu Jan 11 11:48:49 1996
-@@ -1,6 +1,9 @@
++++ client/Makefile.FreeBSD	Fri Mar 28 17:25:06 1997
+@@ -1,14 +1,22 @@
  INCLUDE = ../server/dhcp.h dhcpc.h common.h ../server/common_subr.h dhcpc_subr.h
  OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
 -LDFLAGS =
@@ -9,10 +9,13 @@
 +LIBEXEC=	${PREFIX}/libexec 
 +MAN=		${PREFIX}/man
  
- CC = gcc
+-CC = gcc
 -CFLAGS = -Wall -g -I. -I../server #-DDEBUG
+-#CC = cc
++#CC = gcc
 +CFLAGS += -Wall -I. -I../server #-DDEBUG
-@@ -9,6 +12,11 @@
++CC = cc
+ #CFLAGS = -g -I. -I../server #-DDEBUG
  
  dhcpc: ${OBJ}
  	${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
diff --git a/net/wide-dhcp/files/patch-ac b/net/wide-dhcp/files/patch-ac
index 0712b9589a04..fca7851badb7 100644
--- a/net/wide-dhcp/files/patch-ac
+++ b/net/wide-dhcp/files/patch-ac
@@ -1,20 +1,41 @@
 --- client/dhcpc_subr.c.orig	Fri Nov  3 01:39:55 1995
-+++ client/dhcpc_subr.c	Mon Aug  5 01:41:27 1996
-@@ -63,6 +63,9 @@
++++ client/dhcpc_subr.c	Thu Mar 27 11:39:50 1997
+@@ -63,6 +63,12 @@
  #ifdef __osf__
  #include <net/pfilt.h>
  #endif
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
++#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
++#include <net/if_var.h>
++#endif
 +#endif
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
  #include <netinet/if_ether.h>
-@@ -273,7 +276,11 @@
+@@ -70,6 +76,8 @@
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
+ #include <arpa/inet.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+ 
+ #include "dhcp.h"
+ #include "common.h"
+@@ -159,6 +167,8 @@
+ 
+ int config_if();
+ void set_route();
++void set_resolv();
++void set_hostname();
+ void make_decline();
+ void make_release();
+ Long generate_xid();
+@@ -273,7 +283,11 @@
    tmp = 0;
    bcopy(&tmp, sarp->arp_spa, sarp->arp_pln);
    bcopy(&target->s_addr, sarp->arp_tpa, sarp->arp_pln);
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version >= 199703 && __FreeBSD_version <= 219999)
 +  sether->ether_type = ETHERTYPE_ARP;
 +#else
    sether->ether_type = htons(ETHERTYPE_ARP);
@@ -22,11 +43,11 @@
  
    if (ether_write(ifp->fd, sbuf, ETHERHL + sizeof(struct ether_arp)) < 0) {
      return(0);                               /* it is harmless to return 0 */
-@@ -341,7 +348,11 @@
+@@ -341,7 +355,11 @@
    bcopy(&ipaddr->s_addr, sarp->arp_spa, sarp->arp_pln);
    bcopy(&ipaddr->s_addr, sarp->arp_tpa, sarp->arp_pln);
  
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  sether->ether_type = ETHERTYPE_ARP;
 +#else
    sether->ether_type = htons(ETHERTYPE_ARP);
@@ -34,7 +55,7 @@
  
    if (ether_write(ifp->fd, sbuf, ETHERHL + sizeof(struct ether_arp)) < 0) {
      return(-1);
-@@ -1387,7 +1398,7 @@
+@@ -1387,7 +1405,7 @@
    /* get haddr of interface */
    intface.haddr.htype = ETHER;
    intface.haddr.hlen = 6;
@@ -43,7 +64,7 @@
    if (ioctl(dhcpif.fd, SIOCGIFADDR, &ifr) < 0) {
      syslog(LOG_WARNING, "ioctl(SIOCGIFADDR) error in initialize(): %m");
      return(-1);
-@@ -1535,8 +1546,8 @@
+@@ -1535,8 +1553,8 @@
      ((struct sockaddr_in *)&ridreq.ifr_addr)->sin_addr.s_addr;
  
    if (current_addr.s_addr == addr->s_addr &&
@@ -54,16 +75,16 @@
      close(sockfd);
      return(1);
    }
-@@ -1660,7 +1671,7 @@
+@@ -1660,7 +1678,7 @@
  /*
   * set routing table
   */
 -#ifndef BSDOS
-+#if !defined(BSDOS) && (__FreeBSD__ != 2)
++#if !defined(BSDOS) && (__FreeBSD__ < 2)
  void
  set_route(param)
    struct dhcp_param *param;
-@@ -1730,6 +1741,10 @@
+@@ -1730,6 +1748,10 @@
    register char *cp = m_rtmsg.m_space;
    register int l;
  
@@ -74,11 +95,55 @@
    bzero(&so_dst, sizeof(struct sockaddr));
    bzero(&so_mask, sizeof(struct sockaddr));
    bzero(&so_gate, sizeof(struct sockaddr));
-@@ -1897,7 +1912,11 @@
+@@ -1772,6 +1794,43 @@
+ 
+ #endif
+ 
++void
++set_resolv(param)
++struct dhcp_param *param;
++{
++    FILE *fp;
++    int i;
++
++    if (param == NULL) {
++	return;
++    }
++
++    /*
++     * set resolv.conf
++     */
++    if (param->dns_domain != NULL && param->dns_server != NULL) {
++	if(param->dns_server->num && param->dns_server->addr != NULL) {
++	    if((fp = fopen(_PATH_RESCONF, "w")) == NULL) {
++		return;
++	    }
++	    fprintf(fp, "domain %s\n", param->dns_domain);
++	    for(i = 0; i < param->dns_server->num; i++) {
++		fprintf(fp,"nameserver %s\n",inet_ntoa(param->dns_server->addr[i]));
++	    }
++	    fclose(fp);
++	}
++    }
++}
++
++void
++set_hostname(param)
++struct dhcp_param *param;
++{
++	if (param->hostname != NULL) {
++		sethostname(param->hostname,strlen(param->hostname));
++	}
++	return;
++}
+ 
+ void
+ make_decline(lsbuf, reqspecp)
+@@ -1897,7 +1956,11 @@
      lsether->ether_shost[i] = intface.haddr.haddr[i];
  #endif
    }
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  lsether->ether_type = ETHERTYPE_IP;
 +#else
    lsether->ether_type = htons(ETHERTYPE_IP);
@@ -86,11 +151,11 @@
  
    return;
  }
-@@ -2199,7 +2218,11 @@
+@@ -2199,7 +2262,11 @@
      snd.ether->ether_shost[i] = intface.haddr.haddr[i];
  #endif
    }
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  snd.ether->ether_type = ETHERTYPE_IP;
 +#else
    snd.ether->ether_type = htons(ETHERTYPE_IP);
@@ -98,11 +163,11 @@
  
    return;
  }
-@@ -2372,7 +2395,11 @@
+@@ -2372,7 +2439,11 @@
      snd.ether->ether_shost[i] = intface.haddr.haddr[i];
  #endif
    }
-+#if __FreeBSD_version < 199608
++#if (__FreeBSD_version < 199608) || (__FreeBSD_version == 199612) || (__FreeBSD_version > 199703 && __FreeBSD_version < 219999)
 +  snd.ether->ether_type = ETHERTYPE_IP;
 +#else
    snd.ether->ether_type = htons(ETHERTYPE_IP);
@@ -110,21 +175,21 @@
  
    return(0);
  }
-@@ -2391,7 +2418,7 @@
+@@ -2391,7 +2462,7 @@
    struct msghdr msg;
    struct iovec bufvec[1];
    int bufsize = DFLTDHCPLEN;
 -#ifdef BSDOS
-+#if defined(BSDOS) || (__FreeBSD__ == 2)
++#if defined(BSDOS) || (__FreeBSD__ >= 2)
    int on;
  #endif
  
-@@ -2417,7 +2444,7 @@
+@@ -2417,7 +2488,7 @@
        return(-1);
      }
  
 -#ifdef BSDOS
-+#if defined(BSDOS) || (__FreeBSD__ == 2)
++#if defined(BSDOS) || (__FreeBSD__ >= 2)
      on = 1;
      if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0) {
        close(sockfd);
diff --git a/net/wide-dhcp/files/patch-ae b/net/wide-dhcp/files/patch-ae
index 0481ca24cd4a..355586233d15 100644
--- a/net/wide-dhcp/files/patch-ae
+++ b/net/wide-dhcp/files/patch-ae
@@ -1,14 +1,16 @@
---- server/Makefile.FreeBSD.org	Sat Jan 20 20:53:25 1996
-+++ server/Makefile.FreeBSD	Sat Jan 20 20:56:27 1996
+--- server/Makefile.FreeBSD.orig	Mon Nov  6 16:18:41 1995
++++ server/Makefile.FreeBSD	Fri Mar 28 17:26:44 1997
 @@ -1,13 +1,25 @@
  OBJ = dhcps.o database.o hash.o ctime.o getmac.o common_subr.o \
        interface.o delarp.o
 -LDFLAGS =
-+LDFLAGS = -lkvm
- CC = gcc
+-CC = gcc
 -CFLAGS = -g -Wall #-DCOMPAT_RFC1541 #-DNOICMPCHK
+-#CC = cc
++LDFLAGS = -lkvm
++#CC = gcc
 +CFLAGS += -Wall #-DCOMPAT_RFC1541 #-DNOICMPCHK
- #CC = cc
++CC = cc
  #CFLAGS = -g #-DCOMPAT_RFC1541 #-DNOICMPCHK
 +SBIN=		${PREFIX}/sbin
 +LIBEXEC=	${PREFIX}/libexec
diff --git a/net/wide-dhcp/files/patch-ag b/net/wide-dhcp/files/patch-ag
index 4995b3060932..8971d5a1c61d 100644
--- a/net/wide-dhcp/files/patch-ag
+++ b/net/wide-dhcp/files/patch-ag
@@ -1,9 +1,13 @@
---- relay/Makefile.FreeBSD.org	Sat Jan 20 20:44:01 1996
-+++ relay/Makefile.FreeBSD	Sat Jan 20 20:49:14 1996
-@@ -3,10 +3,20 @@
+--- relay/Makefile.FreeBSD.orig	Mon Oct  9 15:09:37 1995
++++ relay/Makefile.FreeBSD	Fri Mar 28 17:26:07 1997
+@@ -1,12 +1,22 @@
+ OBJ = relay.o getmac.o common_subr.o interface.o
+-CC = gcc
 -CFLAGS = -g -Wall -I. -I../server
+-#CC = cc
++#CC = gcc
 +CFLAGS += -Wall -I. -I../server
- #CC = cc
++CC = cc
  #CFLAGS = -g -I. -I../server
 -LDFLAGS =
 +LDFLAGS = -lkvm
diff --git a/net/wide-dhcp/files/patch-aq b/net/wide-dhcp/files/patch-aq
index ba80d96d5705..2ed36637b3b8 100644
--- a/net/wide-dhcp/files/patch-aq
+++ b/net/wide-dhcp/files/patch-aq
@@ -1,9 +1,12 @@
---- tools/Makefile.FreeBSD.org	Sat Jan 20 21:44:16 1996
-+++ tools/Makefile.FreeBSD	Sat Jan 20 21:48:39 1996
-@@ -2,9 +2,17 @@
+--- tools/Makefile.FreeBSD.orig	Mon Oct  9 15:00:53 1995
++++ tools/Makefile.FreeBSD	Fri Mar 28 17:27:46 1997
+@@ -1,10 +1,18 @@
+-CC = gcc
 -CFLAGS = -g -Wall -I. -I../server
+-#CC = cc
++#CC = gcc
 +CFLAGS += -Wall -I. -I../server
- #CC = cc
++CC = cc
  #CFLAGS = -g -I. -I../server
 +SBIN=		${PREFIX}/sbin
 +LIBEXEC=	${PREFIX}/libexec
diff --git a/net/wide-dhcp/files/patch-as b/net/wide-dhcp/files/patch-as
index fd057ececff7..d41aee411404 100644
--- a/net/wide-dhcp/files/patch-as
+++ b/net/wide-dhcp/files/patch-as
@@ -1,22 +1,163 @@
 --- client/dhcpc.c.orig	Fri Nov  3 01:40:40 1995
-+++ client/dhcpc.c	Tue Mar 26 18:06:39 1996
-@@ -1760,6 +1760,7 @@
++++ client/dhcpc.c	Thu Mar 27 15:11:20 1997
+@@ -53,6 +53,12 @@
+ #ifndef sun
+ #include <net/bpf.h>
+ #endif
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#if (__FreeBSD_version == 199702) || (__FreeBSD_version >= 300000)
++#include <net/if_var.h>
++#endif
++#endif
+ #include <netinet/in.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/if_ether.h>
+@@ -86,6 +92,7 @@
+ struct dhcp_reqspec reqspec;
+ struct if_info intface;
+ struct dhcp_param *param_list;
++int f_resolv, f_hostname;
+ 
+ int (*fsm[MAX_STATES])();
+ 
+@@ -227,6 +234,14 @@
+ 		((brdaddr.s_addr != 0) ? &brdaddr : NULL)) != 1) {
+     set_route(paramp);
+   }
++#ifdef __FreeBSD__
++  if (f_resolv) {
++	set_resolv(param_list);
++  }
++  if (f_hostname) {
++	set_hostname(param_list);
++  }
++#endif
+ #endif
+ 
+   return;
+@@ -264,15 +279,8 @@
+   /*
+    * split conditions into pieces for debugging
+    */
+-#ifndef sun
+-  if (ntohs(rcv.ip->ip_len) < DFLTBOOTPLEN + UDPHL + IPHL)
+-    return(0);
+-  if (ntohs(rcv.udp->uh_ulen) < DFLTBOOTPLEN + UDPHL)
+-    return(0);
+-#else
+   if (rcv.udp->uh_dport != dhcpc_port)
+     return(0);
+-#endif 
+   if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
+     return(0);
+   if (rcv.udp->uh_sum != 0 &&
+@@ -321,15 +329,8 @@
+   /*
+    * split conditions into pieces for debugging
+    */
+-#ifndef sun
+-  if (ntohs(rcv.ip->ip_len) < DFLTBOOTPLEN + UDPHL + IPHL)
+-    return(0);
+-  if (ntohs(rcv.udp->uh_ulen) < DFLTBOOTPLEN + UDPHL)
+-    return(0);
+-#else
+   if (rcv.udp->uh_dport != dhcpc_port)
+     return(0);
+-#endif 
+   if (ripcksum != cksum((u_short *) rcv.ip, rcv.ip->ip_hl * 2))
+     return(0);
+   if (rcv.udp->uh_sum != 0 &&
+@@ -1740,7 +1741,11 @@
+ void
+ usage()
+ {
+-  fprintf(stderr, "Usage: dhcpc [-d] if_name\n");
++#ifdef __FreeBSD__
++  fprintf(stderr, "Usage: dhcpc [-v] [-drn] if_name\n");
++#else
++  fprintf(stderr, "Usage: dhcpc [-v] [-d] if_name\n");
++#endif
+   exit(1);
+ }
+ 
+@@ -1760,17 +1765,42 @@
  {
    int debug = 0;
    int n = 0;
++  int count;
 +  FILE *pid_file;
    struct if_info ifinfo;
++#ifdef __FreeBSD__
++  char pid_filename[MAXPATHLEN];
++#endif
  
    bzero(&reqspec, sizeof(reqspec));
-@@ -1789,6 +1790,11 @@
-       ioctl(n, TIOCNOTTY, (char *) 0);
+   bzero(&ifinfo, sizeof(ifinfo));
++#ifdef __FreeBSD__
++#define COM_OPTS        "vdrn"
++#else
++#define COM_OPTS        "vd"
++#endif
++
+   if (argc < 2) usage();
+-  --argc, ++argv;
+-  if (argv[0][0] == '-' && argv[0][1] == 'v') version();
+-  if (argv[0][0] == '-' && argv[0][1] == 'd') {
+-    debug = 1;
+-    --argc, ++argv;
++
++  while ((count = getopt(argc, argv, COM_OPTS)) != EOF) {
++    switch (count) {
++      case 'v':
++        version();
++      case 'd':
++        debug = 1;
++        break;
++#ifdef __FreeBSD__
++      case 'r':
++        f_resolv = 1;
++        break;
++      case 'n':
++        f_hostname = 1;
++        break;
++#endif
++    }
+   }
++  argc -= optind;
++  argv += optind;
+ 
+   if (argc < 1) usage();
+   strcpy(ifinfo.name, argv[0]);
+@@ -1790,6 +1820,19 @@
        close(n);
      }
-+  }
+   }
 +  /* initialization works well, so recored its own pid */
++#ifdef __FreeBSD__
++  strncpy(pid_filename, PATH_PID, MAXPATHLEN);
++  strncat(pid_filename, "/dhcpc.", (MAXPATHLEN - strlen(pid_filename)));
++  strncat(pid_filename, ifinfo.name, (MAXPATHLEN - strlen(pid_filename)));
++  strncat(pid_filename, ".pid", (MAXPATHLEN - strlen(pid_filename)));
++  if ((pid_file = fopen(pid_filename, "w")) != NULL) {
++#else
 +  if ((pid_file = fopen(PATH_PID, "w")) != NULL) {
++#endif
 +    fprintf(pid_file, "%d\n", (int) getpid());
 +    fclose(pid_file);
-   }
++  }
  
    /*
+    * set request specification
+@@ -1802,6 +1845,11 @@
+   reqspec.reqlist.list[reqspec.reqlist.len++] = SUBNET_MASK;
+   reqspec.reqlist.list[reqspec.reqlist.len++] = ROUTER;
+   reqspec.reqlist.list[reqspec.reqlist.len++] = BRDCAST_ADDR;
++#ifdef __FreeBSD__
++  reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_DOMAIN;
++  reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_SERVER;
++  reqspec.reqlist.list[reqspec.reqlist.len++] = HOSTNAME;
++#endif
+   
+   return(dhcp_client(&ifinfo));
+ }
diff --git a/net/wide-dhcp/pkg-descr b/net/wide-dhcp/pkg-descr
index 9d7e015a0cb8..b234ca344ec2 100644
--- a/net/wide-dhcp/pkg-descr
+++ b/net/wide-dhcp/pkg-descr
@@ -24,25 +24,48 @@
 
 ------------------------------
 
-**Attention for this ports file>**
+** Attention for this ports file **
 
-   To use DHCP, your kernel  must  be rebuilt  with the following line
-   added to your kernel config file (/sys/i386/conf/<YourMachine>):
+	   To use DHCP, your kernel must be rebuilt with the following
+	line added to your kernel config file (/sys/i386/conf/<YourMachine>):
 
 pseudo-device	bpfilter	4	#Berkeley packet filter
 
-   and make bpf devices in your /dev directory: /dev/bpf[0-3].
+	and make bpf devices in your /dev directory: /dev/bpf[1-3].
 
 cd /dev
-./MAKEDEV bpf0
 ./MAKEDEV bpf1
 ./MAKEDEV bpf2
 ./MAKEDEV bpf3
 
-**Acknowledgements to this ports file**
+** CHECK_SUM Problem under FreeBSD 2.1.x **
+
+	  This port collection is use tzfile.h from FreeBSD-current source
+	tree. Because this file is frequently changed, md5 check sum of
+	this file in files/md5 is ``IGNORE''.
+
+	  If you use this port collection ***under FreeBSD 2.1-stable***:
+	2.1.0-RELEASE, 2.1.5-RELASE, 2.1.6-RELEASE, 2.1.7-RELEASE,
+	please make with ``make NO_CHECKSUM=yes'', or use latest
+	bsd.ports.mk and bsd.port.subdir.mk files in /usr/share/mk.
+
+** additional function **
+
+	   DHCP client(dhcpc) in this port is supported "dynamic change
+	/etc/resolv.conf and hostname via DHCP infomation".
+
+		  o `-r' is recreate /etc/resolv.conf
+		         (resolv.conf file is overwritten.)
+		  o `-n' is reset HOSTNAME
+
+** Acknowledgements to this ports file **
 	Special thanks to:
 		Hirotaka TAKETA<taketa@csk.co.jp>
 		Hajimu UMEMOTO<ume@calm.imasy.or.jp>
+		Tamotsu KANOH<kanoh@kanoh.iijnet.or.jp>
+		Junichi SATOH<junichi@astec.co.jp>
+		Hisashi HIRAMOTO<hiramoto@phys.chs.nihon-u.ac.jp>
+		Takeshi TAGUCHI<taguchi@tohoku.iij.ad.jp>
 
 - Yoshiro MIHIRA
 (sanpei@yy.cs.keio.ac.jp)
diff --git a/net/wide-dhcp/pkg-plist b/net/wide-dhcp/pkg-plist
index fe214f9bb898..07c62d1fe6ae 100644
--- a/net/wide-dhcp/pkg-plist
+++ b/net/wide-dhcp/pkg-plist
@@ -15,6 +15,7 @@ share/dhcp/intro.dhcp
 share/dhcp/dhcpdb.pool.sample
 share/dhcp/dhcpdb.relay.sample
 share/dhcp/dhcpdb.server.sample
+etc/rc.d/wide-dhcps.sh.sample
 @exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ; echo "dhcps		67/udp    # dhcp server") > /etc/services
 @unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ) > /etc/services
 @exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcpc /etc/services.bak ; echo "dhcpc		68/udp    # dhcp client") > /etc/services