4 files changed, 19 insertions, 17 deletions

diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 61fbcee44f4b..9738ba2cf95f 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0
+PORTVERSION=	3.0.1.r1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/%SUBDIR%/ \
 		${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
@@ -102,7 +102,7 @@ PATCH_SUBDIRS=	common minires dst omapip server client relay dhcpctl
 BIN_FILES=	dhclient dhcpd dhcrelay omshell
 CONF_FILES=	dhclient.conf
 RC_FILES=	isc-dhcpd isc-dhcrelay
-DOC_FILES=	CHANGES COPYRIGHT README RELNOTES
+DOC_FILES=	ANONCVS CHANGES COPYRIGHT README RELNOTES
 SAMP_FILES=	client/dhclient.conf server/dhcpd.conf
 DATA_FILES=	dhclient.leases dhcpd.leases
 
@@ -204,6 +204,8 @@ create-data-files:
 .endfor
 
 display-message:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index 34ec582a835d..8a64687e43ea 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-3.0.tar.gz) = 06e0247fe787d356ac00933633e1fe71
+MD5 (dhcp-3.0.1rc1.tar.gz) = 590792257fb261a0a29993ca6d852f13
diff --git a/net/isc-dhcp30-server/pkg-message b/net/isc-dhcp30-server/pkg-message
index 89017519a78d..412bb440a02f 100644
--- a/net/isc-dhcp30-server/pkg-message
+++ b/net/isc-dhcp30-server/pkg-message
@@ -1,24 +1,23 @@
-****  To setup dhclient, you may need to edit /etc/rc.conf to bypass the
+****  To setup dhclient, you may need to edit /etc/rc.conf to replace the
       base system dhclient, such as :
             dhcp_program="%%PREFIX%%/sbin/dhclient"
             dhcp_flags="-q"
-      See dhclient(8) using the following command for details about the
+      See dhclient(8), using the following command, for details about other
       possible options:
             MANPATH=%%MAN1PREFIX%%/man man 8 dhclient
       
-****  To setup dhcpd, you may need to copy %%PREFIX%%/etc/dhcpd.conf.sample
-      to %%PREFIX%%/etc/dhcpd.conf for editing.  Also, you have to rename
-      %%PREFIX%%/etc/rc.d/isc-dhcpd.sh.sample to %%PREFIX%%/etc/rc.d/isc-
-      dhcpd.sh.
-      
+****  To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample
+      to %%PREFIX%%/etc/dhcpd.conf for editing.  You also have to rename
+      %%PREFIX%%/etc/rc.d/isc-dhcpd.sh.sample to %%PREFIX%%/etc/rc.d/isc-\
+      dhcpd.sh to enable automatic startup.
       %%PREFIX%%/etc/rc.isc-dhcpd.conf may be edited to tune some startup
       variables such as `dhcpd_options' or `dhcpd_ifaces', both defaulted
-      to nothing. See dhcpd(8) for details about the possible options.
-      
-****  To setup dhcrelay, you have to rename %%PREFIX%%/etc/rc.d/isc-
-      dhcrelay.sh.sample to %%PREFIX%%/etc/rc.d/isc-dhcrelay.sh.
+      to `nothing'. See dhcpd(8) for details about possible options.
       
+****  To setup dhcrelay, you have to rename %%PREFIX%%/etc/rc.d/isc-\
+      dhcrelay.sh.sample to %%PREFIX%%/etc/rc.d/isc-dhcrelay.sh to
+      enable automatic startup.
       %%PREFIX%%/etc/rc.isc-dhcrelay.conf may need to be edited to setup
-      the `dhcrelay_servers' as required. you may also tune `dhcrelay_options'
-      and `dhcrelay_ifaces', both defaulted to nothing, if needed. See
-      dhcrelay(8) for details about the possible options.
+      the `dhcrelay_servers' as required.  If needed, you may also tune
+      `dhcrelay_options' and `dhcrelay_ifaces', both defaulted to `nothing'.
+      See dhcrelay(8) for details about possible options.
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
index b1007e83e30f..417b684ada49 100644
--- a/net/isc-dhcp30-server/pkg-plist
+++ b/net/isc-dhcp30-server/pkg-plist
@@ -31,6 +31,7 @@ sbin/dhclient
 sbin/dhclient-script
 sbin/dhcpd
 sbin/dhcrelay
+%%PORTDOCS%%share/doc/isc-dhcp3/ANONCVS
 %%PORTDOCS%%share/doc/isc-dhcp3/CHANGES
 %%PORTDOCS%%share/doc/isc-dhcp3/COPYRIGHT
 %%PORTDOCS%%share/doc/isc-dhcp3/README