4 files changed, 17 insertions, 9 deletions

diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index a3c0bb63c872..a45533342f95 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	tpb
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -38,7 +39,8 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
+		s|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/src/cfg.h \
 		${WRKSRC}/man/tpb.1
 
diff --git a/deskutils/tpb/files/patch-man-tpb.1 b/deskutils/tpb/files/patch-man-tpb.1
index dac2d56d1b2f..ace8e6f3484e 100644
--- a/deskutils/tpb/files/patch-man-tpb.1
+++ b/deskutils/tpb/files/patch-man-tpb.1
@@ -1,5 +1,5 @@
 --- man/tpb.1.orig	Mon Aug 23 13:01:45 2004
-+++ man/tpb.1	Thu Jun  9 23:49:03 2005
++++ man/tpb.1	Fri Jun 10 15:06:52 2005
 @@ -7,7 +7,7 @@
  With TPB it is possible to bind a program to the ThinkPad, Mail, Home and Search button.
  TPB can also run a callback program on each state change with the changed state and the new state as options. 
@@ -28,7 +28,7 @@
  .TP 8
  .B POLLTIME
  Defines the delay between polls in microseconds. Default is 200000.
-@@ -266,9 +267,11 @@
+@@ -266,14 +267,16 @@
  .B OSDALIGN
  Defines the alignment of the osd. Possible values are left, center and right. Default is left.
  .SH "NOTES"
@@ -36,8 +36,14 @@
 +Requires NVRAM device /dev/nvram on Linux. This must be enabled in your kernel.
  Although the device file must exist. The device file could be created with
  \'mknod /dev/nvram c 10 144\'
-+
-+On FreeBSD you have to load the acpi_ibm(4) driver prior to using TPB.
  
++On FreeBSD you have to load the acpi_ibm(4) driver prior to using TPB.
++
  This program was developed on a Thinkpad Model T21. I don't know if it works on
  other models.
+ .SH EXAMPLE
+-tpb \-\-osd=off \-\-verbose \-\-thinkpad="xterm \-T ntpctl \-e ntpctl"
++tpb \-\-osd=off \-\-verbose \-\-thinkpad="%%X11BASE%%/bin/xterm"
+ .SH COPYRIGHT
+ Copyright 2002-2004, Markus Braun <markus.braun@krawel.de>
+ .PP
diff --git a/deskutils/tpb/files/patch-src-tpb.c b/deskutils/tpb/files/patch-src-tpb.c
index a57e61a43def..3ffe002c8714 100644
--- a/deskutils/tpb/files/patch-src-tpb.c
+++ b/deskutils/tpb/files/patch-src-tpb.c
@@ -1,5 +1,5 @@
 --- src/tpb.c.orig	Sun Aug 22 15:45:11 2004
-+++ src/tpb.c	Fri Jun 10 00:11:56 2005
++++ src/tpb.c	Fri Jun 10 15:03:42 2005
 @@ -34,6 +34,10 @@
  #include <unistd.h>
  #include "config.h"
@@ -101,7 +101,7 @@
    /* only use writeback to nvram when cfg.mixersteps is different from DEFAULT_MIXERSTEPS */
    if(cfg.mixersteps != DEFAULT_MIXERSTEPS) {
 +#ifdef __FreeBSD__
-+    u_int n = 0;
++    u_int n = thinkpad_state->volume_level;
 +
 +    if (sysctlbyname("dec.acpi_ibm.0.volume", NULL, NULL, &n, sizeof(n)))
 +      fprintf(stderr, _("Unable to set volume sysctl"));
diff --git a/deskutils/tpb/pkg-descr b/deskutils/tpb/pkg-descr
index 0e07bdaa8a97..99c13b554bd6 100644
--- a/deskutils/tpb/pkg-descr
+++ b/deskutils/tpb/pkg-descr
@@ -1,5 +1,5 @@
-With TPB it is possible to bind a program to the ThinkPad, Mail, Home and
-Search button. TPB can also run a callback program on each state change with
+With TPB it is possible to bind programs to the ThinkPad, Mail, Home and
+Search buttons. TPB can also run a callback program on each state change with
 the changed state and the new state as options. So it is possible to trigger
 several actions on different events.