aboutsummaryrefslogtreecommitdiff
path: root/net/isc-dhcp3-server
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2004-03-22 23:33:09 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2004-03-22 23:33:09 +0000
commitdfb52e90db81466fed9d51232375991c1f099787 (patch)
treec0aa08957885ff2f7de603e7d591a7fbe6240f0c /net/isc-dhcp3-server
parente68206fade20c078a6972582162775c603cee530 (diff)
downloadports-dfb52e90db81466fed9d51232375991c1f099787.tar.gz
ports-dfb52e90db81466fed9d51232375991c1f099787.zip
Notes
Diffstat (limited to 'net/isc-dhcp3-server')
-rw-r--r--net/isc-dhcp3-server/Makefile12
-rw-r--r--net/isc-dhcp3-server/files/patch-client::clparse.c (renamed from net/isc-dhcp3-server/files/extra-patch-client::clparse.c)0
-rw-r--r--net/isc-dhcp3-server/files/patch-client::dhclient.8 (renamed from net/isc-dhcp3-server/files/extra-patch-client::dhclient.8)2
-rw-r--r--net/isc-dhcp3-server/files/patch-client::dhclient.c (renamed from net/isc-dhcp3-server/files/extra-patch-client::dhclient.c)12
-rw-r--r--net/isc-dhcp3-server/files/patch-client::dhclient.conf (renamed from net/isc-dhcp3-server/files/extra-patch-client::dhclient.conf)0
-rw-r--r--net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h9
-rw-r--r--net/isc-dhcp3-server/files/patch-includes::dhcpd.h2
7 files changed, 18 insertions, 19 deletions
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 0e4f63735b4d..291e831481f3 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dhcp
PORTVERSION= 3.0.1.r12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@@ -35,16 +35,6 @@ INSTALL_TARGET= install.${SUBSYS}
SUBSYS?= server
.if ${SUBSYS} == client
-.if ${OSVERSION} >= 502000
-# Include 802.11 patches
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-client::clparse.c \
- ${PATCHDIR}/extra-patch-client::dhclient.8 \
- ${PATCHDIR}/extra-patch-client::dhclient.c \
- ${PATCHDIR}/extra-patch-client::dhclient.conf
-.else
-# 4.x doesn't support interface polling
-WITHOUT_INTERFACE_POLLING= Unsupported
-.endif
MAN5= dhclient.conf.5 dhclient.leases.5
MAN8= dhclient.8 dhclient-script.8
.elif ${SUBSYS} == server
diff --git a/net/isc-dhcp3-server/files/extra-patch-client::clparse.c b/net/isc-dhcp3-server/files/patch-client::clparse.c
index 4140cc6e3109..4140cc6e3109 100644
--- a/net/isc-dhcp3-server/files/extra-patch-client::clparse.c
+++ b/net/isc-dhcp3-server/files/patch-client::clparse.c
diff --git a/net/isc-dhcp3-server/files/extra-patch-client::dhclient.8 b/net/isc-dhcp3-server/files/patch-client::dhclient.8
index 454b1e6786d9..a602907c31b6 100644
--- a/net/isc-dhcp3-server/files/extra-patch-client::dhclient.8
+++ b/net/isc-dhcp3-server/files/patch-client::dhclient.8
@@ -6,7 +6,7 @@
.\"
+.\" Portions copyright (c) 2000 David E. O'Brien.
+.\" All rights reserved.
-+.\" $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp3-server/files/Attic/extra-patch-client::dhclient.8,v 1.1 2004-03-22 00:41:59 des Exp $
++.\" $FreeBSD$
+.\"
.TH dhclient 8
.SH NAME
diff --git a/net/isc-dhcp3-server/files/extra-patch-client::dhclient.c b/net/isc-dhcp3-server/files/patch-client::dhclient.c
index 6ad84bfa9e13..27cef99162df 100644
--- a/net/isc-dhcp3-server/files/extra-patch-client::dhclient.c
+++ b/net/isc-dhcp3-server/files/patch-client::dhclient.c
@@ -4,7 +4,7 @@
#include "dhcpd.h"
#include "version.h"
-+#ifdef __FreeBSD__
++#if __FreeBSD_version > 502010
+#include <sys/ioctl.h>
+#include <net/if_media.h>
+#include <net80211/ieee80211_ioctl.h>
@@ -63,7 +63,7 @@
argv [i], (long)strlen (argv [i]));
- strcpy (tmp -> name, argv [i]);
+ strlcpy (tmp -> name, argv [i], IFNAMSIZ);
-+#ifdef __FreeBSD__
++#if __FreeBSD_version > 502010
+ set_ieee80211 (tmp);
+#endif
+ /* Init some interface vars, enable polling */
@@ -79,7 +79,7 @@
INTERFACE_AUTOMATIC)) !=
INTERFACE_REQUESTED))
continue;
-+#ifdef __FreeBSD__
++#if __FreeBSD_version > 502010
+ set_ieee80211 (ip);
+#endif
+#ifdef ENABLE_POLLING_MODE
@@ -285,7 +285,7 @@
+/* Check to see if there's a wire plugged in */
+int
+interface_active(struct interface_info *ip) {
-+#ifdef __FreeBSD__
++#if __FreeBSD_version > 502010
+ struct ifmediareq ifmr;
+ int *media_list, i;
+ char *ifname;
@@ -350,7 +350,7 @@
+ return (HAVELINK);
+}
+
-+#ifdef __FreeBSD__
++#if __FreeBSD_version > 502010
+void
+set_ieee80211 (struct interface_info *ip) {
+
@@ -385,7 +385,7 @@
+ }
+ close (sock);
+ }
-+#endif /* __FreeBSD__ */
++#endif /* __FreeBSD_version */
+
+#ifdef ENABLE_POLLING_MODE
+/* Go to background after some time */
diff --git a/net/isc-dhcp3-server/files/extra-patch-client::dhclient.conf b/net/isc-dhcp3-server/files/patch-client::dhclient.conf
index 2d9560f43bf8..2d9560f43bf8 100644
--- a/net/isc-dhcp3-server/files/extra-patch-client::dhclient.conf
+++ b/net/isc-dhcp3-server/files/patch-client::dhclient.conf
diff --git a/net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h
index 8fe1b6ef93a0..9a3f4c636b09 100644
--- a/net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h
+++ b/net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h
@@ -1,5 +1,14 @@
--- includes/cf/freebsd.h.orig Wed Mar 3 02:32:39 2004
+++ includes/cf/freebsd.h Wed Mar 3 02:31:56 2004
+@@ -42,7 +42,7 @@
+ */
+
+ #include <syslog.h>
+-#include <sys/types.h>
++#include <sys/param.h>
+ #include <string.h>
+ #include <paths.h>
+ #include <errno.h>
@@ -101,6 +101,10 @@
#define SOCKLEN_T int
#endif
diff --git a/net/isc-dhcp3-server/files/patch-includes::dhcpd.h b/net/isc-dhcp3-server/files/patch-includes::dhcpd.h
index afedaa818647..1933e0b4037a 100644
--- a/net/isc-dhcp3-server/files/patch-includes::dhcpd.h
+++ b/net/isc-dhcp3-server/files/patch-includes::dhcpd.h
@@ -47,7 +47,7 @@
void state_stop PROTO ((void *));
void state_panic PROTO ((void *));
+
-+#ifdef __FreeBSD__
++#if __FreeBSD_version > 502010
+void set_ieee80211 PROTO ((struct interface_info *));
+#endif
+int interface_active PROTO ((struct interface_info *));