10 files changed, 62 insertions, 56 deletions
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 19f3e513378d..b5c61ecce723 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	1.0.8
+PORTVERSION=	1.2.1
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		http://newweb.wt.net/~billw/ \
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index ef61ab7320c3..48f353da92b6 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.0.8.tar.gz) = 4fd95064782d6c6061097e5cddf19889
+MD5 (gkrellm-1.2.1.tar.gz) = cc40732a0319f99cdb8ee6814882978a
diff --git a/sysutils/gkrellm/files/patch-af b/sysutils/gkrellm/files/patch-af
index efca767acaf6..ad9ad5b78321 100644
--- a/sysutils/gkrellm/files/patch-af
+++ b/sysutils/gkrellm/files/patch-af
@@ -1,22 +1,23 @@
 Index: gkrellm.1
 diff -u gkrellm.1.orig gkrellm.1
---- gkrellm.1.orig	Wed Mar 14 21:04:26 2001
-+++ gkrellm.1	Thu Mar 15 00:12:14 2001
+--- gkrellm.1.orig	Thu Jul 12 08:23:47 2001
++++ gkrellm.1	Mon Jul 30 20:51:15 2001
 @@ -1,4 +1,4 @@
 -.TH gkrellm 1 "Febuary 3, 2001" "Olympus GNU/Linux" "User's Manual"
 +.TH gkrellm 1 "Febuary 3, 2001" "FreeBSD" "User's Manual"
  
  .SH "NAME"
  gkrellm \- The GNU Krell Monitors
-@@ -322,18 +322,18 @@
+@@ -365,7 +365,7 @@
  ppp is connecting, and the on state is the ppp link connected.
  The phone line lock is determined by the existence of the modem
  lock file
--.IR /var/lock/LCK..modem.
-+.IR /var/spool/lock/LCK..modem.
- If your pppd setup does not use
- .IR /dev/modem,
- then you can configure an alternative with:
+-.IR /var/lock/LCK..modem,
++.IR /var/spool/lock/LCK..modem,
+ which assumes pppd is using
+ .IR /dev/modem.
+ However, if your pppd setup does not use
+@@ -374,11 +374,11 @@
  .PP
  .RS
  .nf
@@ -25,12 +26,12 @@ diff -u gkrellm.1.orig gkrellm.1
  .fi
  .RE
  .IP
--where ttySx is the tty device your modem uses.  The ppp on
-+where cuaaS is the tty device your modem uses.  The ppp on
+-where ttySx is the tty device your modem does use.  The ppp on
++where cuaaS is the tty device your modem does use.  The ppp on
  state is detected by the existence of
  .IR /var/run/pppX.pid
  and the time stamp of this file is the base for the on line time.
-@@ -781,7 +781,7 @@
+@@ -839,7 +839,7 @@
  .PP
  .B gkrellm
  also searches
@@ -39,7 +40,7 @@ diff -u gkrellm.1.orig gkrellm.1
  for any system wide themes installed as part of a distribution.
  Finally, a theme you simply want to check out can be untarred anywhere and
  used by running:
-@@ -806,12 +806,12 @@
+@@ -864,12 +864,12 @@
  The directories
  .IR /usr/local/lib/gkrellm/plugins
  and
@@ -54,7 +55,7 @@ diff -u gkrellm.1.orig gkrellm.1
  are still installed, but this is not compatible with the FHS.
  .PP
  Some plugins may be available only as source files and they will
-@@ -832,7 +832,7 @@
+@@ -890,7 +890,7 @@
  .I ~/.gkrellm/plugins
  User plugin directory.
  .TP
@@ -63,7 +64,7 @@ diff -u gkrellm.1.orig gkrellm.1
  System wide plugin directory.
  .TP
  .I /usr/local/lib/gkrellm/plugins
-@@ -841,7 +841,7 @@
+@@ -899,7 +899,7 @@
  .I ~/.gkrellm/themes
  User theme directory.
  .TP
diff --git a/sysutils/gkrellm/pkg-descr b/sysutils/gkrellm/pkg-descr
index ace37904d8eb..760a51af117b 100644
--- a/sysutils/gkrellm/pkg-descr
+++ b/sysutils/gkrellm/pkg-descr
@@ -4,7 +4,7 @@ GKrellM - GNU (or Gtk) Krell Monitors (or Meters)
 
 Author:	Bill Wilson
 Email:  bill@gkrellm.net
-WWW:    http://gkrellm.net/
+WWW:    http://gkrellm.net
 
 Copyright (c) 1999-2000 by Bill Wilson.  This program is free software
 which I release under the GNU General Public License.
@@ -24,10 +24,12 @@ GKrellM Features
 	* Internet monitor that displays current and charts historical port hits.
 	* Memory and swap space usage meters and a system uptime monitor.
 	* File system meters show capacity/free space and can mount/umount.
-	* A mailbox monitor which can launch mail reader, remote mail fetch.
+	* A mbox/maildir/MH/POP3/IMAP mail monitor which can launch a mail reader
+	  or remote mail fetch program.
 	* Clock/calendar and hostname display.
 	* APM laptop battery monitor.
-	* CPU/motherboard temperature display if lm_sensors modules installed.
+	* CPU/motherboard temperature/fan/voltages display if lm_sensors modules
+	  installed.
 
 	* Multiple monitors managed by a single process to reduce system load.
 	* A timer button that can execute PPP or ISDN logon/logoff scripts.
@@ -38,7 +40,7 @@ GKrellM Features
 	  is used for CPU sys time, disk write, load, and net transmit data.
 	* Commands can be configured to run when monitor labels are clicked.
 	* GKrellM is plugin capable so special interest monitors can be created.
-	* A different theme can be created with the GIMP.
+	* Many themes are available.
 
 
 - Hajimu UMEMOTO <ume@FreeBSD.org>
diff --git a/sysutils/gkrellm/pkg-plist b/sysutils/gkrellm/pkg-plist
index e6f7680fb313..3d85c69dfb01 100644
--- a/sysutils/gkrellm/pkg-plist
+++ b/sysutils/gkrellm/pkg-plist
@@ -1,6 +1,14 @@
 bin/gkrellm
 include/gkrellm/gkrellm.h
 include/gkrellm/gkrellm_public_proto.h
+%%PORTDOCS%%share/doc/gkrellm/COPYRIGHT
+%%PORTDOCS%%share/doc/gkrellm/README
+%%PORTDOCS%%share/doc/gkrellm/Themes.html
+share/locale/de/LC_MESSAGES/gkrellm.mo
+share/locale/es/LC_MESSAGES/gkrellm.mo
+share/locale/fr/LC_MESSAGES/gkrellm.mo
+share/locale/ja/LC_MESSAGES/gkrellm.mo
+%%PORTDOCS%%@dirrm share/doc/gkrellm
 @dirrm include/gkrellm
 @exec mkdir -p %D/libexec/gkrellm/plugins
 @exec mkdir -p %D/share/gkrellm/themes
@@ -8,11 +16,3 @@ include/gkrellm/gkrellm_public_proto.h
 @unexec rmdir %D/libexec/gkrellm 2>/dev/null || true
 @unexec rmdir %D/share/gkrellm/themes 2>/dev/null || true
 @unexec rmdir %D/share/gkrellm 2>/dev/null || true
-share/doc/gkrellm/COPYRIGHT
-share/doc/gkrellm/README
-share/doc/gkrellm/Themes.html
-share/locale/de/LC_MESSAGES/gkrellm.mo
-share/locale/es/LC_MESSAGES/gkrellm.mo
-share/locale/fr/LC_MESSAGES/gkrellm.mo
-share/locale/ja/LC_MESSAGES/gkrellm.mo
-@dirrm share/doc/gkrellm
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 19f3e513378d..b5c61ecce723 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	1.0.8
+PORTVERSION=	1.2.1
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		http://newweb.wt.net/~billw/ \
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index ef61ab7320c3..48f353da92b6 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.0.8.tar.gz) = 4fd95064782d6c6061097e5cddf19889
+MD5 (gkrellm-1.2.1.tar.gz) = cc40732a0319f99cdb8ee6814882978a
diff --git a/sysutils/gkrellm2/files/patch-af b/sysutils/gkrellm2/files/patch-af
index efca767acaf6..ad9ad5b78321 100644
--- a/sysutils/gkrellm2/files/patch-af
+++ b/sysutils/gkrellm2/files/patch-af
@@ -1,22 +1,23 @@
 Index: gkrellm.1
 diff -u gkrellm.1.orig gkrellm.1
---- gkrellm.1.orig	Wed Mar 14 21:04:26 2001
-+++ gkrellm.1	Thu Mar 15 00:12:14 2001
+--- gkrellm.1.orig	Thu Jul 12 08:23:47 2001
++++ gkrellm.1	Mon Jul 30 20:51:15 2001
 @@ -1,4 +1,4 @@
 -.TH gkrellm 1 "Febuary 3, 2001" "Olympus GNU/Linux" "User's Manual"
 +.TH gkrellm 1 "Febuary 3, 2001" "FreeBSD" "User's Manual"
  
  .SH "NAME"
  gkrellm \- The GNU Krell Monitors
-@@ -322,18 +322,18 @@
+@@ -365,7 +365,7 @@
  ppp is connecting, and the on state is the ppp link connected.
  The phone line lock is determined by the existence of the modem
  lock file
--.IR /var/lock/LCK..modem.
-+.IR /var/spool/lock/LCK..modem.
- If your pppd setup does not use
- .IR /dev/modem,
- then you can configure an alternative with:
+-.IR /var/lock/LCK..modem,
++.IR /var/spool/lock/LCK..modem,
+ which assumes pppd is using
+ .IR /dev/modem.
+ However, if your pppd setup does not use
+@@ -374,11 +374,11 @@
  .PP
  .RS
  .nf
@@ -25,12 +26,12 @@ diff -u gkrellm.1.orig gkrellm.1
  .fi
  .RE
  .IP
--where ttySx is the tty device your modem uses.  The ppp on
-+where cuaaS is the tty device your modem uses.  The ppp on
+-where ttySx is the tty device your modem does use.  The ppp on
++where cuaaS is the tty device your modem does use.  The ppp on
  state is detected by the existence of
  .IR /var/run/pppX.pid
  and the time stamp of this file is the base for the on line time.
-@@ -781,7 +781,7 @@
+@@ -839,7 +839,7 @@
  .PP
  .B gkrellm
  also searches
@@ -39,7 +40,7 @@ diff -u gkrellm.1.orig gkrellm.1
  for any system wide themes installed as part of a distribution.
  Finally, a theme you simply want to check out can be untarred anywhere and
  used by running:
-@@ -806,12 +806,12 @@
+@@ -864,12 +864,12 @@
  The directories
  .IR /usr/local/lib/gkrellm/plugins
  and
@@ -54,7 +55,7 @@ diff -u gkrellm.1.orig gkrellm.1
  are still installed, but this is not compatible with the FHS.
  .PP
  Some plugins may be available only as source files and they will
-@@ -832,7 +832,7 @@
+@@ -890,7 +890,7 @@
  .I ~/.gkrellm/plugins
  User plugin directory.
  .TP
@@ -63,7 +64,7 @@ diff -u gkrellm.1.orig gkrellm.1
  System wide plugin directory.
  .TP
  .I /usr/local/lib/gkrellm/plugins
-@@ -841,7 +841,7 @@
+@@ -899,7 +899,7 @@
  .I ~/.gkrellm/themes
  User theme directory.
  .TP
diff --git a/sysutils/gkrellm2/pkg-descr b/sysutils/gkrellm2/pkg-descr
index ace37904d8eb..760a51af117b 100644
--- a/sysutils/gkrellm2/pkg-descr
+++ b/sysutils/gkrellm2/pkg-descr
@@ -4,7 +4,7 @@ GKrellM - GNU (or Gtk) Krell Monitors (or Meters)
 
 Author:	Bill Wilson
 Email:  bill@gkrellm.net
-WWW:    http://gkrellm.net/
+WWW:    http://gkrellm.net
 
 Copyright (c) 1999-2000 by Bill Wilson.  This program is free software
 which I release under the GNU General Public License.
@@ -24,10 +24,12 @@ GKrellM Features
 	* Internet monitor that displays current and charts historical port hits.
 	* Memory and swap space usage meters and a system uptime monitor.
 	* File system meters show capacity/free space and can mount/umount.
-	* A mailbox monitor which can launch mail reader, remote mail fetch.
+	* A mbox/maildir/MH/POP3/IMAP mail monitor which can launch a mail reader
+	  or remote mail fetch program.
 	* Clock/calendar and hostname display.
 	* APM laptop battery monitor.
-	* CPU/motherboard temperature display if lm_sensors modules installed.
+	* CPU/motherboard temperature/fan/voltages display if lm_sensors modules
+	  installed.
 
 	* Multiple monitors managed by a single process to reduce system load.
 	* A timer button that can execute PPP or ISDN logon/logoff scripts.
@@ -38,7 +40,7 @@ GKrellM Features
 	  is used for CPU sys time, disk write, load, and net transmit data.
 	* Commands can be configured to run when monitor labels are clicked.
 	* GKrellM is plugin capable so special interest monitors can be created.
-	* A different theme can be created with the GIMP.
+	* Many themes are available.
 
 
 - Hajimu UMEMOTO <ume@FreeBSD.org>
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index e6f7680fb313..3d85c69dfb01 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -1,6 +1,14 @@
 bin/gkrellm
 include/gkrellm/gkrellm.h
 include/gkrellm/gkrellm_public_proto.h
+%%PORTDOCS%%share/doc/gkrellm/COPYRIGHT
+%%PORTDOCS%%share/doc/gkrellm/README
+%%PORTDOCS%%share/doc/gkrellm/Themes.html
+share/locale/de/LC_MESSAGES/gkrellm.mo
+share/locale/es/LC_MESSAGES/gkrellm.mo
+share/locale/fr/LC_MESSAGES/gkrellm.mo
+share/locale/ja/LC_MESSAGES/gkrellm.mo
+%%PORTDOCS%%@dirrm share/doc/gkrellm
 @dirrm include/gkrellm
 @exec mkdir -p %D/libexec/gkrellm/plugins
 @exec mkdir -p %D/share/gkrellm/themes
@@ -8,11 +16,3 @@ include/gkrellm/gkrellm_public_proto.h
 @unexec rmdir %D/libexec/gkrellm 2>/dev/null || true
 @unexec rmdir %D/share/gkrellm/themes 2>/dev/null || true
 @unexec rmdir %D/share/gkrellm 2>/dev/null || true
-share/doc/gkrellm/COPYRIGHT
-share/doc/gkrellm/README
-share/doc/gkrellm/Themes.html
-share/locale/de/LC_MESSAGES/gkrellm.mo
-share/locale/es/LC_MESSAGES/gkrellm.mo
-share/locale/fr/LC_MESSAGES/gkrellm.mo
-share/locale/ja/LC_MESSAGES/gkrellm.mo
-@dirrm share/doc/gkrellm