Subject: pkg/27248: patch for net/slurm (0.3.1 -> 0.3.3)
To: None <gnats-bugs@gnats.NetBSD.org>
From: Krüger <skrueger@meinberlikomm.de>
List: pkgsrc-bugs
Date: 10/13/2004 12:07:56
>Number: 27248
>Category: pkg
>Synopsis: new version of slurm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Oct 13 10:09:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator: Stefan Krüger
>Release: NetBSD 2.99.9
>Organization:
>Environment:
System: NetBSD dsl-62-220-19-152.berlikomm.net 2.99.9 NetBSD 2.99.9 (PLUTO) #1: Fri Oct 8 15:02:08 CEST 2004 space7@dsl-217-9-35-108.berlikomm.net:/usr/obj/cvsroot/src/sys/arch/i386/compile/PLUTO i386
Architecture: i386
Machine: i386
>Description:
slurm in pkgsrc is quite old, newest is 0.3.3, also it seems like all
patches (+ the post-patch in Makefile) aren't needed anymore :-)
ChangeLog (0.3.1 -> 0.3.3):
- tag SLURM-0_3_3
2004-10-12 Hendrik Scholz <hscholz@raisdorf.net>
* Makefile:
* config.guess:
* config.sub:
- update config.* to allow configure run on DragonFly BSD (i386 only)
2004-09-28 Hendrik Scholz <hscholz@raisdorf.net>
* Makefile:
* configure:
* configure.in:
bump to VERSION 0.3.3
2004-09-28 Hendrik Scholz <hscholz@raisdorf.net>
* README: minor OS updates
* os.h: allow compilation on Sun Forte CC systems again
* slurm.c: (main):
* theme.c: (theme_readfile): remove NOTICE error
* themes/black.theme: new theme
2004-09-27 Hendrik Scholz <hscholz@raisdorf.net>
* src/if_media.c: (get_if_speed):
- use better CPP magic to detect OS features
- allow compilation on a few OpenBSD systems again
2004-05-27 Hendrik Scholz <hscholz@raisdorf.net>
* .cvsignore:
* os.h:
* src/if_media.c: (get_if_speed):
- add validinterface() check on Mac OS X
2004-02-13 Hendrik Scholz <hscholz@raisdorf.net>
* Makefile:
* Makefile.in:
* aclocal.m4:
* config.h.in:
* configure:
* configure.in:
* slurm.c: (usage):
* slurm.h:
- remove version name from OS for 'darwin' aka Mac OS X
- s/VERSION/PACKAGE_VERSION/
2004-02-13 Hendrik Scholz <hscholz@wormulon.net>
* AUTHORS:
* COPYING:
* Changelog:
* INSTALL:
* Makefile:
* Makefile.am:
* Makefile.in:
* THEMES:
* THEMES.txt:
* aclocal.m4:
* config.guess:
* config.h.in:
* config.sub:
* configure:
* configure.in:
* depcomp:
* install-sh:
* missing:
* mkinstalldirs:
- major config subsystem replacement
- mv THEMES THEMES.txt (welcome to Mac OS X :))
2004-02-05 Hendrik Scholz <hscholz@wormulon.net>
* src/if_media.c: (get_if_speed):
- add support for pre 4.5-RELEASE FreeBSD (tested on 4.2-REL :))
2004-02-05 Hendrik Scholz <hscholz@wormulon.net>
* 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
2004-02-05 Hendrik Scholz <hscholz@raisdorf.net>
* Makefile:
* Makefile.in: add -DWITH_LED per default
* slurm.c: (update_stat_large), (update_stat_split),
(update_stat_combined), (usage), (draw_face), (main):
* slurm.h:
- add -L switch to enable LED
2003-10-07 Hendrik Scholz <hscholz@raisdorf.net>
* Makefile:
* Makefile.in:
* theme.c: (theme_readfile):
- reduce overhead in upcoming NetBSD port upgrade
2003-09-18 Hendrik Scholz <hscholz@raisdorf.net>
* TODO: upd
* slurm.spec: initial specfile based on 0.2.3
>How-To-Repeat:
slurm -h
>Fix:
diff -uNr slurm.old/Makefile slurm/Makefile
--- slurm.old/Makefile 2004-10-13 11:43:21.000000000 +0200
+++ slurm/Makefile 2004-10-13 11:52:54.000000000 +0200
@@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.7 2004/10/03 00:17:58 tv 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 @@
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 -uNr slurm.old/PLIST slurm/PLIST
--- slurm.old/PLIST 2004-10-13 11:43:21.000000000 +0200
+++ slurm/PLIST 2004-10-13 11:53:02.000000000 +0200
@@ -1,6 +1,7 @@
@comment $NetBSD: PLIST,v 1.2 2003/10/16 12:54:14 cube Exp $
bin/slurm
man/man1/slurm.1
+share/slurm/black.theme
share/slurm/blue.theme
share/slurm/cyan.theme
share/slurm/foo.theme
diff -uNr slurm.old/distinfo slurm/distinfo
--- slurm.old/distinfo 2004-10-13 11:43:21.000000000 +0200
+++ slurm/distinfo 2004-10-13 11:47:07.000000000 +0200
@@ -1,8 +1,4 @@
$NetBSD: distinfo,v 1.2 2003/10/16 12:54:14 cube 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 -uNr slurm.old/patches/CVS/Entries slurm/patches/CVS/Entries
--- slurm.old/patches/CVS/Entries 2004-10-13 11:43:21.000000000 +0200
+++ slurm/patches/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-/patch-ac/1.1/Thu Oct 16 12:55:02 2003//
-/patch-ad/1.1/Thu Oct 16 12:55:02 2003//
-/patch-ae/1.1/Thu Oct 16 12:55:02 2003//
-/patch-af/1.1/Thu Oct 16 12:55:02 2003//
-D
diff -uNr slurm.old/patches/CVS/Repository slurm/patches/CVS/Repository
--- slurm.old/patches/CVS/Repository 2004-10-13 11:43:21.000000000 +0200
+++ slurm/patches/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-pkgsrc/net/slurm/patches
diff -uNr slurm.old/patches/CVS/Root slurm/patches/CVS/Root
--- slurm.old/patches/CVS/Root 2004-10-13 11:43:21.000000000 +0200
+++ slurm/patches/CVS/Root 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-anoncvs@anoncvs.netbsd.org:/cvsroot
diff -uNr slurm.old/patches/patch-ac slurm/patches/patch-ac
--- slurm.old/patches/patch-ac 2004-10-13 11:43:21.000000000 +0200
+++ slurm/patches/patch-ac 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr slurm.old/patches/patch-ad slurm/patches/patch-ad
--- slurm.old/patches/patch-ad 2004-10-13 11:43:21.000000000 +0200
+++ slurm/patches/patch-ad 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr slurm.old/patches/patch-ae slurm/patches/patch-ae
--- slurm.old/patches/patch-ae 2004-10-13 11:43:21.000000000 +0200
+++ slurm/patches/patch-ae 1970-01-01 01:00:00.000000000 +0100
@@ -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 -uNr slurm.old/patches/patch-af slurm/patches/patch-af
--- slurm.old/patches/patch-af 2004-10-13 11:43:21.000000000 +0200
+++ slurm/patches/patch-af 1970-01-01 01:00:00.000000000 +0100
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: