Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

7
sysutils/asapm/DESCR Normal file
View File

@@ -0,0 +1,7 @@
'asapm' is an X11 client which displays a battery status of your
notebook computer equiped with APM (Advanced Power Management) BIOS
or ACPI (Advanced Configuration and Power Interface).
The status displayed consists remaining battery life, an AC line
status, a charging status and a digital readout with (a) Percent
battery remaining and (b) estimated time to dead. If using ACPI this
version can also show the time left to recharge the battery.

11
sysutils/asapm/MESSAGE Normal file
View File

@@ -0,0 +1,11 @@
===========================================================================
$NetBSD: MESSAGE,v 1.3 2005/09/28 14:15:49 rillig Exp $
This package requires that the APM driver be enabled in your kernel.
See apm(4) for details.
This package has also special NetBSD modifications to work also with the
sysmon interface, which allows it also work with the ACPI driver if
installed in the kernel.
===========================================================================

28
sysutils/asapm/Makefile Normal file
View File

@@ -0,0 +1,28 @@
# $NetBSD: Makefile,v 1.42 2012/10/23 19:50:51 asau Exp $
#
DISTNAME= asapm-2.11
PKGREVISION= 4
CATEGORIES= sysutils x11
MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/ \
ftp://ftp.afterstep.org/apps/asapm/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tigr.net/afterstep/view.php?applet=asapm/data
COMMENT= Laptop battery status display for X11
LICENSE= gnu-gpl-v2
.if !exists(/usr/include/machine/apmvar.h)
PKG_FAIL_REASON+= "APM needs /usr/include/machine/apmvar.h to build."
.endif
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support
CONFIGURE_ARGS+= --with-xpm
CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include
CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

3
sysutils/asapm/PLIST Normal file
View File

@@ -0,0 +1,3 @@
@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:53 zuntum Exp $
bin/asapm
man/man1/asapm.1

11
sysutils/asapm/distinfo Normal file
View File

@@ -0,0 +1,11 @@
$NetBSD: distinfo,v 1.11 2011/03/02 13:15:23 obache Exp $
SHA1 (asapm-2.11.tar.gz) = cd89c5557d76dbb19ee565435b533ab48f05f102
RMD160 (asapm-2.11.tar.gz) = 14d33828a475f61d4499be2e5008842f4950dfa6
Size (asapm-2.11.tar.gz) = 58729 bytes
SHA1 (patch-aa) = f25a3bb15cd37ecd4771dfcf20c04abb552ebac2
SHA1 (patch-ab) = 8796f1f6220ecdbd23d360bb18f721e1ef83febf
SHA1 (patch-ac) = edfe7deae628b9e2aa57b67666f4e7dea13c19bf
SHA1 (patch-ad) = 4b6bf84a4cf1881ef0c4e97fbe64201e3437aba1
SHA1 (patch-ae) = 28b0e4c446c466a90d4a2ae0952b2326385a8c6c
SHA1 (patch-af) = 5e16e48db6bdcbc13a27cf32f270ff83e2a2f11d

View File

@@ -0,0 +1,32 @@
$NetBSD: patch-aa,v 1.4 2011/03/02 13:15:23 obache Exp $
--- autoconf/Makefile.common.in.orig 1999-03-09 10:35:24.000000000 +0000
+++ autoconf/Makefile.common.in
@@ -10,14 +10,14 @@ install: install.bin install.man
install.bin: $(PROG)
$(STRIP) $(PROG)
- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR)
install.man:
- $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x
+ $(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1
uninstall:
- $(RMF) $(AFTER_BIN_DIR)/$(PROG)
- $(RMF) $(AFTER_MAN_DIR)/$(PROG).1x
+ $(RMF) $(DESTDIR)$(AFTER_BIN_DIR)/$(PROG)
+ $(RMF) $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1
clean:
$(RMF) $(PROG) *.o *~ *% *.bak \#* core
@@ -34,7 +34,7 @@ indent:
done
$(PROG): $(OBJS)
- $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
.c.o:
$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-ab,v 1.2 2000/01/16 18:37:05 jlam Exp $
--- autoconf/Makefile.defines.in.orig Tue Mar 9 05:35:24 1999
+++ autoconf/Makefile.defines.in Sun Jan 16 13:24:05 2000
@@ -28,6 +28,7 @@
INCS_XPM = @XPM_CFLAGS@
INCLUDES = $(INCS_X) $(INCS_XPM)
+LDFLAGS = @LDFLAGS@
LIBS_X = @X_LIBS@ @x_libs@
LIBS_XPM =
LIBS_JPEG = @JPEG_LIB@

View File

@@ -0,0 +1,31 @@
$NetBSD: patch-ac,v 1.3 2004/06/09 21:00:05 kivinen Exp $
--- asapm.c.orig 2001-11-23 23:14:24.000000000 +0200
+++ asapm.c
@@ -22,6 +22,7 @@
struct apm_state state;
char apm_device_file[256];
+char sysmon_device_file[256];
char statuscolor[50],
greencolor[50],
@@ -52,6 +53,7 @@ char mainGeometry[50];
void defaults()
{
safecopy(apm_device_file, APM_PROC, 256);
+ safecopy(sysmon_device_file, SYSMON_DEV, 256);
/* I use RoyalBlue personally, but the author might not like me */
/* arbitrary aesthetic changes to his progam. ;) --Dagmar */
@@ -178,6 +180,10 @@ void parsecmdline(int argc, char *arg
if (++i >= argc)
usage();
safecopy(apm_device_file, argv[i], 256);
+ } else if (!strncmp(argument,"-sysmondev",4)) {
+ if (++i >= argc)
+ usage();
+ safecopy(sysmon_device_file, argv[i], 256);
} else if (!strncmp(argument,"-fail",5)) {
state.fail=1;
} else if (!strncmp(argument,"-u",2)) {

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-ad,v 1.2 2004/06/30 14:22:49 kivinen Exp $
--- state.h.orig 1999-03-09 12:35:24.000000000 +0200
+++ state.h
@@ -13,6 +13,12 @@
/* file -> APM device */
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#define APM_PROC "/dev/apm"
+#include <paths.h>
+#ifdef _PATH_SYSMON
+#define SYSMON_DEV _PATH_SYSMON
+#else
+#define SYSMON_DEV "/dev/sysmon"
+#endif
#else
#define APM_PROC "/proc/apm"
#endif

View File

@@ -0,0 +1,25 @@
$NetBSD: patch-ae,v 1.1 2004/06/09 21:00:05 kivinen Exp $
--- apm_rc.c.orig 1999-03-09 12:35:24.000000000 +0200
+++ apm_rc.c
@@ -9,6 +9,7 @@ extern struct apm_state state;
#include "apm_react.h"
extern char apm_device_file[];
+extern char sysmon_device_file[];
extern char statuscolor[];
extern char greencolor[];
extern char yellowcolor[];
@@ -93,6 +94,12 @@ void ReadFile( FILE * fd )
#ifdef DEBUG
printf("APM device = %s\n", apm_device_file);
#endif
+ } else if ( !strcasecmp("SysmonDevice", buffer) ) {
+ fgets( buffer, 256, fd );
+ safecopy( sysmon_device_file, Strip(buffer), 256 );
+#ifdef DEBUG
+ printf("Sysmon device = %s\n", sysmon_device_file);
+#endif
} else if ( !strcasecmp("Status", buffer) ) {
fgets( buffer, 256, fd );
safecopy( statuscolor, Strip(buffer), 50 );

View File

@@ -0,0 +1,200 @@
$NetBSD: patch-af,v 1.5 2004/07/26 23:25:19 wiz Exp $
--- apm_read.c.orig 2001-11-23 23:07:19.000000000 +0200
+++ apm_read.c
@@ -31,6 +31,7 @@
/* file -> APM device */
extern char apm_device_file[];
+extern char sysmon_device_file[];
#include "state.h"
extern struct apm_state state;
@@ -136,18 +137,185 @@
state.time_left = info.ai_batt_time / 60;
}
#elif defined(__NetBSD__)||defined(__OpenBSD__)
+
+#include <sys/envsys.h>
+
+/* We cannot use ifdef ENVSYS_SWATTHOUR etc as it is enum. The
+ ENVSYS_FFRACVALID was added at the same time as WATTHOUR and INDICATOR, so
+ we use it to see if we have the support for those. */
+#ifdef ENVSYS_FFRACVALID
+#define HAVE_ENVSYS_SWATTHOUR
+#define HAVE_ENVSYS_INDICATOR
+#endif /* ENVSYS_FFRACVALID */
+
+int match_end(const char *str, const char *end_part)
+{
+ int len1, len2;
+ len1 = strlen(str);
+ len2 = strlen(end_part);
+ if (len1 < len2)
+ return 0;
+ return strcmp(str + len1 - len2, end_part) == 0;
+}
+
+void TrySysmonDevice( )
+{
+ int fd;
+ int count = 0;
+ envsys_basic_info_t ebis;
+ envsys_tre_data_t etds;
+ int32_t design, charge, warn_cap, low_cap, discharge_rate, charge_rate;
+ int connected, charging, percent, time_units, battery_status;
+
+ if ((fd = open(sysmon_device_file, O_RDONLY)) == -1) {
+ error_handle(1, "");
+ return;
+ }
+
+ design = 0;
+ charge = 0;
+ warn_cap = 0;
+ low_cap = 0;
+ charge_rate = 0;
+ discharge_rate = 0;
+ connected = 0;
+ charging = 0;
+ percent = 0;
+ time_units = 0;
+
+ for(etds.sensor = 0; ; etds.sensor++) {
+ if (ioctl(fd, ENVSYS_GTREDATA, &etds) == -1) {
+ error_handle(4, "");
+ close(fd);
+ return;
+ }
+ if (!(etds.validflags & ENVSYS_FVALID))
+ break;
+
+ ebis.sensor = etds.sensor;
+ if (ioctl(fd, ENVSYS_GTREINFO, &ebis) == -1) {
+ error_handle(4, "");
+ close(fd);
+ return;
+ }
+
+ if (etds.units != ebis.units) {
+ error_handle(6, "units does not match");
+ }
+
+ if (!(etds.validflags & ENVSYS_FCURVALID))
+ continue;
+
+#ifdef HAVE_ENVSYS_SWATTHOUR
+ if (etds.units == ENVSYS_SWATTHOUR ||
+ etds.units == ENVSYS_SAMPHOUR) {
+ /* Watt or amp hours, this must be battery cap info. */
+ if (match_end(ebis.desc, " design cap")) {
+ design += etds.cur.data_s;
+ } else if (match_end(ebis.desc, " charge")) {
+ charge += etds.cur.data_s;
+ } else if (match_end(ebis.desc, " warn cap")) {
+ warn_cap += etds.cur.data_s;
+ } else if (match_end(ebis.desc, " low cap")) {
+ low_cap += etds.cur.data_s;
+ }
+ }
+#endif /* HAVE_ENVSYS_SWATTHOUR */
+#ifdef HAVE_ENVSYS_INDICATOR
+ if (etds.units == ENVSYS_INDICATOR) {
+ /* Indicator of something, check for connected. */
+ if (match_end(ebis.desc, " connected")) {
+ connected = etds.cur.data_us;
+ } else if (match_end(ebis.desc, " charging")) {
+ charging = etds.cur.data_us;
+ }
+
+ }
+#endif /* HAVE_ENVSYS_INDICATOR */
+ if (etds.units == ENVSYS_SWATTS ||
+ etds.units == ENVSYS_SAMPS) {
+ /* Watts or apms, this must discharge rate. */
+ if (match_end(ebis.desc, " discharge rate")) {
+ discharge_rate += etds.cur.data_s;
+ } else if (match_end(ebis.desc, " charge rate")) {
+ charge_rate += etds.cur.data_s;
+ }
+
+ }
+ }
+
+ if (state.ac_line_status != connected) {
+ state.ac_line_status = connected ? AC_ONLINE : AC_BATTERY;
+ ++state.update;
+ if ( state.ac_line_status == AC_ONLINE )
+ state.flags |= CHANGE_AC_ON;
+ else
+ state.flags |= CHANGE_AC_OFF;
+ }
+ if (charging) {
+ battery_status = BATTERY_CHARGING;
+ } else {
+ if (charge > warn_cap) {
+ battery_status = BATTERY_HIGH;
+ } else if (charge > low_cap) {
+ battery_status = BATTERY_LOW;
+ } else {
+ battery_status = BATTERY_CRITICAL;
+ }
+ }
+
+ if (state.battery_status != battery_status) {
+ state.battery_status = battery_status;
+ ++state.update;
+ }
+
+ if (design != 0) {
+ percent = charge / (design / 100);
+ if (percent > 100) {
+ percent = 100;
+ }
+ else if (percent < 0) {
+ percent = 0;
+ }
+ }
+ if (state.percent != percent) {
+ if ( state.percent < percent )
+ state.flags |= CHANGE_POWER_UP;
+ else
+ state.flags |= CHANGE_POWER_DOWN;
+ state.percent = percent;
+ ++state.update;
+ }
+
+ if (discharge_rate > 0) {
+ time_units = charge / (discharge_rate / 60);
+ } else if (charge_rate > 0 && design > 0 && charging) {
+ time_units = (design - charge) / (charge_rate / 60);
+ }
+
+ /* we can display maximum 99:59 */
+ if ( time_units > 5999 )
+ time_units = 5999;
+ if (state.time_left != time_units) {
+ state.time_left = time_units;
+ ++state.update;
+ }
+ close(fd);
+ return;
+}
+
void ReadAPMDevice( ) /* NetBSD version */
{
int fd;
struct apm_power_info info;
memset(&info, 0, sizeof(info));
if ((fd = open(apm_device_file, O_RDONLY)) == -1) {
- error_handle(1, "");
+ TrySysmonDevice();
return;
}
if (ioctl(fd, APM_IOC_GETPOWER, &info) == -1) {
- error_handle(4, "");
close(fd);
+ TrySysmonDevice();
return;
}
close(fd);