From tkato432@yahoo.com  Fri Oct 14 18:44:47 2011
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 371E01065679
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 14 Oct 2011 18:44:00 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165])
	by mx1.freebsd.org (Postfix) with ESMTP id D762C8FC1E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 14 Oct 2011 18:43:59 +0000 (UTC)
Received: from msa102lp.auone-net.jp (MSA102lp [172.27.12.180])
	by msa102lp.auone-net.jp (au one net msa) with ESMTP id 7DE7178262
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Oct 2011 03:35:14 +0900 (JST)
Received: from localhost.localdomain (ZT046175.ppp.dion.ne.jp [59.128.46.175])
	by msa102lp.auone-net.jp (au one net msa) with ESMTP id 682644AC036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Oct 2011 03:35:10 +0900 (JST)
Message-Id: <20111015025921.aa733285.tkato432@yahoo.com>
Date: Sat, 15 Oct 2011 02:59:21 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: net-mgmt/wide-dhcp to 1.4.0.7

>Number:         161608
>Category:       ports
>Synopsis:       Update port: net-mgmt/wide-dhcp to 1.4.0.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    zi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 14 18:50:13 UTC 2011
>Closed-Date:    Mon Nov 14 13:42:22 UTC 2011
>Last-Modified:  Mon Nov 14 13:50:07 UTC 2011
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 1.4.0.7

Remove file:
files/patch-aa
files/patch-ae
files/patch-ag
files/patch-aq

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net-mgmt/wide-dhcp/Makefile net-mgmt/wide-dhcp/Makefile
--- /usr/ports/net-mgmt/wide-dhcp/Makefile	2009-01-09 15:27:55.000000000 +0900
+++ net-mgmt/wide-dhcp/Makefile	2011-09-26 15:30:56.000000000 +0900
@@ -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 -urN /usr/ports/net-mgmt/wide-dhcp/distinfo net-mgmt/wide-dhcp/distinfo
--- /usr/ports/net-mgmt/wide-dhcp/distinfo	2011-03-21 02:51:54.000000000 +0900
+++ net-mgmt/wide-dhcp/distinfo	2011-09-26 15:19:42.000000000 +0900
@@ -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 -urN /usr/ports/net-mgmt/wide-dhcp/files/patch-aa net-mgmt/wide-dhcp/files/patch-aa
--- /usr/ports/net-mgmt/wide-dhcp/files/patch-aa	1999-02-08 04:46:13.000000000 +0900
+++ net-mgmt/wide-dhcp/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/net-mgmt/wide-dhcp/files/patch-ae net-mgmt/wide-dhcp/files/patch-ae
--- /usr/ports/net-mgmt/wide-dhcp/files/patch-ae	1999-02-08 04:46:13.000000000 +0900
+++ net-mgmt/wide-dhcp/files/patch-ae	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/net-mgmt/wide-dhcp/files/patch-ag net-mgmt/wide-dhcp/files/patch-ag
--- /usr/ports/net-mgmt/wide-dhcp/files/patch-ag	1999-02-08 04:46:13.000000000 +0900
+++ net-mgmt/wide-dhcp/files/patch-ag	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/net-mgmt/wide-dhcp/files/patch-aq net-mgmt/wide-dhcp/files/patch-aq
--- /usr/ports/net-mgmt/wide-dhcp/files/patch-aq	1999-02-08 04:46:13.000000000 +0900
+++ net-mgmt/wide-dhcp/files/patch-aq	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/net-mgmt/wide-dhcp/files/patch-as net-mgmt/wide-dhcp/files/patch-as
--- /usr/ports/net-mgmt/wide-dhcp/files/patch-as	2000-01-21 07:08:54.000000000 +0900
+++ net-mgmt/wide-dhcp/files/patch-as	2011-09-26 15:22:40.000000000 +0900
@@ -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 -urN /usr/ports/net-mgmt/wide-dhcp/pkg-descr net-mgmt/wide-dhcp/pkg-descr
--- /usr/ports/net-mgmt/wide-dhcp/pkg-descr	2009-12-21 15:56:32.000000000 +0900
+++ net-mgmt/wide-dhcp/pkg-descr	2011-09-26 14:22:59.000000000 +0900
@@ -18,3 +18,5 @@
 
 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 -urN /usr/ports/net-mgmt/wide-dhcp/pkg-plist net-mgmt/wide-dhcp/pkg-plist
--- /usr/ports/net-mgmt/wide-dhcp/pkg-plist	2003-04-24 06:27:28.000000000 +0900
+++ net-mgmt/wide-dhcp/pkg-plist	2011-09-26 15:16:26.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->zi 
Responsible-Changed-By: zi 
Responsible-Changed-When: Sat Oct 15 12:10:14 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161608 

From: Ryan Steinmetz <zi@FreeBSD.org>
To: KATO Tsuguru <tkato432@yahoo.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/161608: Update port: net-mgmt/wide-dhcp to 1.4.0.7
Date: Mon, 7 Nov 2011 17:40:55 -0500

 This port requires a FreeBSD rc script to replace the existing one.  I
 will work on one in my spare time, but have not yet had time to complete
 this.
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Nov 14 13:42:21 UTC 2011 
State-Changed-Why:  
i've committed that patch. thx kato, @Ryan that port is without 
maintainer u can everytime commit that rc.d script. there is no reason 
to block that pr so long. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161608 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161608: commit references a PR
Date: Mon, 14 Nov 2011 13:41:38 +0000 (UTC)

 miwi        2011-11-14 13:41:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/wide-dhcp   Makefile distinfo pkg-descr pkg-plist 
     net-mgmt/wide-dhcp/files patch-as 
   Removed files:
     net-mgmt/wide-dhcp/files patch-aa patch-ae patch-ag patch-aq 
   Log:
   - Update to 1.4.0.7
   
   PR:             161608
   Submitted by:   Ports Fury
   Feature safe:   yes
   
   Revision  Changes    Path
   1.38      +22 -14    ports/net-mgmt/wide-dhcp/Makefile
   1.10      +2 -2      ports/net-mgmt/wide-dhcp/distinfo
   1.9       +0 -22     ports/net-mgmt/wide-dhcp/files/patch-aa (dead)
   1.8       +0 -18     ports/net-mgmt/wide-dhcp/files/patch-ae (dead)
   1.8       +0 -18     ports/net-mgmt/wide-dhcp/files/patch-ag (dead)
   1.8       +0 -19     ports/net-mgmt/wide-dhcp/files/patch-aq (dead)
   1.6       +7 -6      ports/net-mgmt/wide-dhcp/files/patch-as
   1.8       +2 -0      ports/net-mgmt/wide-dhcp/pkg-descr
   1.10      +6 -6      ports/net-mgmt/wide-dhcp/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
