summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/amanda-common/Makefile.common6
-rw-r--r--sysutils/gentoo/Makefile4
-rw-r--r--sysutils/gentoo/PLIST3
-rw-r--r--sysutils/gentoo/distinfo6
-rw-r--r--sysutils/gkrellm/buildlink.mk34
-rw-r--r--sysutils/grub/Makefile27
-rw-r--r--sysutils/grub/PLIST6
-rw-r--r--sysutils/grun/Makefile6
-rw-r--r--sysutils/ups-nut-cgi/DESCR2
-rw-r--r--sysutils/ups-nut-cgi/Makefile7
-rw-r--r--sysutils/ups-nut-cgi/distinfo12
-rw-r--r--sysutils/ups-nut-cgi/patches/patch-aa13
-rw-r--r--sysutils/ups-nut-cgi/patches/patch-ad20
-rw-r--r--sysutils/ups-nut-cgi/patches/patch-ae40
-rw-r--r--sysutils/ups-nut/MESSAGE6
-rw-r--r--sysutils/ups-nut/Makefile19
-rw-r--r--sysutils/ups-nut/PLIST58
-rw-r--r--sysutils/ups-nut/distinfo9
-rw-r--r--sysutils/ups-nut/patches/patch-aa11
-rw-r--r--sysutils/ups-nut/patches/patch-ac18
-rw-r--r--sysutils/xps/Makefile5
21 files changed, 201 insertions, 111 deletions
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 0414576fccb..cac8d19c4cd 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2001/10/19 09:44:10 veego Exp $
+# $NetBSD: Makefile.common,v 1.6.2.1 2002/08/25 21:21:20 jlam Exp $
#
# common make file fragment shared by all amanda-* pkgs.
#
@@ -7,6 +7,8 @@
AMANDA_GROUP?= operator
.elif ${OPSYS} == "SunOS"
AMANDA_GROUP?= sysadmin
+.elif ${OPSYS} == "Darwin"
+AMANDA_GROUP?= operator
.endif
AMANDA_USER?= backup
@@ -16,6 +18,8 @@ BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB AMANDA_VAR
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
+CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config/config.guess
+CONFIG_SUB_OVERRIDE= ${WRKSRC}/config/config.sub
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-user=${AMANDA_USER}
diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile
index 33b232b72f5..60ff57ae6a8 100644
--- a/sysutils/gentoo/Makefile
+++ b/sysutils/gentoo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3.2.1 2002/06/30 06:24:14 jlam Exp $
+# $NetBSD: Makefile,v 1.3.2.2 2002/08/25 21:21:21 jlam Exp $
#
-DISTNAME= gentoo-0.11.22
+DISTNAME= gentoo-0.11.31
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gentoo/}
diff --git a/sysutils/gentoo/PLIST b/sysutils/gentoo/PLIST
index 0d7e5fccabb..e1c860d5e3c 100644
--- a/sysutils/gentoo/PLIST
+++ b/sysutils/gentoo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/29 12:37:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/08/25 21:21:22 jlam Exp $
bin/gentoo
etc/gentoogtkrc
etc/gentoorc
@@ -125,5 +125,6 @@ share/gentoo/icons/xbm2.xpm
share/gentoo/icons/xcf.xpm
share/gentoo/icons/xpm.xpm
share/gentoo/icons/xpm2.xpm
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gentoo.mo
@dirrm share/gentoo/icons
@dirrm share/gentoo
diff --git a/sysutils/gentoo/distinfo b/sysutils/gentoo/distinfo
index d9829ea161c..7d211d6f150 100644
--- a/sysutils/gentoo/distinfo
+++ b/sysutils/gentoo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/03/15 13:28:49 wiz Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:21:22 jlam Exp $
-SHA1 (gentoo-0.11.22.tar.gz) = 32d0c95c7b6a296df6d73dfa73525d471dfe6b15
-Size (gentoo-0.11.22.tar.gz) = 728502 bytes
+SHA1 (gentoo-0.11.31.tar.gz) = 327b6241613e4c5ae256dffa528c6f2f46fe60b0
+Size (gentoo-0.11.31.tar.gz) = 923857 bytes
SHA1 (patch-ae) = 63d3a848f084fd1355b25102e10cbe3c94a45445
diff --git a/sysutils/gkrellm/buildlink.mk b/sysutils/gkrellm/buildlink.mk
new file mode 100644
index 00000000000..966be31b84f
--- /dev/null
+++ b/sysutils/gkrellm/buildlink.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink.mk,v 1.2.2.2 2002/08/25 21:21:24 jlam Exp $
+#
+# This Makefile fragment is included by packages that use gkrellm.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gkrellm to the dependency pattern
+# for the version of gkrellm desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+# search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+# path.
+
+.if !defined(GKRELLM_BUILDLINK_MK)
+GKRELLM_BUILDLINK_MK= # defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gkrellm?= gkrellm>=1.2.11nb1
+DEPENDS+= ${BUILDLINK_DEPENDS.gkrellm}:../../sysutils/gkrellm
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gkrellm=gkrellm
+BUILDLINK_PREFIX.gkrellm_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gkrellm+= include/gkrellm/gkrellm.h
+BUILDLINK_FILES.gkrellm+= include/gkrellm/gkrellm_public_proto.h
+
+BUILDLINK_TARGETS.gkrellm= gkrellm-buildlink
+BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gkrellm}
+
+pre-configure: ${BUILDLINK_TARGETS}
+gkrellm-buildlink: _BUILDLINK_USE
+
+.endif # GKRELLM_BUILDLINK_MK
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index bd73b0a8186..dd274573727 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6.2.2 2002/06/30 06:24:14 jlam Exp $
+# $NetBSD: Makefile,v 1.6.2.3 2002/08/25 21:21:25 jlam Exp $
#
DISTNAME= grub-0.92
CATEGORIES= sysutils
MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
-MAINTAINER= jgoerzen@complete.org
+MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.gnu.org/software/grub/
COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2
@@ -15,6 +15,29 @@ GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_BUILDLINK2= YES
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GRUB_NETWORK_CARDS)
+BUILD_DEFS+= GRUB_NETWORK_CARDS
+CONFIGURE_ARGS+= --enable-diskless
+PLIST_SUBST+= NETBOOT=
+
+.for GRUB_NETWORK_CARD in ${GRUB_NETWORK_CARDS}
+CONFIGURE_ARGS+= --enable-${GRUB_NETWORK_CARD}
+.endfor
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub
+ ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \
+ ${PREFIX}/share/doc/grub
+.else
+PLIST_SUBST+= NETBOOT="@comment "
+.endif
+
+.if defined(GRUB_SCAN_ARGS)
+CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
+.endif
+
.include "../../devel/binutils/buildlink2.mk"
.include "../../devel/ncurses/buildlink2.mk"
diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST
index 9fe13ba3c5a..d453f890bb4 100644
--- a/sysutils/grub/PLIST
+++ b/sysutils/grub/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/11 19:53:25 magick Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/08/25 21:21:25 jlam Exp $
bin/mbchk
@unexec install-info --delete --info-dir=%D/info %D/info/grub.info
info/grub.info
@@ -14,11 +14,14 @@ man/man8/grub.8
sbin/grub
sbin/grub-install
sbin/grub-md5-crypt
+${NETBOOT}share/doc/grub/README.netboot
share/grub/${MACHINE_ARCH}-/e2fs_stage1_5
share/grub/${MACHINE_ARCH}-/fat_stage1_5
share/grub/${MACHINE_ARCH}-/ffs_stage1_5
share/grub/${MACHINE_ARCH}-/jfs_stage1_5
share/grub/${MACHINE_ARCH}-/minix_stage1_5
+${NETBOOT}share/grub/${MACHINE_ARCH}-/nbgrub
+${NETBOOT}share/grub/${MACHINE_ARCH}-/pxegrub
share/grub/${MACHINE_ARCH}-/reiserfs_stage1_5
share/grub/${MACHINE_ARCH}-/stage1
share/grub/${MACHINE_ARCH}-/stage2
@@ -28,3 +31,4 @@ share/grub/${MACHINE_ARCH}-/xfs_stage1_5
@exec install-info --info-dir=%D/info %D/info/multiboot.info
@dirrm share/grub/${MACHINE_ARCH}-
@dirrm share/grub
+${NETBOOT}@dirrm share/doc/grub
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index 782eb83fd56..dec3bdb1ec7 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/30 06:24:15 jlam Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.3 2002/08/25 21:21:26 jlam Exp $
DISTNAME= grun-0.9.2
CATEGORIES= misc
@@ -12,10 +12,12 @@ USE_BUILDLINK2= YES
USE_X11= YES
GNU_CONFIGURE= YES
USE_GMAKE= YES
-USE_PTHREAD= native pth-syscall pth
+PTHREAD_OPTS+= require
post-install:
${MV} ${LOCALBASE}/man/man1/grun.1x ${LOCALBASE}/man/man1/grun.1
.include "../../x11/gtk/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut-cgi/DESCR b/sysutils/ups-nut-cgi/DESCR
index 5a76a0c57b7..167a3054f47 100644
--- a/sysutils/ups-nut-cgi/DESCR
+++ b/sysutils/ups-nut-cgi/DESCR
@@ -1 +1 @@
-ups-nut-cgi provides CGI scripts to monitor UPS status via WEB browser.
+ups-nut-cgi provides CGI scripts to monitor UPS status via a web browser.
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index ab44a5c4676..b12c7b876e9 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15.2.2 2002/06/30 06:24:15 jlam Exp $
+# $NetBSD: Makefile,v 1.15.2.3 2002/08/25 21:21:34 jlam Exp $
-DISTNAME= nut-0.45.5
-PKGNAME= ups-nut-cgi-0.45.5
-PKGREVISION= 1
+DISTNAME= nut-0.50.0
+PKGNAME= ups-nut-cgi-0.50.0
CATEGORIES= sysutils
MASTER_SITES= http://www.exploits.org/nut/release/
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index 17061836930..5a84a88b9cc 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7.2.1 2002/06/23 19:01:15 jlam Exp $
+$NetBSD: distinfo,v 1.7.2.2 2002/08/25 21:21:35 jlam Exp $
-SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3
-Size (nut-0.45.5.tar.gz) = 386936 bytes
-SHA1 (patch-aa) = 6057ca39afdfc4e49380c8f4d35f2371df9fe549
+SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3
+Size (nut-0.50.0.tar.gz) = 382755 bytes
+SHA1 (patch-aa) = cd7b96973d696c1a1f1051fc30c516e158c89ec5
SHA1 (patch-ab) = dfc1663368b670b84b1545c388bcd5f8703c08e3
SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f
-SHA1 (patch-ad) = 7c705b7d1d70962f3f39f399753f585d439032fb
-SHA1 (patch-ae) = 39ea3f3a4234790837ccf6e5799c39b6ba390975
+SHA1 (patch-ad) = 3620c734b396a2de657b6dceb7d5ba3cc821250b
+SHA1 (patch-ae) = 6cff43dc5ed449a8f3c9b1e4864a47336b69fb30
diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
index e1c366e3bb4..46697e64162 100644
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ b/sysutils/ups-nut-cgi/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3.2.1 2002/06/23 19:01:16 jlam Exp $
+$NetBSD: patch-aa,v 1.3.2.2 2002/08/25 21:21:36 jlam Exp $
---- Makefile.in.orig Fri Mar 8 23:21:11 2002
+--- Makefile.in.orig Wed Apr 17 00:00:49 2002
+++ Makefile.in
-@@ -9,9 +9,10 @@
+@@ -9,7 +9,7 @@ MODELPATH = $(INSTALLROOT)@MODELPATH@
INSTALLDIRS = $(CONFPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@
STATEPATH = $(INSTALLROOT)@STATEPATH@
@@ -10,11 +10,8 @@ $NetBSD: patch-aa,v 1.3.2.1 2002/06/23 19:01:16 jlam Exp $
+SUBDIRS = common
CFLAGS = -I../include @CFLAGS@
-+
# these are here so they can be overridden during a make install
- RUNUID=@RUN_AS_USER@
- RUNGID=@RUN_AS_GROUP@
-@@ -64,7 +65,7 @@
+@@ -65,7 +65,7 @@ install-dirs:
install-man:
@cd man; $(MAKE) install; cd ..;
@@ -23,7 +20,7 @@ $NetBSD: patch-aa,v 1.3.2.1 2002/06/23 19:01:16 jlam Exp $
@cd clients; $(MAKE) cgi; cd ..;
install-cgi: install-dirs
-@@ -72,7 +73,6 @@
+@@ -73,7 +73,6 @@ install-cgi: install-dirs
./install-sh -d $(CGIPATH) || exit 1; \
fi \
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad
index a8ac5a5382d..e4dd560e7ad 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ad
+++ b/sysutils/ups-nut-cgi/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $
+$NetBSD: patch-ad,v 1.4.2.2 2002/08/25 21:21:36 jlam Exp $
---- configure.in.orig Tue Feb 26 05:46:25 2002
+--- configure.in.orig Tue Apr 16 23:34:38 2002
+++ configure.in
-@@ -16,6 +16,7 @@
+@@ -18,6 +18,7 @@ dnl | default values for things later on
STATEPATH="/var/state/ups"
MODELPATH="$prefix/bin"
CGIPATH="$prefix/cgi-bin"
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $
RUN_AS_USER="nobody"
RUN_AS_GROUP="nogroup"
PIDPATH="/var/run"
-@@ -120,9 +121,43 @@
+@@ -118,9 +119,43 @@ if ( test x"$ac_cv_func_connect" = x"no"
], [], [])
fi
@@ -54,7 +54,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $
dnl Include in case GD was compiled with Xpm support
AC_CHECK_LIB(X11, XBell,
-@@ -131,13 +166,16 @@
+@@ -129,13 +164,16 @@ AC_CHECK_LIB(X11, XBell,
echo "Retrying with -L /usr/X11R6/lib"
unset ac_cv_lib_X11_XBell
AC_CHECK_LIB(X11, XBell,
@@ -73,7 +73,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $
dnl Skip this chunk if there's no LIBX to use
if test "$LIBX" != ""
-@@ -145,69 +183,34 @@
+@@ -143,69 +181,35 @@ then
dnl Include in case GD was compiled with Xpm support
AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
@@ -120,7 +120,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $
-[-lm -lpng -lz],
+[$GRAPHICS_LIBS -lm -lpng -lz],
)
--
+
-dnl Don't run the ttf/xpm tests against gd unless
-dnl we actually have something to test!
-dnl
@@ -154,13 +154,13 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $
+GRAPHICS_LIBS="$LIBGD"
+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS"
- AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h err.h)
+ AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h)
+CFLAGS=$CFLAGS_save
+CPPFLAGS=$CPPFLAGS_save
AC_HEADER_TIME
AC_CHECK_HEADERS(sys/time.h)
-@@ -220,7 +223,7 @@
+@@ -218,7 +222,7 @@ if test -n "$LD_LIBRARY_PATH"; then
for lib in `echo $LD_LIBRARY_PATH | $AWK -F: '{ for (i = NF; i > 0; --i) print $i }' | sort | uniq`; do
if test -f ${lib}/libpng.so; then
AC_CHECK_LIB(png, png_info_init,
@@ -169,7 +169,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $
],
[],
[-lm -R${lib}],)
-@@ -524,7 +527,8 @@
+@@ -550,7 +554,8 @@ AC_SUBST(DRIVER_INSTALL_TARGET)
AC_SUBST(LIBOBJ)
AC_SUBST(BUILDOBJ)
AC_SUBST(NETLIBS)
diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae
index f50fae45b14..a86635c3a17 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ae
+++ b/sysutils/ups-nut-cgi/patches/patch-ae
@@ -1,38 +1,38 @@
-$NetBSD: patch-ae,v 1.1 2001/11/19 03:47:42 lukem Exp $
+$NetBSD: patch-ae,v 1.1.2.1 2002/08/25 21:21:37 jlam Exp $
---- clients/upsstats.c.orig Wed Aug 29 22:36:41 2001
+--- clients/upsstats.c.orig Thu Mar 21 17:01:16 2002
+++ clients/upsstats.c
-@@ -73,6 +73,7 @@
+@@ -74,6 +74,7 @@ int main()
double tempf;
char model[64], status[64], battpct[64], utility[64], loadpct[64],
upstemp[64], acfreq[64], *stat, *ptr;
+ char runtime[64];
int i;
- strcpy (monhost, MONHOST); /* default host */
-@@ -149,6 +150,7 @@
-
- printf ("</TR>\n");
+ extractcgiargs();
+@@ -162,6 +163,7 @@ int main()
+ printf("</TD>\n");
+ printf("</TR>\n");
+#if 0
- printf ("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
+ printf("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
/* TODO: handle self tests */
-@@ -156,6 +158,7 @@
- /* printf ("Last UPS Self Test: Not Available\n"); */
- /* printf (" Last Test Date: Not Available\n"); */
- printf ("</PRE></TD></TR>\n");
+@@ -169,6 +171,7 @@ int main()
+ /* printf("Last UPS Self Test: Not Available\n"); */
+ /* printf(" Last Test Date: Not Available\n"); */
+ printf("</PRE></TD></TR>\n");
+#endif
- printf ("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
+ printf("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
-@@ -173,6 +176,9 @@
+@@ -186,6 +189,9 @@ int main()
- if (getupsvar (monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
- printf (" Output Freq: %s Hz\n", acfreq);
+ if (getupsvar(monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
+ printf(" Output Freq: %s Hz\n", acfreq);
+
-+ if (getupsvar (monhost, "runtime", runtime, sizeof(runtime)) > 0)
-+ printf (" Runtime: %s\n", runtime);
++ if (getupsvar(monhost, "runtime", runtime, sizeof(runtime)) > 0)
++ printf(" Runtime: %s\n", runtime);
- printf ("</PRE><P>\n");
- printf ("<CENTER>Network UPS Tools upsstats %s</CENTER>\n", UPS_VERSION);
+ printf("</PRE><P>\n");
+ printf("<CENTER>Network UPS Tools upsstats %s</CENTER>\n", UPS_VERSION);
diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE
index 58ba30948dc..e1d84376cdb 100644
--- a/sysutils/ups-nut/MESSAGE
+++ b/sysutils/ups-nut/MESSAGE
@@ -1,9 +1,13 @@
======================================================================
-$NetBSD: MESSAGE,v 1.1.2.2 2002/06/23 19:01:10 jlam Exp $
+$NetBSD: MESSAGE,v 1.1.2.3 2002/08/25 21:21:28 jlam Exp $
${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5.
You will need to update this before restarting upsd(8).
Refer to ${NUT_EGDIR}/upsd.users.sample
and upsd.users(5) for more information.
+ The network port used by nut changed in version 0.50.0,
+ to the IANA assigned 3493, from 3305 in previous versions.
+ You will need to update all clients.
+
======================================================================
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index d0379daa03d..1e7b50f1f06 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18.2.2 2002/06/30 06:24:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18.2.3 2002/08/25 21:21:29 jlam Exp $
#
-DISTNAME= nut-0.45.5
-PKGNAME= ups-nut-0.45.5
-PKGREVISION= 1
+DISTNAME= nut-0.50.0
+PKGNAME= ups-nut-0.50.0
CATEGORIES= sysutils
MASTER_SITES= http://www.exploits.org/nut/release/
@@ -74,12 +73,14 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/$${script} \
${PREFIX}/etc/rc.d/$${script}; \
done
- ${INSTALL_DATA_DIR} ${NUT_DOCDIR} ${NUT_DOCDIR}/cables
- ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables
- ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NUT_DOCDIR}
+ ${INSTALL_DATA_DIR} ${NUT_DOCDIR}
+ ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers
${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${NUT_DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables
+ ${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${NUT_DOCDIR}/drivers
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index b5ecec3d6be..2f03063165f 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7.2.1 2002/06/23 19:01:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7.2.2 2002/08/25 21:21:29 jlam Exp $
bin/upsc
bin/upscmd
bin/upsct
@@ -16,12 +16,20 @@ man/man5/upsmon.conf.5
man/man5/upssched.conf.5
man/man8/apcsmart.8
man/man8/belkin.8
+man/man8/bestferrups801-807.8
man/man8/bestups.8
+man/man8/cyberpower.8
+man/man8/everups.8
man/man8/fentonups.8
+man/man8/genericups.8
+man/man8/hp.8
+man/man8/masterguard.8
+man/man8/mge-ellipse.8
man/man8/newapc.8
-man/man8/newvictron.8
man/man8/nutupsdrv.8
man/man8/powercom.8
+man/man8/sec.8
+man/man8/tripplite.8
man/man8/upsc.8
man/man8/upscmd.8
man/man8/upsct.8
@@ -31,73 +39,66 @@ man/man8/upsdrvctl.8
man/man8/upslog.8
man/man8/upsmon.8
man/man8/upssched.8
-sbin/ups-drivers/aeg
+man/man8/victronups.8
sbin/ups-drivers/apcsmart
sbin/ups-drivers/belkin
sbin/ups-drivers/bestferrups801-807
-sbin/ups-drivers/bestfort
-sbin/ups-drivers/bestuferrups
sbin/ups-drivers/bestups
sbin/ups-drivers/cyberpower
-sbin/ups-drivers/engetron
sbin/ups-drivers/everups
sbin/ups-drivers/fentonups
sbin/ups-drivers/genericups
sbin/ups-drivers/hp
-sbin/ups-drivers/ipt-anzen
sbin/ups-drivers/masterguard
sbin/ups-drivers/mge-ellipse
-sbin/ups-drivers/mgeups
-sbin/ups-drivers/multilink
-sbin/ups-drivers/mustekups
+sbin/ups-drivers/mge-utalk
sbin/ups-drivers/newapc
-sbin/ups-drivers/newpowercom
-sbin/ups-drivers/newvictron
-sbin/ups-drivers/optiups
sbin/ups-drivers/powercom
+sbin/ups-drivers/powerware
sbin/ups-drivers/sec
-sbin/ups-drivers/sms
-sbin/ups-drivers/toshiba1500
sbin/ups-drivers/tripplite
-sbin/ups-drivers/ups-trust425+625
-sbin/ups-drivers/upseyeux
sbin/ups-drivers/victronups
sbin/upsd
sbin/upsdrvctl
sbin/upsmon
sbin/upssched
-share/doc/nut/Changes.trust
share/doc/nut/FAQ
share/doc/nut/README
share/doc/nut/access.txt
-share/doc/nut/belkin.txt
-share/doc/nut/bestferrups801-807.txt
share/doc/nut/big-servers.txt
+share/doc/nut/cables/apc.txt
+share/doc/nut/cables/ge-imv-victron.txt
+share/doc/nut/cables/imv.txt
+share/doc/nut/cables/mgeups.txt
share/doc/nut/cables/powerware.txt
share/doc/nut/cables/repotec.txt
share/doc/nut/cables/sms.txt
-share/doc/nut/cables/victron.txt
share/doc/nut/chroot.txt
share/doc/nut/commands.txt
share/doc/nut/config-files.txt
share/doc/nut/configure.txt
share/doc/nut/data-room.txt
share/doc/nut/design.txt
+share/doc/nut/developers.txt
share/doc/nut/driver-control.txt
-share/doc/nut/dummycons.txt
-share/doc/nut/dummyups.txt
-share/doc/nut/generic-ups.txt
-share/doc/nut/mge-ellipse.txt
+share/doc/nut/driver.list
+share/doc/nut/drivers/belkin.txt
+share/doc/nut/drivers/bestferrups801-807.txt
+share/doc/nut/drivers/dummycons.txt
+share/doc/nut/drivers/dummyups.txt
+share/doc/nut/drivers/generic-ups.txt
+share/doc/nut/drivers/mge-ellipse.txt
+share/doc/nut/drivers/mge-utalk.txt
+share/doc/nut/drivers/multilink.txt
+share/doc/nut/drivers/powercom.txt
+share/doc/nut/drivers/snmp-ups.txt
share/doc/nut/model-arguments.txt
-share/doc/nut/multilink.txt
share/doc/nut/new-modules.txt
share/doc/nut/pager.txt
-share/doc/nut/powercom.txt
share/doc/nut/protocol.txt
share/doc/nut/shutdown.txt
share/doc/nut/tips.txt
share/doc/nut/todo.txt
-share/doc/nut/ups-trust425+625.txt
share/doc/nut/upssched.txt
share/examples/nut/hosts.conf.sample
share/examples/nut/multimon.conf.sample
@@ -108,6 +109,7 @@ share/examples/nut/upsmon.conf.sample
share/examples/nut/upssched.conf.sample
share/examples/nut/upsset.conf.sample
@dirrm share/examples/nut
+@dirrm share/doc/nut/drivers
@dirrm share/doc/nut/cables
@dirrm share/doc/nut
@dirrm sbin/ups-drivers
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 194e96113e4..105f1f66f99 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9.2.1 2002/06/23 19:01:11 jlam Exp $
+$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:21:30 jlam Exp $
-SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3
-Size (nut-0.45.5.tar.gz) = 386936 bytes
-SHA1 (patch-aa) = 74fcdb7d75dcc7a53b0591bd22ff5c6bbeb572ff
+SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3
+Size (nut-0.50.0.tar.gz) = 382755 bytes
+SHA1 (patch-aa) = 4d16a24725a0ff645c430ba43ef8c52856491a73
SHA1 (patch-ab) = fac1a47430a2c2d692ecede2ac6ed78c60a82566
+SHA1 (patch-ac) = 60b2ac079232ab4af1b41928760601f0a09b9ae1
SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d
SHA1 (patch-ag) = b6ae992f9b92d68683ac6adb7378d11158cc1fdc
diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa
index 8962838e8ae..dd24b5eef01 100644
--- a/sysutils/ups-nut/patches/patch-aa
+++ b/sysutils/ups-nut/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.5.2.2 2002/06/23 19:01:12 jlam Exp $
+$NetBSD: patch-aa,v 1.5.2.3 2002/08/25 21:21:31 jlam Exp $
---- models/upscommon.c.orig Fri Mar 15 00:59:57 2002
+--- models/upscommon.c.orig Fri May 17 15:27:55 2002
+++ models/upscommon.c
-@@ -716,6 +716,10 @@
- return;
- }
+@@ -688,6 +688,11 @@ void info_ready(void)
+ {
+ int ret;
+#ifdef HAVE_MMAP
+ /* sync external file representation before operating on the file */
+ msync(shared_info, info_size, MS_INVALIDATE);
+#endif
++
ret = rename(initfn, statefn);
if (ret != 0)
diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac
new file mode 100644
index 00000000000..96687a5c9ae
--- /dev/null
+++ b/sysutils/ups-nut/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.4.4.2 2002/08/25 21:21:32 jlam Exp $
+
+--- clients/upslog.c.orig Fri May 17 08:26:22 2002
++++ clients/upslog.c
+@@ -180,6 +180,13 @@ void print_status(void)
+ continue;
+ }
+
++ /* if a %%, append % and start over */
++ if (logformat[i+1] == '%') {
++ snprintfcat(logbuffer, sizeof(logbuffer), "%%");
++ i++;
++ continue;
++ }
++
+ /* it must start with a % now - %<cmd>[ <arg>]%*/
+
+ cmd = xstrdup(&logformat[i+1]);
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index db9fc525c02..13eba18a81d 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18.2.1 2002/06/30 06:24:17 jlam Exp $
+# $NetBSD: Makefile,v 1.18.2.2 2002/08/25 21:21:38 jlam Exp $
DISTNAME= xps-3.14
CATEGORIES= sysutils
@@ -8,8 +8,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.netwinder.org/~rocky/xps-home/
COMMENT= displays the Unix process list as a hierarchical tree
-BUILD_DEPENDS= perl>=${PERL5_REQD}:../../lang/perl5
-
+USE_PERL5= build
USE_GMAKE= # defined
USE_X11BASE= # defined
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 11:13:58 +0000