Bump package revisions for tiff update.

Tiff is backward compatible, but was broken on amd64 platform
so this makes sure new tiff is used.

52 files changed, 105 insertions, 96 deletions

diff --git a/sysutils/GWLib/Makefile b/sysutils/GWLib/Makefile
index 5f65ede6a3b..89388f72117 100644
--- a/sysutils/GWLib/Makefile
+++ b/sysutils/GWLib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/09/19 12:29:15 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:52 reed Exp $
 #
 
 .include "../../sysutils/gworkspace/Makefile.common"
 PKGNAME=	${DISTNAME:S/gworkspace/GWLib/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	GWorkspace support library
 
diff --git a/sysutils/GWLib/buildlink2.mk b/sysutils/GWLib/buildlink2.mk
index ade5cfdc888..3a9edb35c80 100644
--- a/sysutils/GWLib/buildlink2.mk
+++ b/sysutils/GWLib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:53:13 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/01/03 18:49:52 reed Exp $
 #
 # This Makefile fragment is included by packages that use GWLib.
 #
@@ -9,7 +9,7 @@
 GWLIB_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			GWLib
-BUILDLINK_DEPENDS.GWLib?=		GWLib>=0.5.3nb1
+BUILDLINK_DEPENDS.GWLib?=		GWLib>=0.5.3nb2
 BUILDLINK_PKGSRCDIR.GWLib?=		../../sysutils/GWLib
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.GWLib=GWLib
diff --git a/sysutils/apotheke/Makefile b/sysutils/apotheke/Makefile
index 48fbe2aed72..bc77f281488 100644
--- a/sysutils/apotheke/Makefile
+++ b/sysutils/apotheke/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/29 14:06:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:52 reed Exp $
 #
 
 DISTNAME=	apotheke-0.2
+PKGREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	ftp://ftp.berlios.de/pub/apotheke/
 
diff --git a/sysutils/dvdrip/Makefile b/sysutils/dvdrip/Makefile
index 601da4af939..1374493d9ca 100644
--- a/sysutils/dvdrip/Makefile
+++ b/sysutils/dvdrip/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/09/03 13:29:44 adam Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:52 reed Exp $
 #
 
 VERS=		0.50.15
 DISTNAME=	Video-DVDRip-${VERS}
 PKGNAME=	dvdrip-${VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 sysutils
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Video/}
 
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 41f89daf8be..42a13f84299 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:52 reed Exp $
 #
 
 DISTNAME=	FSViewer.app-0.2.3
 PKGNAME=	FSViewer-0.2.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils x11 windowmaker
 MASTER_SITES=	http://www.csn.ul.ie/~clernong/download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} icons.tar.gz
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 6bf98473b84..89fb60a04bd 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:52 reed Exp $
 #
 
 DISTNAME=		cdrdao-1.1.7.src
 PKGNAME=		gcdmaster-1.1.7
-PKGREVISION=		2
+PKGREVISION=		3
 WRKSRC=			${WRKDIR}/cdrdao-1.1.7
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cdrdao/}
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 727827ca432..b105f6df598 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/07/13 13:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/03 18:49:52 reed Exp $
 #
 
 DISTNAME=	gkrellm-1.2.13
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gkrellm/buildlink2.mk b/sysutils/gkrellm/buildlink2.mk
index 93ddc2344eb..a2d2d83b7c2 100644
--- a/sysutils/gkrellm/buildlink2.mk
+++ b/sysutils/gkrellm/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:53:15 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/01/03 18:49:52 reed Exp $
 #
 
 .if !defined(GKRELLM_BUILDLINK2_MK)
 GKRELLM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gkrellm
-BUILDLINK_DEPENDS.gkrellm?=		gkrellm>=1.2.13nb2
+BUILDLINK_DEPENDS.gkrellm?=		gkrellm>=1.2.13nb3
 BUILDLINK_PKGSRCDIR.gkrellm?=		../../sysutils/gkrellm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gkrellm=gkrellm
diff --git a/sysutils/gkx86info/Makefile b/sysutils/gkx86info/Makefile
index af9bf86d9f7..fc5194b66b1 100644
--- a/sysutils/gkx86info/Makefile
+++ b/sysutils/gkx86info/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:24:15 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:52 reed Exp $
 #
 
 DISTNAME=	gkx86info0.0.2
 PKGNAME=	gkx86info-0.0.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://asdfnews.org/yargon/
 
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index f645ca544d2..a7cc6809266 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: Makefile,v 1.34 2004/01/03 18:49:52 reed Exp $
 
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES+=		gnome
 
 COMMENT=		GNOME version of Midnight Commander, a free Norton Commander Clone
diff --git a/sysutils/gnome-acme/Makefile b/sysutils/gnome-acme/Makefile
index 3507e7d3bc3..cb92afd93e4 100644
--- a/sysutils/gnome-acme/Makefile
+++ b/sysutils/gnome-acme/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/12/28 23:37:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:52 reed Exp $
 
 DISTNAME=	acme-2.4.2
 PKGNAME=	gnome-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/acme/2.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 60f122fd921..633bf769866 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2003/12/30 12:13:42 gavan Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/03 18:49:52 reed Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
 
diff --git a/sysutils/gnome-vfs/buildlink2.mk b/sysutils/gnome-vfs/buildlink2.mk
index a740078e4a8..3ac44fac711 100644
--- a/sysutils/gnome-vfs/buildlink2.mk
+++ b/sysutils/gnome-vfs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/01/03 18:49:52 reed Exp $
 
 .if !defined(GNOME_VFS_BUILDLINK2_MK)
 GNOME_VFS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnome-vfs
-BUILDLINK_DEPENDS.gnome-vfs?=	gnome-vfs>=1.0.5nb4
+BUILDLINK_DEPENDS.gnome-vfs?=	gnome-vfs>=1.0.5nb5
 BUILDLINK_PKGSRCDIR.gnome-vfs?=	../../sysutils/gnome-vfs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-vfs=gnome-vfs
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index d17e1e14dbb..645bec41c51 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/29 00:49:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:52 reed Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.4.0
 PKGNAME=	${DISTNAME:S/gnome/gnome2/}
+PKGREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 576fb30be72..7213900e6b1 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/13 18:09:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:52 reed Exp $
 #
 
 DISTNAME=		gtk-send-pr-0.3
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.energyhq.es.eu.org/files/
 
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index aec804c6188..172aba043d1 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/03 18:49:53 reed Exp $
 
 DISTNAME=		gtop-1.0.13
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtop/1.0/}
 
diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
index 868810ea77f..758112c0cd5 100644
--- a/sysutils/gworkspace/Makefile
+++ b/sysutils/gworkspace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:53 reed Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	GNUstep Workspace manager
 
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index 14108e35d14..fe47a066d26 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/08 14:27:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	idesk-0.3.5
+PKGREVISION=	1
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://idesk.timmfin.net/releases/
 
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 1fa92b0590e..8ec56d8e577 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/07/17 22:53:38 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	kdf-0.5.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils kde
 MASTER_SITES=	ftp://ftp.us.kde.org/pub/kde/stable/1.1.2/apps/utils/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 47a785c05f0..c6311dad352 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:53 reed Exp $
 
 DISTNAME=	kdirstat-2.3.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://kdirstat.sourceforge.net/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/klavg/Makefile b/sysutils/klavg/Makefile
index c118232fbac..c68c910146e 100644
--- a/sysutils/klavg/Makefile
+++ b/sysutils/klavg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/14 09:20:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	klavg-1.1
-PKGREVISION=	3
+PKGREVISION=	4
 WRKSRC=		${WRKDIR}/klavg
 CATEGORIES=	kde sysutils
 MASTER_SITES=	ftp://ftp.crocodile.org/pub/
diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile
index 0132a93284c..a9902867cf6 100644
--- a/sysutils/koncd/Makefile
+++ b/sysutils/koncd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:53:39 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:53 reed Exp $
 
 DISTNAME=	koncd-0.7.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	${HOMEPAGE}download/
 
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index ddf1b2d084b..30673aedc84 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=		medusa-0.5.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/medusa/0.5/}	\
 			http://download.eazel.com/source/
diff --git a/sysutils/medusa/buildlink2.mk b/sysutils/medusa/buildlink2.mk
index b75685c8b87..f58f52c8681 100644
--- a/sysutils/medusa/buildlink2.mk
+++ b/sysutils/medusa/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use medusa.
 #
@@ -9,7 +9,7 @@
 MEDUSA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			medusa
-BUILDLINK_DEPENDS.medusa?=		medusa>=0.5.1nb4
+BUILDLINK_DEPENDS.medusa?=		medusa>=0.5.1nb5
 BUILDLINK_PKGSRCDIR.medusa?=		../../sysutils/medusa
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.medusa=medusa
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index fc7c87e0573..c2716fd7d35 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/12/28 23:37:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=		nautilus-2.4.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/nautilus/buildlink2.mk b/sysutils/nautilus/buildlink2.mk
index 2a0c7395859..95b38cbc7b6 100644
--- a/sysutils/nautilus/buildlink2.mk
+++ b/sysutils/nautilus/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/12/14 23:09:02 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use nautilus.
 #
@@ -9,7 +9,7 @@
 NAUTILUS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			nautilus
-BUILDLINK_DEPENDS.nautilus?=		nautilus>=2.4.1
+BUILDLINK_DEPENDS.nautilus?=		nautilus>=2.4.1nb2
 BUILDLINK_PKGSRCDIR.nautilus?=		../../sysutils/nautilus
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.nautilus=nautilus
@@ -34,7 +34,7 @@ BUILDLINK_FILES.nautilus+=	lib/libnautilus-private.*
 BUILDLINK_FILES.nautilus+=	lib/libnautilus.*
 BUILDLINK_FILES.nautilus+=	lib/pkgconfig/libnautilus.pc
 
-BUILDLINK_DEPENDS.esound=	esound>=0.2.27
+BUILDLINK_DEPENDS.esound=	esound>=2.4.1nb2
 
 .include "../../devel/eel2/buildlink2.mk"
 .include "../../graphics/imlib2/buildlink2.mk"
diff --git a/sysutils/rox-edit/Makefile b/sysutils/rox-edit/Makefile
index b70cba92558..b7a605f6815 100644
--- a/sysutils/rox-edit/Makefile
+++ b/sysutils/rox-edit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:24:29 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	Edit-0.1.2
 PKGNAME=	rox-edit-0.1.2
-PKGREVISION=	2
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/Edit
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox-lib/Makefile b/sysutils/rox-lib/Makefile
index 8b3956b5361..40753286251 100644
--- a/sysutils/rox-lib/Makefile
+++ b/sysutils/rox-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:53:47 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	ROX-Lib-0.1.4
 PKGNAME=	rox-lib-0.1.4
-PKGREVISION=	2
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/ROX-Lib
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox-memo/Makefile b/sysutils/rox-memo/Makefile
index c6c54a725c8..613e476a851 100644
--- a/sysutils/rox-memo/Makefile
+++ b/sysutils/rox-memo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:53:48 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	Memo-1.0.0
 PKGNAME=	rox-memo-1.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/Memo
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index 65363ec5f48..68431f24188 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	ROX-Session-0.1.14
 PKGNAME=	rox-session-0.1.14
-PKGREVISION=	7
+PKGREVISION=	8
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile
index f62532b0adf..8ebe43a6cf1 100644
--- a/sysutils/rox-system/Makefile
+++ b/sysutils/rox-system/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:24:31 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	System-0.1.2
 PKGNAME=	rox-system-0.1.2
-PKGREVISION=	2
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/System/src
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox-wallpaper/Makefile b/sysutils/rox-wallpaper/Makefile
index c99a56b6602..0edcc931ff9 100644
--- a/sysutils/rox-wallpaper/Makefile
+++ b/sysutils/rox-wallpaper/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:53:49 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	Wallpaper-0.1.1
 PKGNAME=	rox-wallpaper-0.1.1
-PKGREVISION=	2
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/Wallpaper
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index 8bff9fbe5a5..a362a62879d 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:53 reed Exp $
 #
 
 DISTNAME=	rox-1.2.0
-PKGREVISION=	8
+PKGREVISION=	9
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 5e07f3fe066..eda827a7ce6 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/12/29 02:13:38 kristerw Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:53 reed Exp $
 
 DISTNAME=	xcdroast-0.98alpha15
 PKGNAME=	xcdroast-0.98a15
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xcdroast/}
 
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index cd9c4644f70..041f3b08c99 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	1.4
 
 DISTNAME=	xfce4-diskperf-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 disk performance plugin
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink2.mk b/sysutils/xfce4-diskperf-plugin/buildlink2.mk
index c0b27c27a12..6cc468800ca 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink2.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-diskperf-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_DISKPERF_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-diskperf-plugin
-BUILDLINK_DEPENDS.xfce4-diskperf-plugin?=		xfce4-diskperf-plugin>=1.4nb1
+BUILDLINK_DEPENDS.xfce4-diskperf-plugin?=		xfce4-diskperf-plugin>=1.4nb2
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=		../../sysutils/xfce4-diskperf-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-diskperf-plugin=xfce4-diskperf-plugin
diff --git a/sysutils/xfce4-fm-icons/Makefile b/sysutils/xfce4-fm-icons/Makefile
index 3b93ef83386..3c7bdd1ab1b 100644
--- a/sysutils/xfce4-fm-icons/Makefile
+++ b/sysutils/xfce4-fm-icons/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/12/22 08:50:39 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,6 +7,7 @@ XFCE4_VERSION=	4.0.0
 PKGNAME=	xfce4-fm-icons-${XFCE4_VERSION}
 PKREVISION=	2
 DISTNAME=	xffm-icons-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager icons
 
diff --git a/sysutils/xfce4-fm-icons/buildlink2.mk b/sysutils/xfce4-fm-icons/buildlink2.mk
index 2c525cd4fc0..d14295f0da9 100644
--- a/sysutils/xfce4-fm-icons/buildlink2.mk
+++ b/sysutils/xfce4-fm-icons/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-fm-icons.
 #
@@ -9,7 +9,7 @@
 XFCE4_FM_ICONS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-fm-icons
-BUILDLINK_DEPENDS.xfce4-fm-icons?=		xfce4-fm-icons>=4.0.0
+BUILDLINK_DEPENDS.xfce4-fm-icons?=		xfce4-fm-icons>=4.0.0nb1
 BUILDLINK_PKGSRCDIR.xfce4-fm-icons?=		../../sysutils/xfce4-fm-icons
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-fm-icons=xfce4-fm-icons
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index a4c82ebc0fe..c1b4d8340ca 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/12/22 08:50:39 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xffm-${XFCE4_VERSION}
 PKGNAME=	xfce4-fm-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager
 
diff --git a/sysutils/xfce4-fm/buildlink2.mk b/sysutils/xfce4-fm/buildlink2.mk
index 6c63400dd5d..a550c7af25d 100644
--- a/sysutils/xfce4-fm/buildlink2.mk
+++ b/sysutils/xfce4-fm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/12/22 08:50:39 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-fm.
 #
@@ -9,7 +9,7 @@
 XFCE4_FM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-fm
-BUILDLINK_DEPENDS.xfce4-fm?=		xfce4-fm>=4.0.2
+BUILDLINK_DEPENDS.xfce4-fm?=		xfce4-fm>=4.0.2nb1
 BUILDLINK_PKGSRCDIR.xfce4-fm?=		../../sysutils/xfce4-fm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-fm=xfce4-fm
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index fde50ad1139..a30a10d1b4d 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2.0
 
 DISTNAME=	xfce4-minicmd-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 command plugin
diff --git a/sysutils/xfce4-minicmd-plugin/buildlink2.mk b/sysutils/xfce4-minicmd-plugin/buildlink2.mk
index c9b3dfe38ec..2929ef5903e 100644
--- a/sysutils/xfce4-minicmd-plugin/buildlink2.mk
+++ b/sysutils/xfce4-minicmd-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-minicmd-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_MINICMD_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-minicmd-plugin
-BUILDLINK_DEPENDS.xfce4-minicmd-plugin?=		xfce4-minicmd-plugin>=0.2.0nb1
+BUILDLINK_DEPENDS.xfce4-minicmd-plugin?=		xfce4-minicmd-plugin>=0.2.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?=		../../sysutils/xfce4-minicmd-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-minicmd-plugin=xfce4-minicmd-plugin
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index a5e12f1171b..8c367e918f1 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2.2
 
 DISTNAME=	xfce4-netload-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 network load plugin
diff --git a/sysutils/xfce4-netload-plugin/buildlink2.mk b/sysutils/xfce4-netload-plugin/buildlink2.mk
index 1fca72f15f1..025334c4b36 100644
--- a/sysutils/xfce4-netload-plugin/buildlink2.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-netload-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_NETLOAD_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-netload-plugin
-BUILDLINK_DEPENDS.xfce4-netload-plugin?=		xfce4-netload-plugin>=0.2.2nb1
+BUILDLINK_DEPENDS.xfce4-netload-plugin?=		xfce4-netload-plugin>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=		../../sysutils/xfce4-netload-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-netload-plugin=xfce4-netload-plugin
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index 10c57827b95..c536ee80b03 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.1.1
 
 DISTNAME=	xfce4-showdesktop-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 showdesktop plugin
diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink2.mk b/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
index dada0383896..b93a838904d 100644
--- a/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
+++ b/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-showdesktop-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-showdesktop-plugin
-BUILDLINK_DEPENDS.xfce4-showdesktop-plugin?=		xfce4-showdesktop-plugin>=0.1.1nb1
+BUILDLINK_DEPENDS.xfce4-showdesktop-plugin?=		xfce4-showdesktop-plugin>=0.1.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?=		../../sysutils/xfce4-showdesktop-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-showdesktop-plugin=xfce4-showdesktop-plugin
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index d491d5e7fc0..a8d6c6980d0 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.3.4
 
 DISTNAME=	xfce4-systemload-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 system load plugin
diff --git a/sysutils/xfce4-systemload-plugin/buildlink2.mk b/sysutils/xfce4-systemload-plugin/buildlink2.mk
index c3ab06b8b4d..656c837ade0 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink2.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-systemload-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-systemload-plugin
-BUILDLINK_DEPENDS.xfce4-systemload-plugin?=		xfce4-systemload-plugin>=0.3.4nb1
+BUILDLINK_DEPENDS.xfce4-systemload-plugin?=		xfce4-systemload-plugin>=0.3.4nb2
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=		../../sysutils/xfce4-systemload-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-systemload-plugin=xfce4-systemload-plugin
diff --git a/sysutils/xfce4-systray/Makefile b/sysutils/xfce4-systray/Makefile
index 32a3a964345..10d1d7bf07a 100644
--- a/sysutils/xfce4-systray/Makefile
+++ b/sysutils/xfce4-systray/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/12/22 08:50:39 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:53 reed Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-systray-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	XFce4 systray plugin
 
diff --git a/sysutils/xfce4-systray/buildlink2.mk b/sysutils/xfce4-systray/buildlink2.mk
index e3274fac397..2e8abda0ad3 100644
--- a/sysutils/xfce4-systray/buildlink2.mk
+++ b/sysutils/xfce4-systray/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/12/22 08:50:40 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:53 reed Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-systray.
 #
@@ -9,7 +9,7 @@
 XFCE4_SYSTRAY_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-systray
-BUILDLINK_DEPENDS.xfce4-systray?=		xfce4-systray>=4.0.2
+BUILDLINK_DEPENDS.xfce4-systray?=		xfce4-systray>=4.0.2nb1
 BUILDLINK_PKGSRCDIR.xfce4-systray?=		../../sysutils/xfce4-systray
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-systray=xfce4-systray
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index 6c1aaf91446..0a48cb4d372 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/30 16:09:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:54 reed Exp $
 #
 
 DISTNAME=	xfe-0.54.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xfe/}
 
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 53743e341cc..928aaa2f2e4 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:53:59 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:54 reed Exp $
 
 DISTNAME=	xnc-4.4.7.src
 PKGNAME=	xnc-4.4.7
-PKGREVISION=	2
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.xnc.dubna.su/src/