pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Remove torsmo, older version of sysutils/conk...
details: https://anonhg.NetBSD.org/pkgsrc/rev/06108dbd9baf
branches: trunk
changeset: 442258:06108dbd9baf
user: nia <nia%pkgsrc.org@localhost>
date: Sat Nov 21 13:01:22 2020 +0000
description:
Remove torsmo, older version of sysutils/conky that seems to no longer work
diffstat:
sysutils/Makefile | 3 +-
sysutils/torsmo/DESCR | 20 ----
sysutils/torsmo/Makefile | 52 ------------
sysutils/torsmo/PLIST | 6 -
sysutils/torsmo/distinfo | 11 --
sysutils/torsmo/patches/patch-aa | 43 ----------
sysutils/torsmo/patches/patch-ab | 166 ---------------------------------------
sysutils/torsmo/patches/patch-ac | 19 ----
sysutils/torsmo/patches/patch-ad | 88 --------------------
sysutils/torsmo/patches/patch-ae | 69 ----------------
10 files changed, 1 insertions(+), 476 deletions(-)
diffs (truncated from 527 to 300 lines):
diff -r 1755a4353f6a -r 06108dbd9baf sysutils/Makefile
--- a/sysutils/Makefile Sat Nov 21 12:28:43 2020 +0000
+++ b/sysutils/Makefile Sat Nov 21 13:01:22 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.917 2020/11/19 20:00:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.918 2020/11/21 13:01:22 nia Exp $
#
COMMENT= System utilities
@@ -652,7 +652,6 @@
SUBDIR+= tload
SUBDIR+= tob
SUBDIR+= top
-SUBDIR+= torsmo
SUBDIR+= toshutils
SUBDIR+= tpb
SUBDIR+= tphdisk
diff -r 1755a4353f6a -r 06108dbd9baf sysutils/torsmo/DESCR
--- a/sysutils/torsmo/DESCR Sat Nov 21 12:28:43 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Torsmo is a system monitor that sits in the corner of your desktop. It's
-very simple, customizable and it renders only text on the desktop (and
-percentagebars if you want it to ;) and the only lib it uses is Xlib.
-Torsmo can show various information about your system and its peripherals,
-including:
-
-* Kernel version
-* Uptime
-* System time
-* Network interface information
-* Memory and swap usage
-* Hostname
-* Machine, i686 for example
-* System name, Linux for example
-* Temperatures from i2c-sensors
-* Temperature from ACPI
-* Battery capacity from ACPI/APM
-* Number of processes running or sleeping
-* Local mails (unread and all)
-* Filesystem stats
diff -r 1755a4353f6a -r 06108dbd9baf sysutils/torsmo/Makefile
--- a/sysutils/torsmo/Makefile Sat Nov 21 12:28:43 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2020/08/17 20:20:09 leot Exp $
-
-DISTNAME= torsmo-0.18
-PKGREVISION= 4
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=torsmo/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://torsmo.sourceforge.net/
-COMMENT= Tyopoytaorvelo System Monitor
-
-BROKEN_ON_PLATFORM= Darwin-*-*
-
-USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-xft
-CONFIGURE_ENV+= XFTCONFIG=pkg-config
-
-EGDIR= ${PREFIX}/share/examples/torsmo
-DOCDIR= ${PREFIX}/share/doc/torsmo
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/torsmo
-INSTALLATION_DIRS+= share/doc/torsmo
-
-CHECK_PORTABILITY_SKIP+= configure.in
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+= --x-includes=${PREFIX}/include
-CONFIGURE_ARGS+= --x-libraries=${PREFIX}/lib
-.endif
-
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" \
- || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Linux")
-SPECIAL_PERMS+= bin/torsmo ${REAL_ROOT_USER} kmem 2555
-.endif
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/torsmo ${DESTDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/torsmo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_DATA} ${WRKSRC}/torsmorc.sample ${DESTDIR}${EGDIR}/
- ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}/
- ${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${DOCDIR}/
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 1755a4353f6a -r 06108dbd9baf sysutils/torsmo/PLIST
--- a/sysutils/torsmo/PLIST Sat Nov 21 12:28:43 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:15 joerg Exp $
-bin/torsmo
-man/man1/torsmo.1
-share/doc/torsmo/README
-share/doc/torsmo/readme.html
-share/examples/torsmo/torsmorc.sample
diff -r 1755a4353f6a -r 06108dbd9baf sysutils/torsmo/distinfo
--- a/sysutils/torsmo/distinfo Sat Nov 21 12:28:43 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.8 2019/10/27 19:31:40 maya Exp $
-
-SHA1 (torsmo-0.18.tar.gz) = 01e6737b3971daa3a7c9cb6dd1961f61bc39bdae
-RMD160 (torsmo-0.18.tar.gz) = f1d8b3c4679155596569f9116970e7ba8a01eb6e
-SHA512 (torsmo-0.18.tar.gz) = 822a7a01bb685c6dbad5520d3c6bab4b2854647054de068952852dbf907f356d27718050ca1b0bc0c83b09112b4ae52c884aa75c6b1753a168f3072d0a91e854
-Size (torsmo-0.18.tar.gz) = 84020 bytes
-SHA1 (patch-aa) = 8c515d3b0925aeaaea928ad8abd89ab5ccbfceab
-SHA1 (patch-ab) = 858d0f4d4a694e667465ed6519f034c07f13e535
-SHA1 (patch-ac) = 5b342d09ff0fcc3982aa855e2cc660823ed53e11
-SHA1 (patch-ad) = 977da3272ee309b41d0dc30ea6b2d7f1a5e2a3c7
-SHA1 (patch-ae) = 5888d6cf538a9d95006ab1d2cdd01eabfafa10ed
diff -r 1755a4353f6a -r 06108dbd9baf sysutils/torsmo/patches/patch-aa
--- a/sysutils/torsmo/patches/patch-aa Sat Nov 21 12:28:43 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/12/02 12:55:11 wiz Exp $
-
---- fs.c.orig 2004-08-25 18:24:24.000000000 +0200
-+++ fs.c
-@@ -19,6 +19,11 @@
- #include <sys/mount.h>
- #endif
-
-+#if defined (__NetBSD__) && (__NetBSD_Version__ >= 299000900)
-+#include <sys/statvfs.h>
-+#define STATVFS 1
-+#endif
-+
- /* TODO: benchmark which is faster, fstatvfs() or pre-opened fd and
- * statvfs() (fstatvfs() would handle mounts I think...) */
-
-@@ -27,16 +32,25 @@ struct fs_stat *fs_stats = fs_stats_;
-
- void update_fs_stats() {
- unsigned int i;
-+#ifndef STATVFS
- struct statfs s;
-+#else
-+ struct statvfs s;
-+#endif
- for (i=0; i<16; i++) {
- if (fs_stats[i].fd <= 0)
- break;
-
-+#ifndef STATVFS
- fstatfs(fs_stats[i].fd, &s);
--
- fs_stats[i].size = (long long) s.f_blocks * s.f_bsize;
- /* bfree (root) or bavail (non-roots) ? */
- fs_stats[i].avail = (long long) s.f_bavail * s.f_bsize;
-+#else
-+ fstatvfs(fs_stats[i].fd, &s);
-+ fs_stats[i].size = (int64_t) s.f_blocks * 1024;
-+ fs_stats[i].avail = (int64_t) s.f_bavail * 1024;
-+#endif
- }
- }
-
diff -r 1755a4353f6a -r 06108dbd9baf sysutils/torsmo/patches/patch-ab
--- a/sysutils/torsmo/patches/patch-ab Sat Nov 21 12:28:43 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2017/06/23 19:02:07 kamil Exp $
-
---- netbsd.c.orig 2004-08-25 17:55:57.000000000 +0000
-+++ netbsd.c
-@@ -9,6 +9,7 @@
- #include <err.h>
- #include <limits.h>
- #include <paths.h>
-+#include <ctype.h>
-
- #include <kvm.h>
- #include <nlist.h>
-@@ -18,7 +19,6 @@
- #include <sys/sysctl.h>
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/user.h>
- #include <sys/socket.h>
- #include <sys/swap.h>
- #include <sys/sched.h>
-@@ -221,6 +221,33 @@ void update_net_stats()
- }
- }
-
-+static char *freq = NULL;
-+char * get_freq()
-+{
-+ size_t val_len;
-+ u_int32_t val;
-+
-+ if (freq == NULL) {
-+ freq = malloc(10);
-+ if (freq == NULL) {
-+ return NULL;
-+ } else {
-+ freq[0] = '\0';
-+ }
-+ }
-+
-+ /* Laptops with enhanced speed step. */
-+ if (sysctlbyname("machdep.est.frequency.current",
-+ NULL, &val_len, NULL, 0) == 0) {
-+ sysctlbyname("machdep.est.frequency.current", &val, &val_len, NULL, 0);
-+ sprintf(freq, "%d", val);
-+ } else {
-+ /* XXX: Parse out the clockspeed from machdep.cpu_brand */
-+ }
-+
-+ return freq;
-+}
-+
- void update_total_processes()
- {
- /* It's easier to use kvm here than sysctl */
-@@ -302,6 +329,7 @@ void update_cpu_usage()
- }
-
- double get_i2c_info(int fd, int div) {
-+ (void) fd; (void) div;
- return -1;
- }
-
-@@ -315,27 +343,98 @@ void update_load_average() {
- }
-
- double get_acpi_temperature(int fd) {
-+ (void) fd;
- return -1;
- }
-
--void get_battery_stuff(char *buf, unsigned int n, const char *bat) {
--}
--
- int open_i2c_sensor(const char *dev, const char *type, int n, int *div)
- {
-+ (void) dev; (void) type; (void) n; (void) div;
- return -1;
- }
-
- int open_acpi_temperature(const char *name) {
-+ (void) name;
- return -1;
- }
-
-+static char acpi_ac_str[64] = "N/A";
- char * get_acpi_ac_adapter(void)
- {
-- return "N/A";
-+ /* get_battery_stuff() actually populates this for us. */
-+ return acpi_ac_str;
-+}
-+
-+static char last_battery_str[64];
-+static double last_battery_time;
-+
-+void get_battery_stuff(char *buf, unsigned int n, const char *bat) {
-+ FILE *f;
-+ char *foo;
-+ char b[4096];
-+ char b_name[32];
-+ int bat_num;
-+ int found_acpibat = 0;
-+ int found_acpiacad = 0;
-+ float bat_charge = 0.0;
-+
-+ /* Don't update battery too often. */
-+ if (current_update_time - last_battery_time < 29.5) {
-+ snprintf(buf, n, "%s", last_battery_str);
-+ return;
-+ }
-+ last_battery_time = current_update_time;
-+
-+ sscanf(bat, "BAT%d", &bat_num);
-+ sprintf(b_name, "acpibat%d", bat_num);
-+
-+ /*
-+ * Using the envsys API is like pulling teeth without anesthetic.
-+ * so just popen envstat and parse the output instead.
-+ */
-+ f = popen("/usr/sbin/envstat -r", "r");
-+ if (f != NULL) {
-+ while(!feof(f)) {
-+ fgets(b, 4096, f);
-+
-+ /* AC adapter state. */
-+ if (strstr(b, "acpiacad0")) {
-+ if (strstr(b, "disconnected")) {
Home |
Main Index |
Thread Index |
Old Index