Index: head/net/slurm/Makefile =================================================================== --- head/net/slurm/Makefile (revision 484391) +++ head/net/slurm/Makefile (revision 484392) @@ -1,30 +1,33 @@ # Created by: Michael L. Hostbaek (mich@freebsdcluster.org) # $FreeBSD$ PORTNAME= slurm PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.wormulon.net/files/slurm/ \ http://www.raisdorf.net/files/slurm/ MAINTAINER= mich@FreeBSD.org COMMENT= Generic network load monitor + +LICENSE= GPLv2+ LDFLAGS+= -lncurses GNU_CONFIGURE= yes CONFIGURE_ARGS= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS do-install: ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/themes/* ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/KEYS ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/FAQ ${STAGEDIR}${DOCSDIR} .include Index: head/net/slurm/files/patch-os.h =================================================================== --- head/net/slurm/files/patch-os.h (revision 484391) +++ head/net/slurm/files/patch-os.h (revision 484392) @@ -1,13 +1,13 @@ ---- os.h.orig 2009-09-25 02:57:02.000000000 +0200 -+++ os.h 2009-09-25 03:06:20.000000000 +0200 +--- os.h.orig 2004-10-12 19:55:58 UTC ++++ os.h @@ -92,10 +92,6 @@ #include #include #include -#ifndef __DragonFly__ -#include -#include -#endif #elif __NetBSD__ /* N E T B S D */ #include #include Index: head/net/slurm/files/patch-src_if__media.c =================================================================== --- head/net/slurm/files/patch-src_if__media.c (revision 484391) +++ head/net/slurm/files/patch-src_if__media.c (revision 484392) @@ -1,16 +1,39 @@ ---- src/if_media.c.orig +--- src/if_media.c.orig 2004-09-27 13:08:59 UTC +++ src/if_media.c -@@ -95,8 +95,13 @@ +@@ -95,8 +95,13 @@ int get_if_speed (char *ifstring) * */ +#if __FreeBSD__ >= 2 + type = IFM_TYPE(ifmr.ifm_active); + physical = IFM_SUBTYPE(ifmr.ifm_active); +#else type = ifmr.ifm_active & 0xf0; physical = ifmr.ifm_active & 0x0f; +#endif #ifdef MEDIADEBUG printf(" all: %6d\n", ifmr.ifm_current); +@@ -160,22 +165,6 @@ int get_if_speed (char *ifstring) + break; + } /* end switch physical */ + break; +- /* FDDI interfaces */ +- /* fpa doesn't seem to support SIOCGIFMEDIA on FreeBSD +- * so we won't get here but anyway ... +- */ +- case IFM_FDDI: +- switch (physical) +- { +- case IFM_FDDI_SMF: +- case IFM_FDDI_MMF: +- case IFM_FDDI_UTP: +- speed = 100 * 1000; +- break; +- default: +- speed = ERR_IFACE_NO_SPEED; +- } +- break; + #if WIRELESS + /* IEEE 802.11 wireless interfaces */ + case IFM_IEEE80211: