Import of pkgsrc-2013Q2

sysutils/toshutils/DESCR

@@ -0,0 +1,3 @@
+The Toshiba Linux utilities are specific to Toshiba laptops, and
+will not run on laptops from other manufactures. Tools are included
+to turn the fan on/off, etc.

sysutils/toshutils/Makefile

@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.18 2012/10/23 19:51:27 asau Exp $
+#
+
+DISTNAME=	toshutils-991217
+PKGREVISION=	5
+CATEGORIES=	sysutils
+MASTER_SITES=	# http://www.buzzard.me.uk/toshiba/downloads/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.buzzard.me.uk/toshiba/
+COMMENT=	NetBSD port of the Toshiba(tm) Linux Utilities
+LICENSE=	gnu-gpl-v2
+
+ONLY_FOR_PLATFORM= *-*-i386
+
+MAKE_JOBS_SAFE=	no
+
+GNU_CONFIGURE=	YES
+
+USE_TOOLS+=	lex yacc
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/toshutils
+
+post-install:
+.for f in ac.gif battery.gif hand.gif display.html machine.html modules.html size.html space.html style.html tuxtime.html whatis.html hci.tex sci.tex toshiba.tex
+	${INSTALL_MAN} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/doc/toshutils
+.endfor
+
+.for p in alarm dispswitch fan hotkey tdocked thotswap tuxtime-conf
+SPECIAL_PERMS+=		bin/${p} ${SETUID_ROOT_PERMS}
+.endfor
+
+BUILDLINK_DEPMETHOD.libXt=	build
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

sysutils/toshutils/PLIST

@@ -0,0 +1,28 @@
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:15 joerg Exp $
+bin/alarm
+bin/dispswitch
+bin/fan
+bin/hotkey
+bin/tdocked
+bin/thotswap
+bin/tuxtime-conf
+man/man1/alarm.1
+man/man1/fan.1
+man/man1/hotkey.1
+man/man1/svpw.1
+man/man1/tdocked.1
+man/man1/tpasswd.1
+share/doc/toshutils/ac.gif
+share/doc/toshutils/battery.gif
+share/doc/toshutils/display.html
+share/doc/toshutils/hand.gif
+share/doc/toshutils/hci.tex
+share/doc/toshutils/machine.html
+share/doc/toshutils/modules.html
+share/doc/toshutils/sci.tex
+share/doc/toshutils/size.html
+share/doc/toshutils/space.html
+share/doc/toshutils/style.html
+share/doc/toshutils/toshiba.tex
+share/doc/toshutils/tuxtime.html
+share/doc/toshutils/whatis.html

sysutils/toshutils/distinfo

@@ -0,0 +1,21 @@
+$NetBSD: distinfo,v 1.8 2013/06/17 06:15:39 dholland Exp $
+
+SHA1 (toshutils-991217.tar.gz) = b4eaf35fed37890c08f60999a2143f023cf632c1
+RMD160 (toshutils-991217.tar.gz) = ea81ea88f53a4c0ed960868fc0604f9f82aeb836
+Size (toshutils-991217.tar.gz) = 138892 bytes
+SHA1 (patch-aa) = 1e984f192a9d4b66b0e66acea8ce892e362ba072
+SHA1 (patch-ab) = a654bc20cbd3c559038589dbb78c9a1f70552835
+SHA1 (patch-ac) = 577362932ded64ac662355ae6a75153536d6faa3
+SHA1 (patch-ad) = 1d8e2efb89cae04a1753c968d4db50ff82260450
+SHA1 (patch-ae) = 5f1900c73732b38398fa1e04226c737cc66b220a
+SHA1 (patch-af) = bc22997f54a9880469749e5f7038c39d5cdc822a
+SHA1 (patch-ag) = 4ce55b6a00234b201871bbb0fe808f173f99d7d8
+SHA1 (patch-ah) = c6c6a52ebb7e24646748f14ffebf8871cbbacbe6
+SHA1 (patch-ai) = 613f3f28c8f93a1e584038c0308cabcc276f70a8
+SHA1 (patch-aj) = 305bbffb95e1fd50fcb73a2fe9a0c1452815a284
+SHA1 (patch-ak) = c9ede3de555ab14c8a0702a80e904547f31da386
+SHA1 (patch-al) = f2a06cf56e11a4ebb95a6d7ebda4b1c15dd0733d
+SHA1 (patch-am) = 37ef9a6582432d4f49aecac25116c0304f22167f
+SHA1 (patch-an) = 4d682ceb01d89ae676ba2fd1b342a50979c8694e
+SHA1 (patch-ao) = ce863073a18463643a8c02b1d81efa3e8c31d805
+SHA1 (patch-ap) = 996325634e8f78c85ea9706fd4f67bccb7602954

sysutils/toshutils/patches/patch-aa

@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.2 2000/01/07 06:38:00 soren Exp $
+
+--- configure.in.orig	Fri Dec 17 14:07:03 1999
++++ configure.in	Fri Jan  7 07:34:40 2000
+@@ -4,7 +4,7 @@
+ AC_REVISION([configure.in 1.1])
+ AC_INIT(src/sci.c)
+ 
+-PROGRAMS="fan svpw tpasswd alarm dispswitch tdocked thotswap"
++PROGRAMS="fan alarm dispswitch tdocked thotswap"
+ 
+ VERSION=1.2
+ 
+@@ -23,6 +23,8 @@
+ 
+ AC_CANONICAL_HOST
+ case "$host_os" in
++  netbsd*)
++  ;;
+   linux*)
+     OS_CFLAGS='-DLINUX'
+   ;;
+@@ -69,7 +71,7 @@
+ if test "$have_x" = "yes"; then
+   XLIB="-lX11 $X_EXTRA_LIBS"
+   EXTRAFLAGS=""
+-  PROGRAMS="$PROGRAMS hotkey wmtuxtime"       # programs to build if X11 found
++  PROGRAMS="$PROGRAMS hotkey"       # programs to build if X11 found
+ else
+   AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.])
+   XLIB=""

sysutils/toshutils/patches/patch-ab

@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.3 2002/03/21 05:13:42 fredb Exp $
+
+--- configure.orig	Fri Dec 17 14:07:03 1999
++++ configure	Fri Jan  7 07:33:46 2000
+@@ -526,7 +526,7 @@
+ 
+ 
+ 
+-PROGRAMS="fan svpw tpasswd alarm dispswitch tdocked thotswap"
++PROGRAMS="fan alarm dispswitch tdocked thotswap"
+ 
+ VERSION=1.2
+ 
+@@ -592,6 +592,8 @@
+ echo "$ac_t""$host" 1>&6
+ 
+ case "$host_os" in
++  netbsd*)
++  ;;
+   linux*)
+     OS_CFLAGS='-DLINUX'
+   ;;
+@@ -2770,7 +2772,7 @@
+ if test "$have_x" = "yes"; then
+   XLIB="-lX11 $X_EXTRA_LIBS"
+   EXTRAFLAGS=""
+-  PROGRAMS="$PROGRAMS hotkey wmtuxtime"       # programs to build if X11 found
++  PROGRAMS="$PROGRAMS hotkey"       # programs to build if X11 found
+ else
+   { echo "configure: error: *** libX11 not found. Check 'config.log' for more details." 1>&2; exit 1; }
+   XLIB=""

sysutils/toshutils/patches/patch-ac

@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/fan.c.orig	Fri Dec 17 14:07:03 1999
++++ src/fan.c	Mon Dec 20 03:33:31 1999
+@@ -75,7 +75,14 @@
+ #include<signal.h>
+ #include<paths.h>
+ #include<pwd.h>
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#define iopl i386_iopl
++#endif
++#ifdef __Linux__
+ #include<features.h>
++#endif
+ #include<sys/stat.h>
+ #ifdef __GLIBC__
+ #include<sys/perm.h>

sysutils/toshutils/patches/patch-ad

@@ -0,0 +1,96 @@
+$NetBSD: patch-ad,v 1.4 2013/06/17 06:15:39 dholland Exp $
+
+- destdir support
+- drop -m486 as compilers don't recognize it any more
+- add rpaths (shouldn't this use X11BASE and COMPILER_RPATH_FLAG?)
+- add -li386 (shouldn't this be OS-dependent?)
+
+--- src/Makefile.in.orig	1999-12-17 13:07:03.000000000 +0000
++++ src/Makefile.in
+@@ -29,7 +29,7 @@ INSTALL = @INSTALL@
+ BININSTALL = @INSTALL_PROGRAM@
+ MANINSTALL = @INSTALL_DATA@
+ prefix = @prefix@
+-BINDESTDIR = @prefix@/bin
++BINDESTDIR = $(DESTDIR)@prefix@/bin
+ MANDESTDIR = @mandir@
+ YACC = @YACC@
+ LEX = @LEX@
+@@ -40,7 +40,7 @@ LDFLAGS = -s
+ 
+ PROGRAMS = @PROGRAMS@
+ CC = @CC@
+-CFLAGS = -m486 -O2 -Wall -I../pixmaps @OS_CFLAGS@ @DEBUGFLAGS@ @GTK_CFLAGS@
++CFLAGS = -O2 -Wall -I../pixmaps @OS_CFLAGS@ @DEBUGFLAGS@ @GTK_CFLAGS@
+ 
+ 
+ FANOBJS = fan.o sci.o hci.o
+@@ -62,8 +62,8 @@ OBJS = sci.o hci.o fan.o svpw.o hotkey.o
+ #
+ # if your X11R6 libraries don't need X_LOCALE, remove -DX_LOCALE
+ #
+-XLIBS = -L/usr/X11R6/lib -lX11
+-WMLIBS = -L/usr/X11R6/lib -lXpm -lX11 -lXext
++XLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
++WMLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lXpm -lX11 -lXext
+ GTKLIBS = @GTK_LIBS@
+ GTKFLAGS = @GTK_CFLAGS@
+ XMESSAGE = @XMESSAGE@
+@@ -82,43 +82,43 @@ lex.yy.c: parsetime.l
+ 	$(LEX) -i parsetime.l
+ 
+ hci.o: hci.c
+-	$(CC) -m486 -Wall -c hci.c
++	$(CC) -Wall -c hci.c
+ 
+ sci.o: sci.c
+-	$(CC) -m486 -Wall -c sci.c
++	$(CC) -Wall -c sci.c
+ 
+ fan: $(FANOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(FANOBJS)
++	$(CC) $(LDFLAGS) -o $@ $(FANOBJS) -li386
+ 
+ svpw: $(SVPWOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(SVPWOBJS)
++	$(CC) $(LDFLAGS) -o $@ $(SVPWOBJS) -li386
+ 
+ hotkey: $(HOTOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS)
+-	
++	$(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS) -li386
++
+ dispswitch: $(DISPOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS) -li386
+ 
+ tpasswd: $(PASSOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(PASSOBJS)
++	$(CC) $(LDFLAGS) -o $@ $(PASSOBJS) -li386
+ 
+ alarm: $(ALARMOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(ALARMOBJS) $(LEXLIB)
++	$(CC) $(LDFLAGS) -o $@ $(ALARMOBJS) $(LEXLIB) -li386
+ 
+ ownerstring: $(OWNEROBJS)
+-	$(CC) $(LDFLAGS) -o $@ ($OWNEROBJS) $(READLIBS)
++	$(CC) $(LDFLAGS) -o $@ ($OWNEROBJS) $(READLIBS) -li386
+ 
+ tdocked: $(DOCKOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(DOCKOBJS)
++	$(CC) $(LDFLAGS) -o $@ $(DOCKOBJS) -li386
+ 
+ thotswap: $(SWAPOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(SWAPOBJS)
++	$(CC) $(LDFLAGS) -o $@ $(SWAPOBJS) -li386
+ 
+ tuxtime-conf: $(TUXCONFOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(TUXCONFOBJS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(TUXCONFOBJS) $(GTKLIBS) -li386
+ 
+ wmtuxtime: $(WMTUXOBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(WMTUXOBJS) $(WMLIBS)
++	$(CC) $(LDFLAGS) -o $@ $(WMTUXOBJS) $(WMLIBS) -li386
+ 
+ install: all
+ 	$(BININSTALL) -m 4755 $(PROGRAMS) $(BINDESTDIR)

sysutils/toshutils/patches/patch-ae

@@ -0,0 +1,50 @@
+$NetBSD: patch-ae,v 1.2 2000/04/26 11:59:17 hubertf Exp $
+
+--- src/parsetime.y.BAK	Wed Apr 26 13:54:25 2000
++++ src/parsetime.y	Wed Apr 26 13:54:35 2000
+@@ -1,6 +1,9 @@
+ %{
+ #include <time.h>
+ #include <stdlib.h>
++#ifdef __NetBSD__
++#include <stdio.h>
++#endif
+ #include <string.h>
+ #include "parsetime.h"
+ 
+@@ -290,6 +293,10 @@
+ 
+ 
+ time_t parsetime(int, char **);
++#ifdef __NetBSD__
++int yyparse __P((void));
++#endif
++
+ 
+ time_t
+ parsetime(int argc, char **argv)
+@@ -305,10 +312,24 @@
+     if (yyparse() == 0) {
+ 	exectime = mktime(&exectm);
+ 	if (isgmt) {
++#if __NetBSD__
++	    struct tm *tm;
++	    time_t t;
++
++	    time(&t);
++	    tm=localtime(&t);
++
++	    exectime += timezone;
++	    if (tm->tm_isdst) {
++		exectime -= 3600;
++	    }
++#else
++	/* the "daylight" variable is not part of the ANSI C spec - HF */
+ 	    exectime += timezone;
+ 	    if (daylight) {
+ 		exectime -= 3600;
+ 	    }
++#endif
+ 	}
+ 	if (time_only && (currtime > exectime)) {
+ 	    exectime += 24*3600;

sysutils/toshutils/patches/patch-af

@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/alarm.c.orig	Fri Dec 17 14:07:03 1999
++++ src/alarm.c	Mon Dec 20 03:33:32 1999
+@@ -33,6 +33,11 @@
+ #ifdef __GLIBC__
+ #include<sys/perm.h>
+ #endif
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#define iopl i386_iopl
++#endif
+ 
+ #include"sci.h"
+ #include"parsetime.h"

sysutils/toshutils/patches/patch-ag

@@ -0,0 +1,37 @@
+$NetBSD: patch-ag,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/dispswitch.c.orig	Fri Dec 17 14:07:03 1999
++++ src/dispswitch.c	Mon Dec 20 03:34:54 1999
+@@ -40,7 +40,14 @@
+ #include<signal.h>
+ #include<paths.h>
+ #include<pwd.h>
++#ifdef Linux
+ #include<features.h>
++#endif
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#include <err.h>
++#endif
+ #ifdef __GLIBC__
+ #include<sys/perm.h>
+ #endif
+@@ -276,10 +283,17 @@
+ 
+ 	/* get the necessary I/O permissions */
+ 
++#ifdef __NetBSD__
++	if (i386_iopl(3) == -1) {
++		warn("i386_iopl");
++		return 1;
++	}
++#else
+ 	if (ioperm(0xb2, 1, 1)) {
+ 		fprintf(stderr, "dispswitch: can't get I/O permissions.\n");
+ 		return 1;
+ 	}
++#endif
+ 
+         /* drop root priveleges to minimize the risk of running suid root */
+ 

sysutils/toshutils/patches/patch-ah

@@ -0,0 +1,34 @@
+$NetBSD: patch-ah,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/tdocked.c.orig	Fri Dec 17 14:07:03 1999
++++ src/tdocked.c	Mon Dec 20 03:35:38 1999
+@@ -32,6 +32,11 @@
+ #ifdef __GLIBC__
+ #include<sys/perm.h>
+ #endif
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#include <err.h>
++#endif
+ 
+ #include"hci.h"
+ #include"sci.h"
+@@ -56,10 +61,17 @@
+ 
+ 	/* get the necessary I/O permissions */
+ 
++#ifdef __NetBSD__
++        if (i386_iopl(3) == -1) { 
++                warn("i386_iopl");
++                return 1;
++        }
++#else
+ 	if (ioperm(0xb2, 1, 1)) {
+ 		fprintf(stderr, "tdocked: can't get I/O permissions.\n");
+ 		return 0xff;
+ 	}
++#endif
+ 
+ 	/* drop root priveleges to reduce security risk of running suid root */
+ 

sysutils/toshutils/patches/patch-ai

@@ -0,0 +1,37 @@
+$NetBSD: patch-ai,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/thotswap.c.orig	Fri Dec 17 14:07:03 1999
++++ src/thotswap.c	Mon Dec 20 03:36:10 1999
+@@ -40,7 +40,14 @@
+ #include<syslog.h>
+ #include<paths.h>
+ #include<pwd.h>
++#ifdef Linux
+ #include<features.h>
++#endif
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#include <err.h>
++#endif
+ #ifdef __GLIBC__
+ #include<sys/perm.h>
+ #endif
+@@ -350,10 +357,17 @@
+ 
+ 	/* get the necessary I/O permissions */
+ 
++#ifdef __NetBSD__
++        if (i386_iopl(3) == -1) { 
++                warn("i386_iopl");
++                return 1;
++        }
++#else
+ 	if (ioperm(0xb2, 1, 1)) {
+ 		fprintf(stderr, "thotswap: can't get I/O permissions.\n");
+ 		return 1;
+ 	}
++#endif
+ 
+ 	/* do some quick checks on the laptop */
+ 

sysutils/toshutils/patches/patch-aj

@@ -0,0 +1,51 @@
+$NetBSD: patch-aj,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/hotkey.c.orig	Fri Dec 17 14:07:03 1999
++++ src/hotkey.c	Mon Dec 20 03:36:44 1999
+@@ -59,9 +59,18 @@
+ #include<stdio.h>
+ #include<stdlib.h>
+ #include<string.h>
++#ifdef Linux
+ #include<asm/io.h>
++#endif
+ #include<unistd.h>
++#ifdef Linux
+ #include<features.h>
++#endif
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#include <err.h>
++#endif
+ #include<signal.h>
+ #include<sys/types.h>
+ #include<paths.h>
+@@ -76,6 +85,9 @@
+ #include<X11/Xlib.h>
+ #include<X11/Xlocale.h>
+ 
++#ifdef __NetBSD__
++#undef setlocale
++#endif
+ 
+ #include"hotkey.h"
+ #include"sci.h"
+@@ -455,10 +467,17 @@
+ 
+ 	/* get the necessary I/O permissions */
+ 
++#ifdef __NetBSD__
++        if (i386_iopl(3) == -1) { 
++                warn("i386_iopl");
++                return 1;
++        }
++#else
+ 	if (iopl(3)) {
+ 		fprintf(stderr, "hotkey: can't get I/O permissions.\n");
+ 		return 1;
+ 	}
++#endif
+ 
+ 	/* drop root priveleges to minimize security risk of running suid root */
+ /*	

sysutils/toshutils/patches/patch-ak

@@ -0,0 +1,37 @@
+$NetBSD: patch-ak,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/wmtuxtime.c.orig	Fri Dec 17 14:07:03 1999
++++ src/wmtuxtime.c	Mon Dec 20 03:37:14 1999
+@@ -48,7 +48,14 @@
+ #include<signal.h>
+ #include<paths.h>
+ #include<pwd.h>
++#ifdef Linux
+ #include<features.h>
++#endif
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#include <err.h>
++#endif
+ #ifdef __GLIBC__
+ #include<sys/perm.h>
+ #endif
+@@ -876,10 +883,17 @@
+ 
+ 	/* get the necessary I/O permissions */
+ 
++#ifdef __NetBSD__
++        if (i386_iopl(3) == -1) { 
++                warn("i386_iopl");
++                return 1;
++        }
++#else
+ 	if (ioperm(0xb2, 1, 1)) {
+ 		fprintf(stderr, "tuxtime: can't get I/O permissions.\n");
+ 		return 1;
+ 	}
++#endif
+ 
+ 	/* do some quick checks on the laptop */
+ 

sysutils/toshutils/patches/patch-al

@@ -0,0 +1,35 @@
+$NetBSD: patch-al,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+
+--- src/tuxtime-conf.c.orig	Fri Dec 17 14:07:03 1999
++++ src/tuxtime-conf.c	Mon Dec 20 03:33:35 1999
+@@ -35,7 +35,12 @@
+ #include<signal.h>
+ #include<paths.h>
+ #include<pwd.h>
++#ifdef Linux
+ #include<features.h>
++#endif
++#ifdef __NetBSD__
++#include <err.h>
++#endif
+ #ifdef __GLIBC__
+ #include<sys/perm.h>
+ #endif
+@@ -167,10 +172,17 @@
+ 
+ 	/* get the necessary I/O permissions */
+ 
++#ifdef __NetBSD__
++        if (i386_iopl(3) == -1) { 
++                warn("i386_iopl");
++                return 1;
++        }
++#else
+ 	if (ioperm(0xb2, 1, 1)) {
+ 		fprintf(stderr, "tuxtime-conf: can't get I/O permissions.\n");
+ 		return 1;
+ 	}
++#endif
+ 
+ 	/* do a quick check on the laptop */
+ 

sysutils/toshutils/patches/patch-am

@@ -0,0 +1,31 @@
+$NetBSD: patch-am,v 1.2 2009/09/18 09:37:01 obache Exp $
+
+--- doc/Makefile.in.orig	1999-12-17 13:07:03.000000000 +0000
++++ doc/Makefile.in
+@@ -26,7 +26,7 @@
+ INSTALL = @INSTALL@
+ MANINSTALL = @INSTALL_DATA@
+ prefix = @prefix@
+-MANDESTDIR = @mandir@
++MANDESTDIR = $(DESTDIR)@mandir@
+ 
+ PDF = /usr/bin/pdflatex
+ 
+@@ -36,7 +36,7 @@ PDF = /usr/bin/pdflatex
+ .tex.pdf:
+ 	$(PDF) $<
+ 
+-all: hci sci toshiba
++all: #HF# hci sci toshiba
+ 
+ hci: hci.pdf
+ 
+@@ -48,7 +48,7 @@ toshiba: toshiba.pdf
+ install:
+ 	$(MANINSTALL) fan.1 $(MANDESTDIR)/man1/fan.1
+ 	$(MANINSTALL) svpw.1 $(MANDESTDIR)/man1/svpw.1
+-	$(MANINSTALL) hotkey.1x $(MANDESTDIR)/man1/hotkey.1x
++	$(MANINSTALL) hotkey.1x $(MANDESTDIR)/man1/hotkey.1
+ 	$(MANINSTALL) tpasswd.1 $(MANDESTDIR)/man1/tpasswd.1
+ 	$(MANINSTALL) alarm.1 $(MANDESTDIR)/man1/alarm.1
+ 	$(MANINSTALL) tdocked.1 $(MANDESTDIR)/man1/tdocked.1

sysutils/toshutils/patches/patch-an

@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2005/04/23 20:37:18 riz Exp $
+--- src/hci.c.orig	2005-04-14 10:44:42.000000000 -0700
++++ src/hci.c	2005-04-14 11:10:30.000000000 -0700
+@@ -115,8 +115,8 @@
+ 		ax = 0x0000;		
+ 	} else {
+ 		asm ("inb $0xb2,%%al\n" \
+-			:"=ax" (ax), "=bx" (bx), "=cx" (cx), "=dx" (dx) \
+-			:"ax" (ax), "bx" (bx), "cx" (cx), "dx" (dx) \
++			:"=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) \
++			:"a" (ax), "b" (bx), "c" (cx), "d" (dx) \
+ 			: "memory" );
+ 	}
+ 	

sysutils/toshutils/patches/patch-ao

@@ -0,0 +1,43 @@
+$NetBSD: patch-ao,v 1.1 2005/04/23 20:37:18 riz Exp $
+--- src/sci.c.orig	1999-12-17 05:07:03.000000000 -0800
++++ src/sci.c	2005-04-14 11:25:05.000000000 -0700
+@@ -98,7 +98,7 @@
+ 		"popl %%ecx\n\t" \
+ 		"popl %%ebx\n\t" \
+ 		"popl %%eax\n" \
+-		:"=dx" (dx), "=ah" (ah) : : "memory" );
++		:"=d" (dx), "=a" (ah) : : "memory" );
+ 
+ 	*version = (int) dx;
+ 
+@@ -149,7 +149,7 @@
+ 		"popl %%ecx\n\t" \
+ 		"popl %%ebx\n\t" \
+ 		"popl %%eax\n" \
+-		:"=ah" (ah) : : "memory" );
++		:"=a" (ah) : : "memory" );
+ 
+ 	return (int) (ah & 0xff);
+ }
+@@ -173,8 +173,8 @@
+ 		"inb $0xb2,%%al\n\t" \
+ 		"popl %%edi\n\t" \
+ 		"popl %%esi\n" \
+-		:"=ax" (ax), "=bx" (bx), "=cx" (cx), "=dx" (dx) \
+-		:"bx" (bx), "cx" (cx) \
++		:"=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) \
++		:"b" (bx), "c" (cx) \
+ 		: "memory" );
+ 
+ 	reg->attribute = (ax & 0xff);
+@@ -205,8 +205,8 @@
+ 		"inb $0xb2,%%al\n\t" \
+ 		"popl %%edi\n\t" \
+ 		"popl %%esi\n" \
+-		:"=ax" (ax) \
+-		:"bx" (bx), "cx" (cx), "dx" (dx) \
++		:"=a" (ax) \
++		:"b" (bx), "c" (cx), "d" (dx) \
+ 		: "memory" );
+ 
+ 	reg->attribute = (ax & 0xff);

sysutils/toshutils/patches/patch-ap

@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2007/12/06 02:12:44 obache Exp $
+
+--- src/machine.h.orig	1999-12-17 13:07:03.000000000 +0000
++++ src/machine.h
+@@ -23,8 +23,6 @@
+ #ifndef MACHINE_H
+ #define MACHINE_H
+ 
+-extern int powermode;
+-
+ void MachineOkCallback(GtkWidget *widget, GtkWidget *dialog);
+ void MachineCancelCallback(GtkWidget *widget, GtkWidget *dialog);
+ void MachineDefaultsCallback(GtkWidget *widget, gpointer *data);