From nobody@FreeBSD.org  Fri Sep 25 09:33:48 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49CB51065679
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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" <h.skuhra@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] Unbreak net/slurm on >= 800045
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         139128
>Category:       ports
>Synopsis:       [PATCH] Unbreak net/slurm on >= 800045
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 25 09:40:01 UTC 2009
>Closed-Date:    Tue Oct 20 17:12:08 UTC 2009
>Last-Modified:  Tue Oct 20 17:20:01 UTC 2009
>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 <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800045
-BROKEN=		does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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 <net/if_media.h>
+ #include <net/if_mib.h>
+ #include <arpa/inet.h>
+-#ifndef __DragonFly__
+-#include <net/ppp_defs.h>
+-#include <net/if_ppp.h>
+-#endif
+ #elif __NetBSD__            /* N E T B S D */
+ #include <stdio.h>
+ #include <sys/param.h>


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mich 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Sep 25 09:40:11 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139128 
State-Changed-From-To: open->closed 
State-Changed-By: mich 
State-Changed-When: Tue Oct 20 17:11:49 UTC 2009 
State-Changed-Why:  
Committed thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139128 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139128: commit references a PR
Date: Tue, 20 Oct 2009 17:11:29 +0000 (UTC)

 mich        2009-10-20 17:11:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/slurm            Makefile 
   Added files:
     net/slurm/files      patch-os.h 
   Log:
   - Unbreak on FreeBSD 8x
   
   PR:                     ports/139128
   Submitted by:           Herbert J. Skuhra <h.skuhra@gmail.com>
   
   Revision  Changes    Path
   1.20      +1 -7      ports/net/slurm/Makefile
   1.1       +13 -0     ports/net/slurm/files/patch-os.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
