From 4e71c1874aeca19fc6bcb2df906d574edc4432ff Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 14 Oct 2004 16:27:17 +0000 Subject: Update slurm to version 0.3.3. Addresses PR#27248. Changes include: * update config.* to allow configure run on DragonFly BSD (i386 only) * README: minor OS updates * os.h: allow compilation on Sun Forte CC systems again * theme.c: (theme_readfile): remove NOTICE error * themes/black.theme: new theme * use better CPP magic to detect OS features * allow compilation on a few OpenBSD systems again * add validinterface() check on Mac OS X * remove version name from OS for 'darwin' aka Mac OS X * s/VERSION/PACKAGE_VERSION/ * major config subsystem replacement * mv THEMES THEMES.txt (welcome to Mac OS X :)) * add support for pre 4.5-RELEASE FreeBSD (tested on 4.2-REL :)) * FAQ: added Linux media Q/A * README: s/raisdorf/wormulon/ * slurm.1: s/raisdorf/wormulon/, added -L option * slurm.c: (slurm_shutdown): s/raisdorf/wormulon/ * slurm.spec: s/raisdorf/wormulon/ * theme.c: (theme_readfile): added -D__Debian__ to search for themes in /usr/share rather than /usr/local/share * add -L switch to enable LED * reduce overhead in upcoming NetBSD port upgrade * slurm.spec: initial specfile based on 0.2.3 --- net/slurm/Makefile | 13 +++---- net/slurm/PLIST | 3 +- net/slurm/distinfo | 10 ++---- net/slurm/patches/patch-ac | 13 ------- net/slurm/patches/patch-ad | 86 ---------------------------------------------- net/slurm/patches/patch-ae | 13 ------- net/slurm/patches/patch-af | 16 --------- 7 files changed, 9 insertions(+), 145 deletions(-) delete mode 100644 net/slurm/patches/patch-ac delete mode 100644 net/slurm/patches/patch-ad delete mode 100644 net/slurm/patches/patch-ae delete mode 100644 net/slurm/patches/patch-af (limited to 'net/slurm') diff --git a/net/slurm/Makefile b/net/slurm/Makefile index 6584c8c8c22..c7e146a3636 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2004/10/03 00:17:58 tv Exp $ +# $NetBSD: Makefile,v 1.8 2004/10/14 16:27:17 ben Exp $ # -DISTNAME= slurm-0.3.1 -PKGREVISION= 1 +DISTNAME= slurm-0.3.3 CATEGORIES= net -MASTER_SITES= http://www.raisdorf.net/files/code/ +MASTER_SITES= http://www.raisdorf.net/files/slurm/ MAINTAINER= mail@eckigesauge.de HOMEPAGE= http://www.raisdorf.net/projects/slurm/ @@ -13,15 +12,11 @@ COMMENT= Realtime traffic statistics USE_BUILDLINK3= YES GNU_CONFIGURE= YES -post-patch: - ${SED} -e s,@PREFIX@,${PREFIX}, ${WRKSRC}/theme.c > ${WRKSRC}/theme.c.sed - ${MV} ${WRKSRC}/theme.c.sed ${WRKSRC}/theme.c - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/slurm - for theme in blue cyan foo; do \ + for theme in black blue cyan foo; do \ ${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme ${PREFIX}/share/slurm ; \ done diff --git a/net/slurm/PLIST b/net/slurm/PLIST index 5bb1d6e464d..4f98f619ffb 100644 --- a/net/slurm/PLIST +++ b/net/slurm/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2003/10/16 12:54:14 cube Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/10/14 16:27:17 ben Exp $ bin/slurm man/man1/slurm.1 +share/slurm/black.theme share/slurm/blue.theme share/slurm/cyan.theme share/slurm/foo.theme diff --git a/net/slurm/distinfo b/net/slurm/distinfo index bcaa96657cb..a3f04b07bb2 100644 --- a/net/slurm/distinfo +++ b/net/slurm/distinfo @@ -1,8 +1,4 @@ -$NetBSD: distinfo,v 1.2 2003/10/16 12:54:14 cube Exp $ +$NetBSD: distinfo,v 1.3 2004/10/14 16:27:17 ben Exp $ -SHA1 (slurm-0.3.1.tar.gz) = abadde89e6d9e0f2dca93a8354fbc7897ad1c94d -Size (slurm-0.3.1.tar.gz) = 56048 bytes -SHA1 (patch-ac) = 5d5e33fd86aba5bdc54f796f3a5a5f907b984690 -SHA1 (patch-ad) = d31b180812456273c24f8d0296346ea015e387d2 -SHA1 (patch-ae) = 3b4de7ee286fbe776cf92ca731183bcfe8f0a616 -SHA1 (patch-af) = 5f2ec69b4153a565b7b9c3400b406c516e271de8 +SHA1 (slurm-0.3.3.tar.gz) = 232a7f28ec3457b2e9d554ed844a45642dea1cc5 +Size (slurm-0.3.3.tar.gz) = 122839 bytes diff --git a/net/slurm/patches/patch-ac b/net/slurm/patches/patch-ac deleted file mode 100644 index 06adca49c29..00000000000 --- a/net/slurm/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/10/16 12:55:02 cube Exp $ - ---- configure.in.orig 2003-09-08 23:23:22.000000000 +0200 -+++ configure.in -@@ -30,7 +30,7 @@ AC_SUBST(VERSION) - AC_CHECK_LIB(kstat, kstat_open, SOLLIBS="-lkstat -lsocket", SOLLIBS="") - AC_SUBST(SOLLIBS) - --AC_CHECK_LIB(ncurses, initscr, LIBS="$LIBS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES", AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; echo "NO TRANSPARENCY SUPPORT (install ncurses if you want it)!")) -+AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES", AC_CHECK_LIB(ncurses, initscr, LIBS="$LIBS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; echo "NO TRANSPARENCY SUPPORT (install ncurses if you want it)!")) - AC_CHECK_LIB(fridge, vanilla_coke, echo "WTF?!", echo "Warning: No vanilla coke found in fridge.";echo "We highly suggest that you rectify this situation immediatly.") - - AC_CONFIG_HEADER(config.h) diff --git a/net/slurm/patches/patch-ad b/net/slurm/patches/patch-ad deleted file mode 100644 index 3ddb1be795d..00000000000 --- a/net/slurm/patches/patch-ad +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2003/10/16 12:55:02 cube Exp $ - ---- configure.orig 2003-09-08 23:23:21.000000000 +0200 -+++ configure -@@ -4009,13 +4009,13 @@ fi - - - --echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 --echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 --if test "${ac_cv_lib_ncurses_initscr+set}" = set; then -+echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5 -+echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 -+if test "${ac_cv_lib_curses_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lncurses $LIBS" -+LIBS="-lcurses $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -4053,27 +4053,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_ncurses_initscr=yes -+ ac_cv_lib_curses_initscr=yes - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --ac_cv_lib_ncurses_initscr=no -+ac_cv_lib_curses_initscr=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5 --echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6 --if test $ac_cv_lib_ncurses_initscr = yes; then -- LIBS="$LIBS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES" -+echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5 -+echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 -+if test $ac_cv_lib_curses_initscr = yes; then -+ LIBS="$LIBS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES" - else -- echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5 --echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 --if test "${ac_cv_lib_curses_initscr+set}" = set; then -+ echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 -+echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 -+if test "${ac_cv_lib_ncurses_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lcurses $LIBS" -+LIBS="-lncurses $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -4111,19 +4111,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_curses_initscr=yes -+ ac_cv_lib_ncurses_initscr=yes - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --ac_cv_lib_curses_initscr=no -+ac_cv_lib_ncurses_initscr=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5 --echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 --if test $ac_cv_lib_curses_initscr = yes; then -- LIBS="$LIBS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; echo "NO TRANSPARENCY SUPPORT (install ncurses if you want it)!" -+echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5 -+echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6 -+if test $ac_cv_lib_ncurses_initscr = yes; then -+ LIBS="$LIBS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; echo "NO TRANSPARENCY SUPPORT (install ncurses if you want it)!" - fi - - fi diff --git a/net/slurm/patches/patch-ae b/net/slurm/patches/patch-ae deleted file mode 100644 index 80d250de340..00000000000 --- a/net/slurm/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/10/16 12:55:02 cube Exp $ - ---- theme.c.orig 2003-07-09 18:45:37.000000000 +0200 -+++ theme.c -@@ -69,7 +69,7 @@ int theme_readfile(theme *t, char *name) - if ((f = fopen(filename, "r")) == NULL) - { - bzero(&filename, BUFSIZ); -- snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name); -+ snprintf(filename, BUFSIZ, "@PREFIX@/share/slurm/%s.theme", name); - if ((f = fopen(filename, "r")) == NULL) - error(ERR_FATAL, "cannot find theme '%s'", name); - } diff --git a/net/slurm/patches/patch-af b/net/slurm/patches/patch-af deleted file mode 100644 index 085c3a659d0..00000000000 --- a/net/slurm/patches/patch-af +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-af,v 1.1 2003/10/16 12:55:02 cube Exp $ - ---- Makefile.in.orig 2003-09-08 23:23:21.000000000 +0200 -+++ Makefile.in -@@ -7,9 +7,9 @@ LDFLAGS = @LDFLAGS@ - all: slurm-bin - - slurm-bin: slurm.c -- $(CC) $(CFLAGS) -DVERSION='$(VERSION)' slurm.c $(LIBS) -o slurm -+ $(CC) $(CFLAGS) $(LDFLAGS) -DVERSION='$(VERSION)' slurm.c $(LIBS) -o slurm - debug: slurm.c -- $(CC) $(CFLAGS) -Wall -DVERSION='$(VERSION)' slurm.c $(LIBS) -o slurm -+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -DVERSION='$(VERSION)' slurm.c $(LIBS) -o slurm - - clean: - rm -f slurm slurm.o src/*.o -- cgit v1.2.3