Date: Wed, 13 Aug 2008 13:08:10 +1100 From: "Dima Panov" <fluffy@fluffy.khv.ru> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/126489: Unbroke sysutils/desktopbsd-tools on 8.0-CURRENT Message-ID: <1218593290.53410@Fluffy.Khv.RU> Resent-Message-ID: <200808130210.m7D2A1p0091129@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126489
>Category: ports
>Synopsis: Unbroke sysutils/desktopbsd-tools on 8.0-CURRENT
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 13 02:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 8.0-800042-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 8.0-800042-CURRENT #0: Wed Aug 13 09:33:26 VLAST 2008
root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot
>Description:
>How-To-Repeat:
>Fix:
--- sysutils::desktopbsd-tools.diff begins here ---
diff -urN sysutils/desktopbsd-tools.orig/Makefile sysutils/desktopbsd-tools/Makefile
--- sysutils/desktopbsd-tools.orig/Makefile 2008-08-13 12:46:41.000000000 +1100
+++ sysutils/desktopbsd-tools/Makefile 2008-08-13 12:46:47.000000000 +1100
@@ -46,10 +46,6 @@
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 -urN sysutils/desktopbsd-tools.orig/files/patch-libdesktopbsd::netinterface.cpp sysutils/desktopbsd-tools/files/patch-libdesktopbsd::netinterface.cpp
--- sysutils/desktopbsd-tools.orig/files/patch-libdesktopbsd::netinterface.cpp 1970-01-01 10:00:00.000000000 +1000
+++ sysutils/desktopbsd-tools/files/patch-libdesktopbsd::netinterface.cpp 2008-08-13 13:05:13.000000000 +1100
@@ -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 -urN sysutils/desktopbsd-tools.orig/files/patch-libdesktopbsd::wirelessinterface.cpp sysutils/desktopbsd-tools/files/patch-libdesktopbsd::wirelessinterface.cpp
--- sysutils/desktopbsd-tools.orig/files/patch-libdesktopbsd::wirelessinterface.cpp 1970-01-01 10:00:00.000000000 +1000
+++ sysutils/desktopbsd-tools/files/patch-libdesktopbsd::wirelessinterface.cpp 2008-08-13 13:05:28.000000000 +1100
@@ -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>
--- sysutils::desktopbsd-tools.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1218593290.53410>