From 85f5d3933b1f4d89e4c1f1ffbac3e35c54aadfd9 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Sat, 30 Oct 2004 07:05:51 +0000 Subject: Update sysutils/swapd to 1.0.1. After talking with the author Roy Keene, my patches were applied: * NetBSD support. * No need to call free() in swapd_get_free_mem(). --- sysutils/swapd/Makefile | 6 ++++-- sysutils/swapd/distinfo | 8 +++----- sysutils/swapd/patches/patch-aa | 18 ------------------ sysutils/swapd/patches/patch-ac | 17 ----------------- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 sysutils/swapd/patches/patch-aa delete mode 100644 sysutils/swapd/patches/patch-ac (limited to 'sysutils/swapd') diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile index 3f1ffd6be99..7e3eac4af11 100644 --- a/sysutils/swapd/Makefile +++ b/sysutils/swapd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2004/10/30 05:25:30 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/10/30 07:05:51 xtraeme Exp $ # -DISTNAME= swapd-1.0 +DISTNAME= swapd-1.0.1 CATEGORIES= sysutils MASTER_SITES= http://www.rkeene.org/files/oss/swapd/source/ @@ -21,5 +21,7 @@ RCD_SCRIPTS= swapd EGDIR= ${PREFIX}/share/examples/swapd CONF_FILES= ${EGDIR}/swapd.conf ${PKG_SYSCONFDIR}/swapd.conf +CFLAGS+= -DDEBUG + .include "../../devel/libstatgrab/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/swapd/distinfo b/sysutils/swapd/distinfo index b0787607615..cdde34eb940 100644 --- a/sysutils/swapd/distinfo +++ b/sysutils/swapd/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/10/30 05:06:14 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/10/30 07:05:51 xtraeme Exp $ -SHA1 (swapd-1.0.tar.gz) = 371ee3ebc8e76cecfb6f3821c001aa04d4cba5ac -Size (swapd-1.0.tar.gz) = 89331 bytes -SHA1 (patch-aa) = 23fb511f56514a9e49fa957dc1b60f00c8b58d8c +SHA1 (swapd-1.0.1.tar.gz) = fee159706ba4be16b2fecc7a067ef8951dbf44fc +Size (swapd-1.0.1.tar.gz) = 89321 bytes SHA1 (patch-ab) = 739bd4dca1287676b5a32304f96bc214da160b72 -SHA1 (patch-ac) = 896fdfe94f658f941cb2c9d75d0bb51b59d8bc1f diff --git a/sysutils/swapd/patches/patch-aa b/sysutils/swapd/patches/patch-aa deleted file mode 100644 index 0e5876aa2b4..00000000000 --- a/sysutils/swapd/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/10/30 05:06:15 xtraeme Exp $ - ---- configure.orig 2004-10-29 23:52:36.000000000 +0200 -+++ configure 2004-10-30 05:39:59.000000000 +0200 -@@ -12163,6 +12163,13 @@ - _ACEOF - - ;; -+ netbsd*) -+ -+cat >>confdefs.h <<\_ACEOF -+#define SWAPD_SWAPOFF_CMDLINE "/sbin/swapctl -d \"%s\"" -+_ACEOF -+ ;; -+ - esac - - diff --git a/sysutils/swapd/patches/patch-ac b/sysutils/swapd/patches/patch-ac deleted file mode 100644 index 4da54722c1b..00000000000 --- a/sysutils/swapd/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/10/30 05:06:15 xtraeme Exp $ - ---- swapd.c.orig 2004-10-30 06:28:26.000000000 +0200 -+++ swapd.c 2004-10-30 06:29:03.000000000 +0200 -@@ -114,9 +114,11 @@ - return(-1); - } - -- retval = meminfo->free + meminfo->cache + swapinfo->free; -+ retval = meminfo->free + swapinfo->free; - -+ if (!meminfo) - free(meminfo); -+ if (!swapinfo) - free(swapinfo); - - return(retval); -- cgit v1.2.3