From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 25 09:40:01 2009 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 C4D531065670 for ; Fri, 25 Sep 2009 09:40:01 +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 A20928FC17 for ; Fri, 25 Sep 2009 09:40:01 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8P9e128092237 for ; Fri, 25 Sep 2009 09:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8P9e1vi092236; Fri, 25 Sep 2009 09:40:01 GMT (envelope-from gnats) Resent-Date: Fri, 25 Sep 2009 09:40:01 GMT Resent-Message-Id: <200909250940.n8P9e1vi092236@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, "Herbert J. Skuhra" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49CB51065679 for ; Fri, 25 Sep 2009 09:33:48 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 398E08FC08 for ; Fri, 25 Sep 2009 09:33:48 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n8P9XlPX049155 for ; Fri, 25 Sep 2009 09:33:47 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n8P9XlIR049154; Fri, 25 Sep 2009 09:33:47 GMT (envelope-from nobody) Message-Id: <200909250933.n8P9XlIR049154@www.freebsd.org> Date: Fri, 25 Sep 2009 09:33:47 GMT From: "Herbert J. Skuhra" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/139128: [PATCH] Unbreak net/slurm on >= 800045 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: Fri, 25 Sep 2009 09:40:01 -0000 >Number: 139128 >Category: ports >Synopsis: [PATCH] Unbreak net/slurm on >= 800045 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 25 09:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Herbert J. Skuhra >Release: FreeBSD 8.0-RC1 i386 >Organization: >Environment: FreeBSD localhost 8.0-RC1 FreeBSD 8.0-RC1 #0 r197392: Mon Sep 21 21:19:31 CEST 2009 root@localhost:/usr/obj/usr/src/sys/PC1 i386 >Description: Unbreak by removing net/if_ppp.h and net/ppp_defs.h from os.h. The included header files are not required and no code is used from it. The port builds/works fine without them.Tested on releng_7 and releng_8. Comment from slurm.c: --- I ripped of the ppp dependend parts and the email checks to turn in into a generic network load monitor running on all common Unices. --- >How-To-Repeat: >Fix: Patch attached. Patch attached with submission follows: diff -ruN net/slurm.orig/Makefile net/slurm/Makefile --- net/slurm.orig/Makefile 2009-06-11 10:16:23.000000000 +0200 +++ net/slurm/Makefile 2009-09-25 03:13:29.000000000 +0200 @@ -35,10 +35,4 @@ ${INSTALL_DATA} ${WRKSRC}/FAQ ${DOCSDIR} .endif -.include - -.if ${OSVERSION} >= 800045 -BROKEN= does not build -.endif - -.include +.include diff -ruN net/slurm.orig/files/patch-os.h net/slurm/files/patch-os.h --- net/slurm.orig/files/patch-os.h 1970-01-01 01:00:00.000000000 +0100 +++ net/slurm/files/patch-os.h 2009-09-25 03:12:56.000000000 +0200 @@ -0,0 +1,13 @@ +--- os.h.orig 2009-09-25 02:57:02.000000000 +0200 ++++ os.h 2009-09-25 03:06:20.000000000 +0200 +@@ -92,10 +92,6 @@ + #include + #include + #include +-#ifndef __DragonFly__ +-#include +-#include +-#endif + #elif __NetBSD__ /* N E T B S D */ + #include + #include >Release-Note: >Audit-Trail: >Unformatted: