From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 13 02:10:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05055106567A for ; Wed, 13 Aug 2008 02:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CB95D8FC16 for ; Wed, 13 Aug 2008 02:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7D2A1WR091130 for ; Wed, 13 Aug 2008 02:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7D2A1p0091129; Wed, 13 Aug 2008 02:10:01 GMT (envelope-from gnats) Resent-Date: Wed, 13 Aug 2008 02:10:01 GMT Resent-Message-Id: <200808130210.m7D2A1p0091129@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B643A106566B for ; Wed, 13 Aug 2008 02:08:28 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id E37DF8FC17 for ; Wed, 13 Aug 2008 02:08:27 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU (dhcp-155.local.ael [192.168.100.155]) by ns.ael.RU (8.14.2/8.14.2/Fluffy/5.2) with ESMTP id m7D28KFd035155 for ; Wed, 13 Aug 2008 13:08:20 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.2/8.14.2/Fluffy/5.4) with ESMTP id m7D28A6t084035 for ; Wed, 13 Aug 2008 13:08:10 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Message-Id: <1218593290.53410@Fluffy.Khv.RU> Date: Wed, 13 Aug 2008 13:08:10 +1100 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/126489: Unbroke sysutils/desktopbsd-tools on 8.0-CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Aug 2008 02:10:02 -0000 >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 + #include + #include ++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800038 ++#include ++#endif + #include + #include + #include 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 /* __FreeBSD_version */ ++ + #include + #include + #include +@@ -86,6 +88,9 @@ + #include + #include + #include ++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800038 ++#include ++#endif + #include + #include + #include --- sysutils::desktopbsd-tools.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: