3 files changed, 28 insertions, 24 deletions

diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index c536c48ed1ab..646175fafee8 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	dhcp
-PORTVERSION=	3.0.2
-PORTREVISION=	8
+PORTVERSION=	3.0.3
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.0-history
@@ -31,6 +31,7 @@ OPTIONS=	INTERFACE_POLLING "interface polling support" on
 .if ${SUBSYS} == server
 OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
 		DHCP_JAIL "add -chroot and -jail options" on \
+		DHCP_SOCKETS "use sockets instead of /dev/bpf (jail-only)" off \
 		DHCP_LDAP "add experimental LDAP backend support" off \
 		DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \
 		OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \
@@ -42,9 +43,9 @@ OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
 
 .if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
 # Based on patch from Brian Masney :
-PATCH_SITES=	http://www.newwave.net/~masneyb/ \
-		ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/
-PATCHFILES=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch
+PATCH_SITES=	http://www.newwave.net/~masneyb/:ldap \
+		ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:ldap
+PATCHFILES=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch:ldap
 PATCH_DIST_STRIP=	-p1
 
 USE_PERL5_RUN=	yes
@@ -59,9 +60,9 @@ USE_OPENSSL=	yes
 
 .if ${SUBSYS} == server && defined(WITH_DHCP_LQ)
 # Based on patch from Dmitry Sukhodoev :
-PATCH_SITES=	http://bingo.ru/~raven/FreeBSD/patches/ \
-		ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/
-PATCHFILES+=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch
+PATCH_SITES+=	http://bingo.ru/~raven/FreeBSD/patches/:dlq \
+		ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:dlq
+PATCHFILES+=	${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch:dlq
 .endif
 
 # Global variables
@@ -225,6 +226,9 @@ patch-site-conf:
 .endif
 .if !defined(WITHOUT_DHCP_JAIL)
 	@${ECHO_CMD} CFLAGS += -DJAIL >> ${WRKSRC}/site.conf
+.if defined(WITH_DHCP_SOCKETS)
+	@${ECHO_CMD} CFLAGS += -DUSE_SOCKETS >> ${WRKSRC}/site.conf
+.endif
 .endif
 .if defined(WITH_DHCP_LDAP)
 	@${ECHO_CMD} CFLAGS += -I${LOCALBASE}/include >> ${WRKSRC}/site.conf
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index ff1a69160ea2..3cde7d3cf350 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (dhcp-3.0.2.tar.gz) = 04800a111521e7442749b2ce883f962b
-SIZE (dhcp-3.0.2.tar.gz) = 853313
-MD5 (dhcp-3.0.2-ldap-patch) = 08908b2f06b5e985d78d7c28797c5a37
-SIZE (dhcp-3.0.2-ldap-patch) = 229453
-MD5 (dhcp-3.0.2-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SIZE (dhcp-3.0.2-dlq-patch) = 7655
+MD5 (dhcp-3.0.3.tar.gz) = f91416a0b8ed3fd0601688cf0b7df58f
+SIZE (dhcp-3.0.3.tar.gz) = 870240
+MD5 (dhcp-3.0.3-ldap-patch) = c0d51532696222f3258ff19e91a39ce4
+SIZE (dhcp-3.0.3-ldap-patch) = 153377
+MD5 (dhcp-3.0.3-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SIZE (dhcp-3.0.3-dlq-patch) = 7655
diff --git a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist
index acfee5854413..f840cfba6278 100644
--- a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist
+++ b/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist
@@ -1,7 +1,7 @@
---- dhcpctl/Makefile.dist.orig	Mon Apr 28 16:31:57 2003
-+++ dhcpctl/Makefile.dist	Mon Apr 28 16:24:20 2003
-@@ -17,11 +17,11 @@
- # http://www.isc.org for more information.
+--- dhcpctl/Makefile.dist.orig	Thu Mar  3 17:55:23 2005
++++ dhcpctl/Makefile.dist	Mon Jul 25 08:33:33 2005
+@@ -22,11 +22,11 @@
+ #   http://www.isc.org/
  #
  
 -CATMANPAGES = dhcpctl.cat3 omshell.cat1
@@ -15,7 +15,7 @@
  HDRS   = dhcpctl.h
  
  INCLUDES = $(BINDINC) -I$(TOP)/includes
-@@ -29,10 +29,7 @@
+@@ -34,10 +34,7 @@
  DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
  		../omapip/libomapi.a ../dst/libdst.a
  
@@ -27,7 +27,7 @@
  
  cltest:	cltest.o $(DHCPCTLLIBS)
  	$(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
-@@ -43,8 +40,7 @@
+@@ -48,8 +45,7 @@
  	$(RANLIB) libdhcpctl.a
  
  install: all $(CATMANPAGES)
@@ -37,7 +37,7 @@
  	  foo=""; \
  	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
  	    foo=$${foo}/$$bar; \
-@@ -64,16 +60,12 @@
+@@ -69,16 +65,12 @@
  	  $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \
  			$(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \
  	done
@@ -50,12 +50,12 @@
  	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
  
  clean:
--	-rm -f $(OBJ) test.o svtest cltest.o cltest
+-	-rm -f $(OBJ) omshell.o omshell cltest.o cltest
 +	-rm -f $(OBJ) cltest.o cltest
  
  realclean: clean
  	-rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES)
-@@ -82,7 +74,7 @@
+@@ -87,7 +79,7 @@
  	-rm -f Makefile
  
  links:
@@ -64,7 +64,7 @@
  	  if [ ! -b $$foo ]; then \
  	    rm -f $$foo; \
  	  fi; \
-@@ -95,12 +87,5 @@
+@@ -100,12 +92,5 @@
  dhcpctl.man3:	dhcpctl.3
  	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
  		-e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3