9 files changed, 38 insertions, 104 deletions

diff --git a/net-mgmt/wide-dhcp/Makefile b/net-mgmt/wide-dhcp/Makefile
index 59b05fb1af8b..44f78d9762a0 100644
--- a/net-mgmt/wide-dhcp/Makefile
+++ b/net-mgmt/wide-dhcp/Makefile
@@ -7,38 +7,46 @@
 #
 
 PORTNAME=	wide-dhcp
-PORTVERSION=	1.4.0.6
-PORTREVISION=	2
+PORTVERSION=	1.4.0.7
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
-		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/wide-dhcp/ \
 		ftp://ftp.st.ryukoku.ac.jp/pub/network/dhcp/wide/
-DISTNAME=	dhcp-1.4.0p6
+DISTNAME=	dhcp-${PORTVERSION:R}p${PORTVERSION:E}
+
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/Copyright
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic Host Configuration Protocol, WIDE Implementation
 
-MAKE_ENV=	OSTYPE=${OPSYS}
+MAKE_ENV=	OSTYPE="${OPSYS}"
+MAKE_JOBS_SAFE=	yes
 
 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-patch:
+.for dir in client relay server tools
+	@${REINPLACE_CMD} -e \
+		's|^CC =|CC ?=| ; \
+		 s|^CFLAGS =|CFLAGS +=| ; \
+		 s|-O2|| ; \
+		 s|^PREFIX =|PREFIX ?=| ; \
+		 s|/usr/bin/gzip|/usr/bin/touch|' ${WRKSRC}/${dir}/Makefile.FreeBSD
+.endfor
+
 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)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800059
-BROKEN=		does not build
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/db_sample && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .endif
+	@${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/wide-dhcp/distinfo b/net-mgmt/wide-dhcp/distinfo
index 3c66ac3c1c83..1b1b2bf4ceb4 100644
--- a/net-mgmt/wide-dhcp/distinfo
+++ b/net-mgmt/wide-dhcp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dhcp-1.4.0p6.tar.gz) = ed0504043e63bfc3610fef312632f243bf3acad17b02beb328fc3da2c017fddd
-SIZE (dhcp-1.4.0p6.tar.gz) = 135616
+SHA256 (dhcp-1.4.0p7.tar.gz) = 3bf85ab1bbe57c7802e4d46a4625fe90551423237598c4141bfab9336722efa1
+SIZE (dhcp-1.4.0p7.tar.gz) = 135793
diff --git a/net-mgmt/wide-dhcp/files/patch-aa b/net-mgmt/wide-dhcp/files/patch-aa
deleted file mode 100644
index d76aca16f6d9..000000000000
--- a/net-mgmt/wide-dhcp/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- client/Makefile.FreeBSD.orig	Fri Jan  1 06:21:32 1999
-+++ client/Makefile.FreeBSD	Sun Feb  7 10:38:40 1999
-@@ -2,16 +2,16 @@
- OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
- 
- CC = cc
--CFLAGS = -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
-+CFLAGS += -O2 -I. -I../server -DRETRY_FOREVER #-DMOBILE_IP -DDEBUG
- LDFLAGS =
- 
--PREFIX =	/usr/local
-+#PREFIX =	/usr/local
- SBIN = 		$(PREFIX)/sbin
- LIBEXEC =	$(PREFIX)/libexec
- MAN =		$(PREFIX)/man
- CP =		/bin/cp
- RM =		/bin/rm
--GZIP =		/usr/bin/gzip
-+GZIP =		/usr/bin/touch		# don't `gzip' anything for FreeBSD
- 
- dhcpc: ${OBJ}
- 	${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
diff --git a/net-mgmt/wide-dhcp/files/patch-ae b/net-mgmt/wide-dhcp/files/patch-ae
deleted file mode 100644
index 2b565f37a4e9..000000000000
--- a/net-mgmt/wide-dhcp/files/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/Makefile.FreeBSD.orig	Tue Jan 26 02:13:13 1999
-+++ server/Makefile.FreeBSD	Sun Feb  7 10:54:41 1999
-@@ -5,13 +5,13 @@
- CFLAGS = -O2 -I. #-DMAC_FILTER #-DCOMPAT_RFC1541 #-DNOICMPCHK
- LDFLAGS =
- 
--PREFIX =	/usr/local
-+#PREFIX =	/usr/local
- SBIN =		${PREFIX}/sbin
- LIBEXEC =	${PREFIX}/libexec
- MAN =		${PREFIX}/man
- CP =		/bin/cp
- RM =		/bin/rm
--GZIP =		/usr/bin/gzip
-+GZIP =		/usr/bin/touch	# don't `gzip' anything for FreeBSD
- 
- dhcps: ${OBJ}
- 	${CC} ${CFLAGS} -o dhcps ${OBJ} ${LDFLAGS}
diff --git a/net-mgmt/wide-dhcp/files/patch-ag b/net-mgmt/wide-dhcp/files/patch-ag
deleted file mode 100644
index 403705393395..000000000000
--- a/net-mgmt/wide-dhcp/files/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
---- relay/Makefile.FreeBSD.orig	Fri Jan  1 02:25:43 1999
-+++ relay/Makefile.FreeBSD	Sun Feb  7 10:56:47 1999
-@@ -4,13 +4,13 @@
- CFLAGS = -O2 -I. -I../server
- LDFLAGS =
- 
--PREFIX =	/usr/local
-+#PREFIX =	/usr/local
- SBIN =		${PREFIX}/sbin
- LIBEXEC = 	${PREFIX}/libexec
- MAN =		${PREFIX}/man
- CP =		/bin/cp
- RM =		/bin/rm
--GZIP =		/usr/bin/gzip
-+GZIP =		/usr/bin/touch	# don't `gzip' anything for FreeBSD
- 
- relay: ${OBJ}
- 	${CC} ${CFLAGS} -o relay ${OBJ} ${LDFLAGS}
diff --git a/net-mgmt/wide-dhcp/files/patch-aq b/net-mgmt/wide-dhcp/files/patch-aq
deleted file mode 100644
index c2b9b0000741..000000000000
--- a/net-mgmt/wide-dhcp/files/patch-aq
+++ /dev/null
@@ -1,19 +0,0 @@
---- tools/Makefile.FreeBSD.orig	Fri Jan  1 02:31:45 1999
-+++ tools/Makefile.FreeBSD	Sun Feb  7 11:00:20 1999
-@@ -1,14 +1,14 @@
- CC = cc
- CFLAGS = -O2 -I. -I../server
- 
--PREFIX =	/usr/local
-+#PREFIX =	/usr/local
- SBIN =		${PREFIX}/sbin
- LIBEXEC =	${PREFIX}/libexec
- MAN =		${PREFIX}/man
- 
- CP =		/bin/cp
- RM =		/bin/rm
--GZIP =		/usr/bin/gzip
-+GZIP =		/usr/bin/touch		# don't `gzip' anything for FreeBSD
- 
- dhcpm: dhcpm.c ../server/dhcp.h
- 	$(CC) $(CFLAGS) dhcpm.c -o dhcpm
diff --git a/net-mgmt/wide-dhcp/files/patch-as b/net-mgmt/wide-dhcp/files/patch-as
index a977a72eb2ba..0c901bb727b3 100644
--- a/net-mgmt/wide-dhcp/files/patch-as
+++ b/net-mgmt/wide-dhcp/files/patch-as
@@ -1,5 +1,5 @@
---- client/dhcpc.c.orig	Fri Jan  1 05:20:08 1999
-+++ client/dhcpc.c	Thu Jan 20 13:21:05 2000
+--- client/dhcpc.c.orig	1999-03-25 19:59:26.000000000 +0900
++++ client/dhcpc.c	2011-09-26 15:22:19.000000000 +0900
 @@ -88,6 +88,7 @@
  struct dhcp_reqspec reqspec;
  struct if_info intface;
@@ -305,15 +305,16 @@
    strcpy(ifinfo.name, argv[0]);
  
    /*
-@@ -1859,6 +1909,11 @@
+@@ -1859,9 +1909,10 @@
    reqspec.reqlist.list[reqspec.reqlist.len++] = SUBNET_MASK;
    reqspec.reqlist.list[reqspec.reqlist.len++] = ROUTER;
    reqspec.reqlist.list[reqspec.reqlist.len++] = BRDCAST_ADDR;
+-#ifdef DNS
+-  reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_SERVER;
 +#ifdef __FreeBSD__
-+  reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_DOMAIN;
+   reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_DOMAIN;
 +  reqspec.reqlist.list[reqspec.reqlist.len++] = DNS_SERVER;
 +  reqspec.reqlist.list[reqspec.reqlist.len++] = HOSTNAME;
-+#endif
+ #endif
    
    n = dhcp_client(&ifinfo);
-   unlink(pid_filename);
diff --git a/net-mgmt/wide-dhcp/pkg-descr b/net-mgmt/wide-dhcp/pkg-descr
index 4b801cec3d95..e6945b0407fb 100644
--- a/net-mgmt/wide-dhcp/pkg-descr
+++ b/net-mgmt/wide-dhcp/pkg-descr
@@ -18,3 +18,5 @@ intro.dhcp.jis.
 
 Thanks to:  Hirotaka TAKETA, Hajimu UMEMOTO, Tamotsu KANOH, Junichi SATOH,
 Hisashi HIRAMOTO, Takeshi TAGUCHI, Keisuke INOUE, and Yoshiro MIHIRA.
+
+WWW: http://web.sfc.wide.ad.jp/~tomy/dhcp/index-e.html
diff --git a/net-mgmt/wide-dhcp/pkg-plist b/net-mgmt/wide-dhcp/pkg-plist
index 7f4f884837be..a82c505899b0 100644
--- a/net-mgmt/wide-dhcp/pkg-plist
+++ b/net-mgmt/wide-dhcp/pkg-plist
@@ -2,15 +2,15 @@
 etc/rc.d/wide-dhcps.sh.sample
 sbin/dhcpc
 sbin/dhcpm
-sbin/relay
 sbin/dhcps
+sbin/relay
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.jis
 %%PORTDOCS%%%%DOCSDIR%%/intro.dhcp
 %%PORTDOCS%%%%DOCSDIR%%/intro.dhcp.jis
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dhcpdb.pool
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dhcpdb.relay
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dhcpdb.server
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/dhcpdb.pool
-%%EXAMPLESDIR%%/dhcpdb.relay
-%%EXAMPLESDIR%%/dhcpdb.server
-@dirrm %%EXAMPLESDIR%%
 @unexec rm -f /var/db/dhcp_cache