From f0a01a8ac9570f3ece1824929b0e539d124054ec Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Thu, 20 Jan 2005 20:19:39 +0000
Subject: [PATCH] updates of gkrellmms to 2.1.21, gkrellshoot to 0.4.3, and
 gkrellm-volume to 2.1.13 (from maintainer Peter Hessler <phessler at
 theapt.org>)

fix PLISTs
---
 sysutils/gkrellm/plugins/aclock/Makefile      |  3 +-
 sysutils/gkrellm/plugins/aclock/pkg/PLIST     |  4 ++-
 sysutils/gkrellm/plugins/bgchg/Makefile       |  3 +-
 sysutils/gkrellm/plugins/bgchg/pkg/PLIST      |  4 ++-
 sysutils/gkrellm/plugins/flynn/Makefile       |  3 +-
 sysutils/gkrellm/plugins/flynn/pkg/PLIST      |  4 ++-
 sysutils/gkrellm/plugins/itime/Makefile       |  3 +-
 sysutils/gkrellm/plugins/itime/pkg/PLIST      |  4 ++-
 sysutils/gkrellm/plugins/kam/Makefile         |  3 +-
 sysutils/gkrellm/plugins/kam/pkg/PLIST        |  4 ++-
 sysutils/gkrellm/plugins/launch/Makefile      |  3 +-
 sysutils/gkrellm/plugins/launch/pkg/PLIST     |  4 ++-
 sysutils/gkrellm/plugins/mailwatch/Makefile   |  3 +-
 sysutils/gkrellm/plugins/mailwatch/pkg/PLIST  |  4 ++-
 sysutils/gkrellm/plugins/mms/Makefile         |  4 +--
 sysutils/gkrellm/plugins/mms/distinfo         |  8 ++---
 sysutils/gkrellm/plugins/mms/pkg/PLIST        |  4 ++-
 sysutils/gkrellm/plugins/moon/Makefile        |  3 +-
 sysutils/gkrellm/plugins/moon/pkg/PLIST       |  4 ++-
 sysutils/gkrellm/plugins/mss/Makefile         |  3 +-
 sysutils/gkrellm/plugins/mss/pkg/PLIST        |  4 ++-
 sysutils/gkrellm/plugins/reminder/Makefile    |  3 +-
 sysutils/gkrellm/plugins/reminder/pkg/PLIST   |  4 ++-
 sysutils/gkrellm/plugins/shoot/Makefile       |  4 +--
 sysutils/gkrellm/plugins/shoot/distinfo       |  8 ++---
 sysutils/gkrellm/plugins/shoot/pkg/PLIST      |  4 ++-
 sysutils/gkrellm/plugins/stock/Makefile       |  3 +-
 sysutils/gkrellm/plugins/stock/pkg/PLIST      |  4 ++-
 sysutils/gkrellm/plugins/sun/Makefile         |  3 +-
 sysutils/gkrellm/plugins/sun/pkg/PLIST        |  4 ++-
 sysutils/gkrellm/plugins/volume/Makefile      |  4 +--
 sysutils/gkrellm/plugins/volume/distinfo      |  8 ++---
 .../plugins/volume/patches/patch-Makefile     | 31 ++++++++++++-------
 .../{patch-unix_mixer_c => patch-oss_mixer_c} |  6 ++--
 sysutils/gkrellm/plugins/volume/pkg/PLIST     |  4 ++-
 sysutils/gkrellm/plugins/weather/Makefile     |  3 +-
 sysutils/gkrellm/plugins/weather/pkg/PLIST    |  4 ++-
 sysutils/gkrellm/plugins/wireless/Makefile    |  4 +--
 sysutils/gkrellm/plugins/wireless/pkg/PLIST   |  4 ++-
 39 files changed, 120 insertions(+), 64 deletions(-)
 rename sysutils/gkrellm/plugins/volume/patches/{patch-unix_mixer_c => patch-oss_mixer_c} (55%)

diff --git a/sysutils/gkrellm/plugins/aclock/Makefile b/sysutils/gkrellm/plugins/aclock/Makefile
index b0606433209..34cb6a92019 100644
--- a/sysutils/gkrellm/plugins/aclock/Makefile
+++ b/sysutils/gkrellm/plugins/aclock/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2004/10/16 16:33:56 sturm Exp $
+# $OpenBSD: Makefile,v 1.3 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"Analog clock for GkrellM2"
 
 VERSION=	0.3.2.1
 DISTNAME=	gkrellaclock-${VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc sysutils/gkrellm
 
 HOMEPAGE=	http://www.geocities.com/m_muthukumar/gkrellaclock.html
diff --git a/sysutils/gkrellm/plugins/aclock/pkg/PLIST b/sysutils/gkrellm/plugins/aclock/pkg/PLIST
index 7be6a541d59..30c55009b14 100644
--- a/sysutils/gkrellm/plugins/aclock/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/aclock/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:16 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellaclock.so
diff --git a/sysutils/gkrellm/plugins/bgchg/Makefile b/sysutils/gkrellm/plugins/bgchg/Makefile
index b86e910990a..f31624d363d 100644
--- a/sysutils/gkrellm/plugins/bgchg/Makefile
+++ b/sysutils/gkrellm/plugins/bgchg/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2004/12/09 19:00:57 fgsch Exp $
+# $OpenBSD: Makefile,v 1.6 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"Change Background Image with GkrellM2"
 
 DISTNAME=	gkrellmbgchg2-0.1.2
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11 sysutils/gkrellm
 
 HOMEPAGE=	http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html
diff --git a/sysutils/gkrellm/plugins/bgchg/pkg/PLIST b/sysutils/gkrellm/plugins/bgchg/pkg/PLIST
index 0a44dbdfda7..d4afcb95306 100644
--- a/sysutils/gkrellm/plugins/bgchg/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/bgchg/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:16 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellmbgchg.so
diff --git a/sysutils/gkrellm/plugins/flynn/Makefile b/sysutils/gkrellm/plugins/flynn/Makefile
index 31feaee17fe..e25308ab268 100644
--- a/sysutils/gkrellm/plugins/flynn/Makefile
+++ b/sysutils/gkrellm/plugins/flynn/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/16 10:16:29 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"GkrellM2 load meter with a familiar face"
 
 DISTNAME=	gkrellflynn-0.8
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11 sysutils/gkrellm
 
 HOMEPAGE=	http://horus.comlab.uni-rostock.de/flynn/
diff --git a/sysutils/gkrellm/plugins/flynn/pkg/PLIST b/sysutils/gkrellm/plugins/flynn/pkg/PLIST
index 27b1aff58cc..a3f0deddfa0 100644
--- a/sysutils/gkrellm/plugins/flynn/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/flynn/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:16 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellflynn.so
diff --git a/sysutils/gkrellm/plugins/itime/Makefile b/sysutils/gkrellm/plugins/itime/Makefile
index fa2a02ac0bf..8c9e657818e 100644
--- a/sysutils/gkrellm/plugins/itime/Makefile
+++ b/sysutils/gkrellm/plugins/itime/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2004/04/10 13:42:40 sturm Exp $
+# $OpenBSD: Makefile,v 1.3 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"GkrellM2 plugin that shows Interet Time"
 
 VERSION=	1.0.1
 DISTNAME=	gkrellmitime-${VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net sysutils/gkrellm
 
 HOMEPAGE=	http://eric.bianchi.free.fr/gkrellm/
diff --git a/sysutils/gkrellm/plugins/itime/pkg/PLIST b/sysutils/gkrellm/plugins/itime/pkg/PLIST
index f746323aaae..ab65100a18a 100644
--- a/sysutils/gkrellm/plugins/itime/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/itime/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellm_itime.so
diff --git a/sysutils/gkrellm/plugins/kam/Makefile b/sysutils/gkrellm/plugins/kam/Makefile
index 7ebe38a11b0..2527eada9e7 100644
--- a/sysutils/gkrellm/plugins/kam/Makefile
+++ b/sysutils/gkrellm/plugins/kam/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2004/12/16 10:16:29 alek Exp $
+# $OpenBSD: Makefile,v 1.3 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"Web cam plugin for GkrellM2"
 
 VERSION=	2.0.0
 DISTNAME=	gkrellkam-${VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	graphics sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellkam.sourceforge.net
diff --git a/sysutils/gkrellm/plugins/kam/pkg/PLIST b/sysutils/gkrellm/plugins/kam/pkg/PLIST
index 1c608cdfe36..3a24ce52410 100644
--- a/sysutils/gkrellm/plugins/kam/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/kam/pkg/PLIST
@@ -1,3 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:39:32 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellkam2.so
 @man man/man5/gkrellkam.5
diff --git a/sysutils/gkrellm/plugins/launch/Makefile b/sysutils/gkrellm/plugins/launch/Makefile
index 663b69b779c..8c6f097b669 100644
--- a/sysutils/gkrellm/plugins/launch/Makefile
+++ b/sysutils/gkrellm/plugins/launch/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"launch commonly used apps from GkrellM2"
 
 DISTNAME=	gkrellmlaunch-0.5
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11 sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellmlaunch.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/launch/pkg/PLIST b/sysutils/gkrellm/plugins/launch/pkg/PLIST
index c4f6150ff4a..facf7b2d6d9 100644
--- a/sysutils/gkrellm/plugins/launch/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/launch/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellmlaunch.so
diff --git a/sysutils/gkrellm/plugins/mailwatch/Makefile b/sysutils/gkrellm/plugins/mailwatch/Makefile
index 8701e42ec5f..698ef93ba8a 100644
--- a/sysutils/gkrellm/plugins/mailwatch/Makefile
+++ b/sysutils/gkrellm/plugins/mailwatch/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2004/10/16 16:33:56 sturm Exp $
+# $OpenBSD: Makefile,v 1.4 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"GkrellM2 plugin to monitor multiple mailboxes"
 
 DISTNAME=	gkrellm-mailwatch-2.4.3
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	mail sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/mailwatch.phtml
diff --git a/sysutils/gkrellm/plugins/mailwatch/pkg/PLIST b/sysutils/gkrellm/plugins/mailwatch/pkg/PLIST
index 1215930a513..321d13b45f7 100644
--- a/sysutils/gkrellm/plugins/mailwatch/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/mailwatch/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/mailwatch.so
diff --git a/sysutils/gkrellm/plugins/mms/Makefile b/sysutils/gkrellm/plugins/mms/Makefile
index 4a2b3d4f5bc..4592f2df39a 100644
--- a/sysutils/gkrellm/plugins/mms/Makefile
+++ b/sysutils/gkrellm/plugins/mms/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2004/12/16 10:16:29 alek Exp $
+# $OpenBSD: Makefile,v 1.6 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"XMMS plugin for Gkrellm2"
 
-DISTNAME=	gkrellmms-2.1.20
+DISTNAME=	gkrellmms-2.1.21
 CATEGORIES=	audio sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
diff --git a/sysutils/gkrellm/plugins/mms/distinfo b/sysutils/gkrellm/plugins/mms/distinfo
index 1bd50b215d8..58a5d013d0b 100644
--- a/sysutils/gkrellm/plugins/mms/distinfo
+++ b/sysutils/gkrellm/plugins/mms/distinfo
@@ -1,4 +1,4 @@
-MD5 (gkrellmms-2.1.20.tar.gz) = cf17ad00eccf068d3738c387899a93d3
-RMD160 (gkrellmms-2.1.20.tar.gz) = ac03b2be23f1eb6807621f9ca37e2cc460bed58b
-SHA1 (gkrellmms-2.1.20.tar.gz) = 6aa0b3910fdfc9003305bc6735b44bd70e81be16
-SIZE (gkrellmms-2.1.20.tar.gz) = 44937
+MD5 (gkrellmms-2.1.21.tar.gz) = a532c93428dd4487b08c7cb848757fdb
+RMD160 (gkrellmms-2.1.21.tar.gz) = 8817ebb4ce35d364c8768e89cf2fbbdf8beb0f13
+SHA1 (gkrellmms-2.1.21.tar.gz) = e45d0af8b187b9a6a95c579a5527d1011d02e4f2
+SIZE (gkrellmms-2.1.21.tar.gz) = 46643
diff --git a/sysutils/gkrellm/plugins/mms/pkg/PLIST b/sysutils/gkrellm/plugins/mms/pkg/PLIST
index 4f2cbd51b7a..a14ac6d9fe9 100644
--- a/sysutils/gkrellm/plugins/mms/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/mms/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:39 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellmms.so
diff --git a/sysutils/gkrellm/plugins/moon/Makefile b/sysutils/gkrellm/plugins/moon/Makefile
index b0cdd66528a..f75e2c221c5 100644
--- a/sysutils/gkrellm/plugins/moon/Makefile
+++ b/sysutils/gkrellm/plugins/moon/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2005/01/20 20:19:39 sturm Exp $
 
 COMMENT=	"Phase of the Moon for GkrellM2"
 
 DISTNAME=	gkrellmoon-0.6
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	astro sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellmoon.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/moon/pkg/PLIST b/sysutils/gkrellm/plugins/moon/pkg/PLIST
index cdc2a219c5c..f981b8c5e86 100644
--- a/sysutils/gkrellm/plugins/moon/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/moon/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellmoon.so
diff --git a/sysutils/gkrellm/plugins/mss/Makefile b/sysutils/gkrellm/plugins/mss/Makefile
index 44d8ccd1bab..b229f66d676 100644
--- a/sysutils/gkrellm/plugins/mss/Makefile
+++ b/sysutils/gkrellm/plugins/mss/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/16 10:16:29 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"Soundscope for GkrellM2 using ESD"
 
 DISTNAME=	gkrellmss-2.5
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	audio sysutils/gkrellm
 
 HOMEPAGE=	http://web.wt.net/~billw/gkrellmss/gkrellmss.html
diff --git a/sysutils/gkrellm/plugins/mss/pkg/PLIST b/sysutils/gkrellm/plugins/mss/pkg/PLIST
index 8becbd48508..5e3ce1896c6 100644
--- a/sysutils/gkrellm/plugins/mss/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/mss/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellmss.so
diff --git a/sysutils/gkrellm/plugins/reminder/Makefile b/sysutils/gkrellm/plugins/reminder/Makefile
index 0449ebbf412..37a3b9c0fce 100644
--- a/sysutils/gkrellm/plugins/reminder/Makefile
+++ b/sysutils/gkrellm/plugins/reminder/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"GrekllM2 will remind you to do important events"
 
 DISTNAME=	gkrellm-reminder-2.0.0
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc sysutils/gkrellm
 
 HOMEPAGE=	http://web.wt.net/~billw/gkrellm/Plugins.html\#REMINDER
diff --git a/sysutils/gkrellm/plugins/reminder/pkg/PLIST b/sysutils/gkrellm/plugins/reminder/pkg/PLIST
index e43a694ef8d..8161aadd79f 100644
--- a/sysutils/gkrellm/plugins/reminder/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/reminder/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/reminder.so
diff --git a/sysutils/gkrellm/plugins/shoot/Makefile b/sysutils/gkrellm/plugins/shoot/Makefile
index cc2f9cf8819..f54a470760d 100644
--- a/sysutils/gkrellm/plugins/shoot/Makefile
+++ b/sysutils/gkrellm/plugins/shoot/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"Snapshot and background plugin for Gkrellm2"
 
-VERSION=	0.4.1
+VERSION=	0.4.3
 DISTNAME=	gkrellshoot-${VERSION}
 CATEGORIES=	x11 sysutils/gkrellm
 
diff --git a/sysutils/gkrellm/plugins/shoot/distinfo b/sysutils/gkrellm/plugins/shoot/distinfo
index a583a7ad49d..15d9697c1c4 100644
--- a/sysutils/gkrellm/plugins/shoot/distinfo
+++ b/sysutils/gkrellm/plugins/shoot/distinfo
@@ -1,4 +1,4 @@
-MD5 (gkrellshoot-0.4.1.tar.gz) = db0835ef0ec77ab06547fff25ec134f7
-RMD160 (gkrellshoot-0.4.1.tar.gz) = 3bb9b8ce8aa696c7799f1dd482cf893883597b9d
-SHA1 (gkrellshoot-0.4.1.tar.gz) = 76165636f4e0866813e50f0cc62c513fd8dc3084
-SIZE (gkrellshoot-0.4.1.tar.gz) = 15112
+MD5 (gkrellshoot-0.4.3.tar.gz) = 2106a6938d846cabdf5f8357abd8edbe
+RMD160 (gkrellshoot-0.4.3.tar.gz) = 50aa774621f5c2c31f09efd4f20a1ed6abc49201
+SHA1 (gkrellshoot-0.4.3.tar.gz) = 99710e6c9de4db9c92cf8edf958c6a7153e151b0
+SIZE (gkrellshoot-0.4.3.tar.gz) = 16213
diff --git a/sysutils/gkrellm/plugins/shoot/pkg/PLIST b/sysutils/gkrellm/plugins/shoot/pkg/PLIST
index 3ab28e3e43e..d7c6fa7e0b7 100644
--- a/sysutils/gkrellm/plugins/shoot/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/shoot/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellshoot.so
diff --git a/sysutils/gkrellm/plugins/stock/Makefile b/sysutils/gkrellm/plugins/stock/Makefile
index 0ec5ac3ab82..e22f18f8dae 100644
--- a/sysutils/gkrellm/plugins/stock/Makefile
+++ b/sysutils/gkrellm/plugins/stock/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"Stock Ticker for GkrellM2"
 
 VERSION=	0.5.1
 DISTNAME=	gkrellstock-${VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellstock.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/stock/pkg/PLIST b/sysutils/gkrellm/plugins/stock/pkg/PLIST
index 8c9655cf36a..bf06102214a 100644
--- a/sysutils/gkrellm/plugins/stock/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/stock/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
 bin/GetQuote2
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellstock.so
 libdata/perl5/site_perl/Finance/Quote/Asia.pm
diff --git a/sysutils/gkrellm/plugins/sun/Makefile b/sysutils/gkrellm/plugins/sun/Makefile
index dfd766075bd..9b315f369e3 100644
--- a/sysutils/gkrellm/plugins/sun/Makefile
+++ b/sysutils/gkrellm/plugins/sun/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2004/10/16 16:33:56 sturm Exp $
+# $OpenBSD: Makefile,v 1.4 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"GkrellM2 plugin to display sun rise/set times"
 
 DISTNAME=	gkrellsun-0.12.1
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	astro sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellsun.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/sun/pkg/PLIST b/sysutils/gkrellm/plugins/sun/pkg/PLIST
index 8d2bd1606c9..0ad79c85654 100644
--- a/sysutils/gkrellm/plugins/sun/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/sun/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellsun.so
diff --git a/sysutils/gkrellm/plugins/volume/Makefile b/sysutils/gkrellm/plugins/volume/Makefile
index a8ec7cda5a2..3752339fb26 100644
--- a/sysutils/gkrellm/plugins/volume/Makefile
+++ b/sysutils/gkrellm/plugins/volume/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/16 10:16:29 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"Volume dial for Gkrellm2"
 
-DISTNAME=	gkrellm-volume-2.1.9
+DISTNAME=	gkrellm-volume-2.1.13
 CATEGORIES=	audio sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/volume.phtml
diff --git a/sysutils/gkrellm/plugins/volume/distinfo b/sysutils/gkrellm/plugins/volume/distinfo
index f1b1b504547..53897a460df 100644
--- a/sysutils/gkrellm/plugins/volume/distinfo
+++ b/sysutils/gkrellm/plugins/volume/distinfo
@@ -1,4 +1,4 @@
-MD5 (gkrellm-volume-2.1.9.tar.gz) = 1a6c6fb0181fecfaa20fc5c9e58f39fc
-RMD160 (gkrellm-volume-2.1.9.tar.gz) = 69245cfa3f4bf973c4e08b7717948388a93e37f9
-SHA1 (gkrellm-volume-2.1.9.tar.gz) = 7003c1ef3ebd141df9b15fa8e631e43d27dcca9b
-SIZE (gkrellm-volume-2.1.9.tar.gz) = 37888
+MD5 (gkrellm-volume-2.1.13.tar.gz) = d9f4c36d7fdf9c9f755c99f742b573c4
+RMD160 (gkrellm-volume-2.1.13.tar.gz) = 4ebc28a6a97f5d31d73927509ab956422e9a79de
+SHA1 (gkrellm-volume-2.1.13.tar.gz) = e9ea9bdd8eac53e8d99baf7705e76c28d8c4f2c3
+SIZE (gkrellm-volume-2.1.13.tar.gz) = 42087
diff --git a/sysutils/gkrellm/plugins/volume/patches/patch-Makefile b/sysutils/gkrellm/plugins/volume/patches/patch-Makefile
index 824152c65c9..ad20acb9bf0 100644
--- a/sysutils/gkrellm/plugins/volume/patches/patch-Makefile
+++ b/sysutils/gkrellm/plugins/volume/patches/patch-Makefile
@@ -1,13 +1,21 @@
---- Makefile.orig	2003-06-16 21:02:54.000000000 +0200
-+++ Makefile	2003-11-02 13:19:56.000000000 +0100
-@@ -1,28 +1,21 @@
+--- Makefile.orig	Thu Aug 19 22:07:27 2004
++++ Makefile	Wed Jan 19 21:48:43 2005
+@@ -1,46 +1,32 @@
  # Makefile for  GKrellM volume plugin
  
+ PACKAGE ?= gkrellm-volume
+-LOCALEDIR ?= /usr/local/share/locale
++LOCALEDIR ?= ${LOCALBASE}/share/locale
+ 
+ FLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
+ export PACKAGE LOCALEDIR
+ 
 -GTK_CONFIG = pkg-config gtk+-2.0
 +GTK_CONFIG = pkg-config gtk+-2.0 gthread-2.0
  
- PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
+-PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
 -GKRELLM_INCLUDE = -I/usr/local/include
++PLUGIN_DIR ?= ${LOCALBASE}/lib/gkrellm2/plugins
 +GKRELLM_INCLUDE = -I${LOCALBASE}/include
  
  GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
@@ -20,22 +28,23 @@
 +LIBS += $(GTK_LIB)
 +LFLAGS += -shared -pthread -lossaudio
  
- PACKAGE ?= gkrellm-volume
- LOCALEDIR ?= /usr/local/share/locale
+ OBJS = volume.o mixer.o oss_mixer.o
  
+-ifeq ($(enable_alsa),1)
+-  FLAGS += -DALSA
+-  LIBS += -lasound
+-  OBJS += alsa_mixer.o 
+-endif
+-
 -ifeq ($(enable_nls),1)
 -    FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
 -    export enable_nls
 -endif
- FLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
--export PACKAGE LOCALEDIR
 -
 -CC = gcc $(CFLAGS) $(FLAGS)
- 
+-
  INSTALL = install -c
  INSTALL_PROGRAM = $(INSTALL) -s
-@@ -30,10 +23,9 @@ INSTALL_PROGRAM = $(INSTALL) -s
- OBJS = volume.o unix_mixer.o common_mixer.o
  
  all:	volume.so
 -	(cd po && ${MAKE} all )
diff --git a/sysutils/gkrellm/plugins/volume/patches/patch-unix_mixer_c b/sysutils/gkrellm/plugins/volume/patches/patch-oss_mixer_c
similarity index 55%
rename from sysutils/gkrellm/plugins/volume/patches/patch-unix_mixer_c
rename to sysutils/gkrellm/plugins/volume/patches/patch-oss_mixer_c
index 820a8990912..7a5397d6045 100644
--- a/sysutils/gkrellm/plugins/volume/patches/patch-unix_mixer_c
+++ b/sysutils/gkrellm/plugins/volume/patches/patch-oss_mixer_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-unix_mixer_c,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
---- unix_mixer.c.orig	Mon Nov 18 12:34:32 2002
-+++ unix_mixer.c	Mon Dec 23 13:00:27 2002
+$OpenBSD: patch-oss_mixer_c,v 1.1 2005/01/20 20:19:40 sturm Exp $
+--- oss_mixer.c.orig	Wed Jan 19 21:49:53 2005
++++ oss_mixer.c	Wed Jan 19 21:50:09 2005
 @@ -30,7 +30,7 @@
  #if defined(__FreeBSD__) && __FreeBSD_version < 500000
    #include <machine/soundcard.h>
diff --git a/sysutils/gkrellm/plugins/volume/pkg/PLIST b/sysutils/gkrellm/plugins/volume/pkg/PLIST
index a733445305e..f09ebc94822 100644
--- a/sysutils/gkrellm/plugins/volume/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/volume/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/volume.so
diff --git a/sysutils/gkrellm/plugins/weather/Makefile b/sysutils/gkrellm/plugins/weather/Makefile
index 40885012f96..670776c683e 100644
--- a/sysutils/gkrellm/plugins/weather/Makefile
+++ b/sysutils/gkrellm/plugins/weather/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2004/04/12 04:55:36 sturm Exp $
+# $OpenBSD: Makefile,v 1.3 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"Weather plugin for GkrellM2"
 
 DISTNAME=	gkrellweather-2.0.6
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11 sysutils/gkrellm
 EXTRACT_SUFX=	.tgz
 
diff --git a/sysutils/gkrellm/plugins/weather/pkg/PLIST b/sysutils/gkrellm/plugins/weather/pkg/PLIST
index 10342b54a5a..890732ba1d7 100644
--- a/sysutils/gkrellm/plugins/weather/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/weather/pkg/PLIST
@@ -1,3 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
 bin/gkrellm.GrabWeather
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/gkrellweather.so
diff --git a/sysutils/gkrellm/plugins/wireless/Makefile b/sysutils/gkrellm/plugins/wireless/Makefile
index ab76481de14..a9871613d4a 100644
--- a/sysutils/gkrellm/plugins/wireless/Makefile
+++ b/sysutils/gkrellm/plugins/wireless/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2004/05/18 14:49:56 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2005/01/20 20:19:40 sturm Exp $
 
 COMMENT=	"GkrellM2 plugin to monitor wireless strength"
 
 VERSION=	2.0.3
 DISTNAME=	gkrellmwireless-${VERSION}
-PKGNAME=	gkrellm-wireless-${VERSION}
+PKGNAME=	gkrellm-wireless-${VERSION}p0
 CATEGORIES=	net sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmwireless.phtml
diff --git a/sysutils/gkrellm/plugins/wireless/pkg/PLIST b/sysutils/gkrellm/plugins/wireless/pkg/PLIST
index 437ef363c21..5f3cedd4240 100644
--- a/sysutils/gkrellm/plugins/wireless/pkg/PLIST
+++ b/sysutils/gkrellm/plugins/wireless/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 20:34:18 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
+lib/gkrellm2/
+lib/gkrellm2/plugins/
 lib/gkrellm2/plugins/wireless.so