aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils/desktopbsd-tools
diff options
context:
space:
mode:
authorlme <lme@FreeBSD.org>2008-09-03 23:01:19 +0800
committerlme <lme@FreeBSD.org>2008-09-03 23:01:19 +0800
commit90f5f77aabfe0a1dceaf41a60a8b77e900c9f1ae (patch)
tree9e4ecf34cd5f32ab214656a7c5d1b004ac48a063 /sysutils/desktopbsd-tools
parent9f605751a5f60a8b229bbda9973769d6de052e31 (diff)
downloadfreebsd-ports-gnome-90f5f77aabfe0a1dceaf41a60a8b77e900c9f1ae.tar.gz
freebsd-ports-gnome-90f5f77aabfe0a1dceaf41a60a8b77e900c9f1ae.tar.zst
freebsd-ports-gnome-90f5f77aabfe0a1dceaf41a60a8b77e900c9f1ae.zip
Unbreak on CURRENT
PR: ports/126489 Submitted by: "Dima Panov" <fluffy (AT) fluffy.khv.ru> Approved by: Peter Hofer <ph (AT) desktopbsd.net> (maintainer)
Diffstat (limited to 'sysutils/desktopbsd-tools')
-rw-r--r--sysutils/desktopbsd-tools/Makefile4
-rw-r--r--sysutils/desktopbsd-tools/files/patch-libdesktopbsd-netinterface.cpp12
-rw-r--r--sysutils/desktopbsd-tools/files/patch-libdesktopbsd-wirelessinterface.cpp21
3 files changed, 33 insertions, 4 deletions
diff --git a/sysutils/desktopbsd-tools/Makefile b/sysutils/desktopbsd-tools/Makefile
index 53a4f9d84363..96a84137dce5 100644
--- a/sysutils/desktopbsd-tools/Makefile
+++ b/sysutils/desktopbsd-tools/Makefile
@@ -46,10 +46,6 @@ RUN_DEPENDS+= csup:${PORTSDIR}/net/csup
RUN_DEPENDS+= portsnap:${PORTSDIR}/ports-mgmt/portsnap
.endif
-.if ${OSVERSION} >= 800000
-BROKEN= does not compile
-.endif
-
post-patch:
@${REINPLACE_CMD} -e \
"/Installation/d; /Documentation/d; /InitialConf/d" \
diff --git a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-netinterface.cpp b/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-netinterface.cpp
new file mode 100644
index 000000000000..7b295ab5b001
--- /dev/null
+++ b/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-netinterface.cpp
@@ -0,0 +1,12 @@
+--- libdesktopbsd/netinterface.cpp.orig 2007-07-29 09:36:00.000000000 +1100
++++ libdesktopbsd/netinterface.cpp 2008-07-04 17:00:31.000000000 +1100
+@@ -22,6 +22,9 @@
+ #include <ifaddrs.h>
+ #include <net/route.h>
+ #include <net/if.h>
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800038
++#include <net80211/_ieee80211.h>
++#endif
+ #include <net80211/ieee80211.h>
+ #include <net80211/ieee80211_crypto.h>
+ #include <net80211/ieee80211_ioctl.h>
diff --git a/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-wirelessinterface.cpp b/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-wirelessinterface.cpp
new file mode 100644
index 000000000000..c0a57e0b1ff7
--- /dev/null
+++ b/sysutils/desktopbsd-tools/files/patch-libdesktopbsd-wirelessinterface.cpp
@@ -0,0 +1,21 @@
+--- libdesktopbsd/wirelessinterface.cpp.orig 2007-09-02 21:21:11.000000000 +1100
++++ libdesktopbsd/wirelessinterface.cpp 2008-07-04 17:02:25.000000000 +1100
+@@ -76,6 +76,8 @@
+
+ #include "wirelessinterface.h"
+
++#include <sys/param.h> /* __FreeBSD_version */
++
+ #include <net/ethernet.h>
+ #include <net/if_dl.h>
+ #include <net/if_types.h>
+@@ -86,6 +88,9 @@
+ #include <ifaddrs.h>
+ #include <net/route.h>
+ #include <net/if.h>
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800038
++#include <net80211/_ieee80211.h>
++#endif
+ #include <net80211/ieee80211.h>
+ #include <net80211/ieee80211_crypto.h>
+ #include <net80211/ieee80211_ioctl.h>