Date: Fri, 25 Sep 2009 09:33:47 GMT From: "Herbert J. Skuhra" <h.skuhra@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/139128: [PATCH] Unbreak net/slurm on >= 800045 Message-ID: <200909250933.n8P9XlIR049154@www.freebsd.org> Resent-Message-ID: <200909250940.n8P9e1vi092236@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909250933.n8P9XlIR049154>