Some fixes and improvements:

* configure require libXt to check X11, as PR 42085
* Set LICENSE=gnu-gpl-v2
* add DESTDIR support.
* need lex and yacc
* marked as MAKE_JOBS_SAFE=no
* set SETUID_ROOT_PERMS to executables.

4 files changed, 47 insertions, 15 deletions

diff --git a/sysutils/toshutils/Makefile b/sysutils/toshutils/Makefile
index da9b59989b8..cd5fad55829 100644
--- a/sysutils/toshutils/Makefile
+++ b/sysutils/toshutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/12/06 02:11:26 obache Exp $
+# $NetBSD: Makefile,v 1.16 2009/09/18 09:37:01 obache Exp $
 #
 
 DISTNAME=	toshutils-991217
@@ -9,16 +9,30 @@ 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
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 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:
-	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/toshutils
 .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}	${PREFIX}/share/doc/toshutils
+	${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"
diff --git a/sysutils/toshutils/distinfo b/sysutils/toshutils/distinfo
index 2acf88fd022..bdbbdb73c8b 100644
--- a/sysutils/toshutils/distinfo
+++ b/sysutils/toshutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/12/06 02:12:44 obache Exp $
+$NetBSD: distinfo,v 1.7 2009/09/18 09:37:01 obache Exp $
 
 SHA1 (toshutils-991217.tar.gz) = b4eaf35fed37890c08f60999a2143f023cf632c1
 RMD160 (toshutils-991217.tar.gz) = ea81ea88f53a4c0ed960868fc0604f9f82aeb836
@@ -6,7 +6,7 @@ Size (toshutils-991217.tar.gz) = 138892 bytes
 SHA1 (patch-aa) = 1e984f192a9d4b66b0e66acea8ce892e362ba072
 SHA1 (patch-ab) = a654bc20cbd3c559038589dbb78c9a1f70552835
 SHA1 (patch-ac) = 577362932ded64ac662355ae6a75153536d6faa3
-SHA1 (patch-ad) = d69707bee4730bbedcc59f7b2ae6c6b4532c92b6
+SHA1 (patch-ad) = 83f38f0f4c1ee3e5c368f34e49c4456dc2966d41
 SHA1 (patch-ae) = 5f1900c73732b38398fa1e04226c737cc66b220a
 SHA1 (patch-af) = bc22997f54a9880469749e5f7038c39d5cdc822a
 SHA1 (patch-ag) = 4ce55b6a00234b201871bbb0fe808f173f99d7d8
@@ -15,7 +15,7 @@ SHA1 (patch-ai) = 613f3f28c8f93a1e584038c0308cabcc276f70a8
 SHA1 (patch-aj) = 305bbffb95e1fd50fcb73a2fe9a0c1452815a284
 SHA1 (patch-ak) = c9ede3de555ab14c8a0702a80e904547f31da386
 SHA1 (patch-al) = f2a06cf56e11a4ebb95a6d7ebda4b1c15dd0733d
-SHA1 (patch-am) = 43bba59c837c951e0b71c80365cf620ff3e05419
+SHA1 (patch-am) = 37ef9a6582432d4f49aecac25116c0304f22167f
 SHA1 (patch-an) = 4d682ceb01d89ae676ba2fd1b342a50979c8694e
 SHA1 (patch-ao) = ce863073a18463643a8c02b1d81efa3e8c31d805
 SHA1 (patch-ap) = 996325634e8f78c85ea9706fd4f67bccb7602954
diff --git a/sysutils/toshutils/patches/patch-ad b/sysutils/toshutils/patches/patch-ad
index 60a6fcfe9d0..195d3f06417 100644
--- a/sysutils/toshutils/patches/patch-ad
+++ b/sysutils/toshutils/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.2 2000/09/02 19:24:34 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2009/09/18 09:37:01 obache Exp $
 
---- src/Makefile.in.orig	Fri Dec 17 14:07:03 1999
+--- src/Makefile.in.orig	1999-12-17 13:07:03.000000000 +0000
 +++ src/Makefile.in
-@@ -62,8 +62,8 @@
+@@ -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@
+@@ -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
  #
@@ -13,7 +22,7 @@ $NetBSD: patch-ad,v 1.2 2000/09/02 19:24:34 wiz Exp $
  GTKLIBS = @GTK_LIBS@
  GTKFLAGS = @GTK_CFLAGS@
  XMESSAGE = @XMESSAGE@
-@@ -88,37 +88,37 @@
+@@ -88,37 +88,37 @@ sci.o: sci.c
  	$(CC) -m486 -Wall -c sci.c
  
  fan: $(FANOBJS)
diff --git a/sysutils/toshutils/patches/patch-am b/sysutils/toshutils/patches/patch-am
index ec8e138c5be..e05850b3c42 100644
--- a/sysutils/toshutils/patches/patch-am
+++ b/sysutils/toshutils/patches/patch-am
@@ -1,8 +1,17 @@
-$NetBSD: patch-am,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
+$NetBSD: patch-am,v 1.2 2009/09/18 09:37:01 obache Exp $
 
---- doc/Makefile.in.orig	Mon Dec 20 01:10:49 1999
-+++ doc/Makefile.in	Mon Dec 20 01:11:24 1999
-@@ -36,7 +36,7 @@
+--- 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) $<
  
@@ -11,7 +20,7 @@ $NetBSD: patch-am,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
  
  hci: hci.pdf
  
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ toshiba: toshiba.pdf
  install:
  	$(MANINSTALL) fan.1 $(MANDESTDIR)/man1/fan.1
  	$(MANINSTALL) svpw.1 $(MANDESTDIR)/man1/svpw.1