- Cosmetic fixes:

  - Use DOCSDIR and EXAMPLESDIR in Makefile and pkg-plist
  - Simplify post-install target
  - Check for bpf availabity by calling pkg-req script
  - Reword warning text in pkg-req and remove explicit version reference
  - Correct typo in COMMENT
- Do not update /etc/services - not needed anymore
- Bump PORTREVISION due to changed package

PR:		50918
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

3 files changed, 28 insertions, 57 deletions

diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index 92e5debacc3d..a3c2dae0a79a 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wide-dhcp
 PORTVERSION=	1.4.0.6
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
 		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/wide-dhcp/ \
@@ -16,47 +17,23 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
 DISTNAME=	dhcp-1.4.0p6
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Dynamic Host Configuration Protocol, WIDE-Implimentation
+COMMENT=	Dynamic Host Configuration Protocol, WIDE Implementation
 
 MAKE_ENV=	OSTYPE=${OPSYS}
 
-MAN5=	dhcpdb.server.5 dhcpdb.pool.5 dhcpdb.relay.5
-MAN8=	dhcpc.8 dhcps.8 relay.8 dhcpm.8
-
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/wide-dhcps.sh.sample
+MAN5=		dhcpdb.server.5 dhcpdb.pool.5 dhcpdb.relay.5
+MAN8=		dhcpc.8 dhcps.8 relay.8 dhcpm.8
+DOCS=		README README.jis db_sample/intro.dhcp db_sample/intro.dhcp.jis
+EXAMPLES=	dhcpdb.pool dhcpdb.relay dhcpdb.server
 
 post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/wide-dhcps.sh.sample ${PREFIX}/etc/rc.d
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/db_sample && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
-	@if [ ! -d ${PREFIX}/share/doc/dhcp ]; then \
-		${MKDIR} ${PREFIX}/share/doc/dhcp; \
-	fi
-	@if [ ! -d ${PREFIX}/share/examples/dhcp ]; then \
-		${MKDIR} ${PREFIX}/share/examples/dhcp; \
-	fi
-	@${CP} ${WRKSRC}/README ${PREFIX}/share/doc/dhcp/
-	@${CP} ${WRKSRC}/README.jis ${PREFIX}/share/doc/dhcp/
-	@${CP} ${WRKSRC}/db_sample/dhcpdb.pool  \
-		${PREFIX}/share/examples/dhcp/dhcpdb.pool.sample
-	@${CP} ${WRKSRC}/db_sample/dhcpdb.relay  \
-		${PREFIX}/share/examples/dhcp/dhcpdb.relay.sample
-	@${CP} ${WRKSRC}/db_sample/dhcpdb.server  \
-		${PREFIX}/share/examples/dhcp/dhcpdb.server.sample
-	@${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/doc/dhcp/
-	@${CP} ${WRKSRC}/db_sample/intro.dhcp.jis  \
-		${PREFIX}/share/doc/dhcp/
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then				    \
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file.";	    \
-		${INSTALL_SCRIPT} ${FILESDIR}/wide-dhcps.sh.sample ${STARTUP_SCRIPT}; \
-	fi
-	@if [ ! -c /dev/bpf1 ]; then \
-	    ${ECHO} "********************************************************";\
-	    ${ECHO} "*                   W a r n i n g                      *";\
-	    ${ECHO} "* DHCP the needs Berkeley Packet Filter (bpf).         *";\
-	    ${ECHO} "* To use DHCP, your kernel must be rebuilt with bpf,   *";\
-	    ${ECHO} "* and make bpf devices on /dev directory.              *";\
-	    ${ECHO} "* Please read the info file by \`pkg_info ${PKGNAME}'. *";\
-	    ${ECHO} "********************************************************";\
-	fi
+	@${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 .include <bsd.port.mk>
diff --git a/net/wide-dhcp/pkg-plist b/net/wide-dhcp/pkg-plist
index 45e94f3984a7..7f4f884837be 100644
--- a/net/wide-dhcp/pkg-plist
+++ b/net/wide-dhcp/pkg-plist
@@ -1,20 +1,16 @@
 @comment $FreeBSD$
+etc/rc.d/wide-dhcps.sh.sample
 sbin/dhcpc
 sbin/dhcpm
 sbin/relay
 sbin/dhcps
-share/doc/dhcp/README
-share/doc/dhcp/README.jis
-share/doc/dhcp/intro.dhcp
-share/doc/dhcp/intro.dhcp.jis
-share/examples/dhcp/dhcpdb.pool.sample
-share/examples/dhcp/dhcpdb.relay.sample
-share/examples/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
-@unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcpc /etc/services.bak ) > /etc/services
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.jis
+%%PORTDOCS%%%%DOCSDIR%%/intro.dhcp
+%%PORTDOCS%%%%DOCSDIR%%/intro.dhcp.jis
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/dhcpdb.pool
+%%EXAMPLESDIR%%/dhcpdb.relay
+%%EXAMPLESDIR%%/dhcpdb.server
+@dirrm %%EXAMPLESDIR%%
 @unexec rm -f /var/db/dhcp_cache
-@dirrm share/doc/dhcp
-@dirrm share/examples/dhcp
diff --git a/net/wide-dhcp/pkg-req b/net/wide-dhcp/pkg-req
index f4b0f7421d4f..9ac3b498db7d 100644
--- a/net/wide-dhcp/pkg-req
+++ b/net/wide-dhcp/pkg-req
@@ -2,12 +2,10 @@
 if [ "$2" != "INSTALL" ]; then
   exit 0
 fi
-if [ ! -c /dev/bpf1 ]; then \
-	echo "**********************************************************";\
-	echo "*                      W a r n i n g                     *";\
-	echo "* This DHCP program need Berkeley packet filter(bpf).    *";\
-	echo "* To use DHCP, your kernel must be rebuilt with bpf, and *";\
-	echo "* make bpf devices on /dev directory.                    *";\
-	echo "* Please read some info file with \`pkg_info dhcp-1.3b'.  *";\
-	echo "**********************************************************";\
+if [ ! -c /dev/bpf1 ]; then
+	echo "**********************************************************"
+	echo "* This DHCP program need Berkeley packet filter (bpf)"
+	echo "* To use DHCP, you need to rebuild your kernel with bpf"
+	echo "* and make bpf devices in the /dev directory."
+	echo "**********************************************************"
 fi