Bump PKGREVISION for libgsf dependencies, and BUILDLINK_DEPENDS because

of the libgsf shlib major bump and associated BUILDLINK_DEPENDS bump.

44 files changed, 90 insertions, 69 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index f0b47994c80..40584a2c6ea 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2005/10/16 12:11:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=	file-roller-2.12.1
+PKGREVISION=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile
index 297f43a86ad..f5ef14fcbe3 100644
--- a/converters/libwpd/Makefile
+++ b/converters/libwpd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/06/26 22:08:08 markd Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/25 21:23:14 wiz Exp $
 
 DISTNAME=	libwpd-0.8.1
+PKGREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libwpd/}
 
diff --git a/converters/libwpd/buildlink3.mk b/converters/libwpd/buildlink3.mk
index 7e4ce450ea8..a75060aff00 100644
--- a/converters/libwpd/buildlink3.mk
+++ b/converters/libwpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/06/26 22:08:08 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/25 21:23:14 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWPD_BUILDLINK3_MK:=	${LIBWPD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwpd}
 BUILDLINK_PACKAGES+=	libwpd
 
 .if !empty(LIBWPD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwpd+=	libwpd>=0.8.1
+BUILDLINK_DEPENDS.libwpd?=	libwpd>=0.8.1nb1
 BUILDLINK_PKGSRCDIR.libwpd?=	../../converters/libwpd
 .endif	# LIBWPD_BUILDLINK3_MK
 
diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index 4afb613b331..ef2812eb619 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/25 21:23:14 wiz Exp $
 #
 
 DISTNAME=		wv2-0.2.2
 #PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/converters/wv2/buildlink3.mk b/converters/wv2/buildlink3.mk
index e3de5983d13..d862c174411 100644
--- a/converters/wv2/buildlink3.mk
+++ b/converters/wv2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/11/25 21:23:14 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WV2_BUILDLINK3_MK:=	${WV2_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwv2}
 BUILDLINK_PACKAGES+=	wv2
 
 .if !empty(WV2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wv2?=		wv2>=0.2.1
-BUILDLINK_RECOMMENDED.wv2+=	wv2>=0.2.1nb5
+BUILDLINK_DEPENDS.wv2?=		wv2>=0.2.2nb1
 BUILDLINK_PKGSRCDIR.wv2?=	../../converters/wv2
 .endif	# WV2_BUILDLINK3_MK
 
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 11534306672..bd9083a81ad 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/11/22 03:10:47 dan Exp $
+# $NetBSD: Makefile,v 1.5 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=		monotone-viz-0.12
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://oandrieu.nerim.net/monotone-viz/
 
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 0dc5a291f4c..468c753fef1 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2005/10/16 12:12:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.53 2005/11/25 21:23:15 wiz Exp $
 
 DISTNAME=		gnome-games-2.12.1
+PKGREVISION=		1
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 2f01e0d8ce0..6b96c4e1a41 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:17 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/11/25 21:23:15 wiz Exp $
 
 DISTNAME=	gimageview-0.2.27
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
-PKGREVISION=	1
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gtkmmviewer.sourceforge.net/
diff --git a/graphics/gimp-color-manager/Makefile b/graphics/gimp-color-manager/Makefile
index 403cf668076..0f91b68b627 100644
--- a/graphics/gimp-color-manager/Makefile
+++ b/graphics/gimp-color-manager/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/15 16:33:25 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=		gimp-color-manager-0.1.0
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://www.virtual-sub.org/
 
diff --git a/graphics/gimp-rawphoto/Makefile b/graphics/gimp-rawphoto/Makefile
index 7d3da6472e4..80a1a71e947 100644
--- a/graphics/gimp-rawphoto/Makefile
+++ b/graphics/gimp-rawphoto/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/09/19 08:45:45 hira Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=		rawphoto-200410220928
 PKGNAME=		gimp-rawphoto-1.19
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		http://ptj.rozeta.com.pl/Soft/rawphoto/
 EXTRACT_SUFX=		.tgz
diff --git a/graphics/gimp-refocus-it/Makefile b/graphics/gimp-refocus-it/Makefile
index 490abd82a50..ee7620e53ff 100644
--- a/graphics/gimp-refocus-it/Makefile
+++ b/graphics/gimp-refocus-it/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=		refocus-it-2.0.0
 PKGNAME=		gimp-refocus-it-2.0.0
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=refocus-it/}
 
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 1d5fc0a4ee1..6ebddf0c88d 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/11/24 20:20:25 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/25 21:23:15 wiz Exp $
 
 DISTNAME=		ufraw-0.6
 PKGNAME=		gimp-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ufraw/}
 
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 7ac01005f7e..b76914584c3 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2005/10/31 13:07:02 adam Exp $
+# $NetBSD: Makefile,v 1.127 2005/11/25 21:23:15 wiz Exp $
 
 DISTNAME=	gimp-2.2.9
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index b6a48c5ef03..1331b79c40e 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/12/28 23:18:21 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/11/25 21:23:15 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp}
 BUILDLINK_PACKAGES+=	gimp
 
 .if !empty(GIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp+=	gimp>=2.0.1nb1
-BUILDLINK_RECOMMENDED.gimp+=	gimp>=2.0.6nb1
+BUILDLINK_DEPENDS.gimp+=	gimp>=2.2.9nb1
 BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp
 .endif	# GIMP_BUILDLINK3_MK
 
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index fa47c1937a4..16ef8b07850 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/05/13 15:44:20 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=	wideangle
 PKGNAME=	gimp2-wideangle-1.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ozemail.com.au/~hodsond/
 EXTRACT_SUFX=	.c
@@ -11,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ozemail.com.au/~hodsond/wideangle.html
 COMMENT=	GIMP plugin for wideangle lens distortions
 
-DIST_SUBDIR=	${PKGNAME}
+DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=         ${WRKDIR}
 EXTRACT_CMD=    ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 8af67446a4d..9896144fc6e 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/11/05 16:56:16 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2005/11/25 21:23:15 wiz Exp $
 
 DISTNAME=	gimp-2.3.4
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index 33f7d72760a..c45ff11a71b 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/21 17:31:58 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/25 21:23:15 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp}
 BUILDLINK_PACKAGES+=	gimp
 
 .if !empty(GIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp+=	gimp>=2.0.1nb1
-BUILDLINK_RECOMMENDED.gimp+=	gimp>=2.0.6nb1
-BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp
+BUILDLINK_DEPENDS.gimp+=	gimp>=2.3.4nb1
+BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp24
 .endif	# GIMP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 06b4aacd10c..f838d69e5c7 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2005/10/10 13:58:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2005/11/25 21:23:14 wiz Exp $
 #
 
 DISTNAME=	librsvg-2.12.6
 PKGNAME=	${DISTNAME:S/-/2-/}
+PKGREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 589cd447807..baddbe99fce 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/10/11 09:50:49 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/11/25 21:23:14 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSVG2_BUILDLINK3_MK:=	${LIBRSVG2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg2}
 BUILDLINK_PACKAGES+=	librsvg2
 
 .if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.8.1
+BUILDLINK_DEPENDS.librsvg2?=	librsvg2>=2.12.6nb1
 BUILDLINK_PKGSRCDIR.librsvg2?=	../../graphics/librsvg2
 .endif	# LIBRSVG2_BUILDLINK3_MK
 
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index c60e22c4faa..708de2ced1f 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2004/11/05 13:34:10 adam Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/25 21:23:15 wiz Exp $
 
 .include "../sane-backends/Makefile.common"
 
 DISTNAME=       sane-frontends-${SANE_VERSION}
+PKGREVISION=	1
 SANE_MICRO=	13
 
 COMMENT=	Frontends for access to scanners, digitals camera, frame grabbers etc
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 313f54cec88..6c60cf7cfcc 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/09/27 09:31:38 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2005/11/25 21:23:15 wiz Exp $
 
 DISTNAME=	xsane-0.97
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 4b9dd06ce14..1c409d06a90 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2005/09/08 15:29:28 drochner Exp $
+# $NetBSD: Makefile,v 1.98 2005/11/25 21:23:16 wiz Exp $
 #
 
 DISTNAME=		gnumeric-1.4.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index d6694abfdd9..8b162926063 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2005/10/11 23:34:02 markd Exp $
+# $NetBSD: Makefile,v 1.67 2005/11/25 21:23:15 wiz Exp $
 
 DISTNAME=	koffice-1.4.2
+PKGREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.4.2/src/ \
 		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.4.2/src/ \
diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk
index bc05b7ea75a..312da73c564 100644
--- a/misc/koffice/buildlink3.mk
+++ b/misc/koffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/12/28 23:18:21 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/11/25 21:23:15 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KOFFICE_BUILDLINK3_MK:=	${KOFFICE_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkoffice}
 BUILDLINK_PACKAGES+=	koffice
 
 .if !empty(KOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.koffice?=             koffice>=1.3
-BUILDLINK_RECOMMENDED.koffice?=         koffice>=1.3.5nb2
+BUILDLINK_DEPENDS.koffice?=             koffice>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.koffice?=	../../misc/koffice
 .endif	# KOFFICE_BUILDLINK3_MK
 
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 0418fb46cf8..0d0e0e767be 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/10/16 12:12:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2005/11/25 21:23:16 wiz Exp $
 
 DISTNAME=		gnome-media-2.12.0
+PKGREVISION=		1
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/gnome2-media/buildlink3.mk b/multimedia/gnome2-media/buildlink3.mk
index d2be499c631..4879c1fb4c9 100644
--- a/multimedia/gnome2-media/buildlink3.mk
+++ b/multimedia/gnome2-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/03/22 16:34:36 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/25 21:23:16 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MEDIA_BUILDLINK3_MK:=	${GNOME_MEDIA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-media}
 BUILDLINK_PACKAGES+=	gnome-media
 
 .if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-media+=		gnome-media>=2.10.0
+BUILDLINK_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
 BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome2-media
 .endif	# GNOME_MEDIA_BUILDLINK3_MK
 
diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile
index 58e5439bc60..99b252e83e5 100644
--- a/multimedia/totem-xine/Makefile
+++ b/multimedia/totem-xine/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/22 16:37:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/25 21:23:16 wiz Exp $
 #
 
 .include "../../multimedia/totem/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-xine-/}
+PKGREVISION=	1
 
 COMMENT+=	(using Xine)
 
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 7d1cb4b41e4..65a82e9d5db 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/22 16:37:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/25 21:23:16 wiz Exp $
 #
 
 .include "Makefile.common"
 
 COMMENT+=	(using GStreamer)
+PKGREVISION=	1
 
 CONFLICTS+=	totem-xine-[0-9]*
 
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index 42d97ea839d..4245358cf2b 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2005/10/06 11:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/25 21:23:16 wiz Exp $
 #
 
 .include "../../net/mldonkey/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mldonkey/mldonkey-gui/}
+PKGREVISION=		1
 COMMENT+=		(GTK interface)
 
 DEPENDS+=		mldonkey-[0-9]*:../../net/mldonkey
diff --git a/print/evince/Makefile b/print/evince/Makefile
index ed8102ba6ce..5e7b57314a8 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/10/16 12:24:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2005/11/25 21:23:16 wiz Exp $
 #
 
 DISTNAME=		evince-0.4.0
+PKGREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 76f9394088f..8ccb285dcfb 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2005/10/30 13:28:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.44 2005/11/25 21:23:16 wiz Exp $
 
 DISTNAME=	seahorse-0.8
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/0.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index e0a83ae72d4..fb2e18b8aaa 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/10/16 12:12:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.12.1
+PKGREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/nautilus-cd-burner/buildlink3.mk b/sysutils/nautilus-cd-burner/buildlink3.mk
index 960dd2c4d14..a5f89963923 100644
--- a/sysutils/nautilus-cd-burner/buildlink3.mk
+++ b/sysutils/nautilus-cd-burner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/03/22 16:33:55 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/25 21:23:15 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 NAUTILUS_CD_BURNER_BUILDLINK3_MK:=	${NAUTILUS_CD_BURNER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus-cd-burner}
 BUILDLINK_PACKAGES+=	nautilus-cd-burner
 
 .if !empty(NAUTILUS_CD_BURNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus-cd-burner+=		nautilus-cd-burner>=2.10.0
+BUILDLINK_DEPENDS.nautilus-cd-burner+=		nautilus-cd-burner>=2.12.1nb1
 BUILDLINK_PKGSRCDIR.nautilus-cd-burner?=	../../sysutils/nautilus-cd-burner
 .endif	# NAUTILUS_CD_BURNER_BUILDLINK3_MK
 
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 3bae1761921..396c4f29ffc 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2005/10/13 20:58:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.12.1
+PKGREVISION=		1
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 82908dd0935..95431f203c2 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/03/22 16:14:16 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2005/11/25 21:23:15 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus}
 BUILDLINK_PACKAGES+=	nautilus
 
 .if !empty(NAUTILUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus+=	nautilus>=2.10.0
+BUILDLINK_DEPENDS.nautilus+=	nautilus>=2.12.1nb1
 BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus$$/ \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 809f6fe8967..22d8763daa0 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.91 2005/10/22 22:07:32 minskim Exp $
+# $NetBSD: Makefile,v 1.92 2005/11/25 21:23:16 wiz Exp $
 #
 
 DISTNAME=	gdm-2.8.0.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 0f62cea6fb6..cee3f0a5a0c 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2005/10/12 21:58:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2005/11/25 21:23:16 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.12.0
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.12/}
 SITES_gnome-splash-2.12.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index bc8683e0d77..47cf97e96e4 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/10/10 14:03:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/25 21:23:16 wiz Exp $
 #
 
 DISTNAME=	gnome-themes-extras-0.8.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-themes-extras/0.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index a92cccb09f0..26b180b8765 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2005/10/12 21:55:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.51 2005/11/25 21:23:15 wiz Exp $
 #
 
 DISTNAME=	control-center-2.12.1
 PKGNAME=	gnome2-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 3a39973cb9f..58fe668366f 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:18:33 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/11/25 21:23:15 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-control-center}
 BUILDLINK_PACKAGES+=	gnome2-control-center
 
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.8.0
-BUILDLINK_RECOMMENDED.gnome2-control-center+=	gnome2-control-center>=2.8.0nb1
+BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index b451ed88c29..91a5e252047 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/11/01 21:19:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/25 21:23:16 wiz Exp $
 #
 
 DISTNAME=	lablgtk-2.6.0
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
diff --git a/x11/lablgtk2/buildlink3.mk b/x11/lablgtk2/buildlink3.mk
index 1ab34dc8985..a54ff02c9b3 100644
--- a/x11/lablgtk2/buildlink3.mk
+++ b/x11/lablgtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/06 10:52:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/11/25 21:23:16 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LABLGTK2_BUILDLINK3_MK:=	${LABLGTK2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk2}
 BUILDLINK_PACKAGES+=	lablgtk2
 
 .if !empty(LABLGTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.4.0
+BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb1
 BUILDLINK_PKGSRCDIR.lablgtk2?=	../../x11/lablgtk2
 .endif	# LABLGTK2_BUILDLINK3_MK
 
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index 7b533461eb8..acb775c3d8f 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/10/25 11:07:49 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/25 21:23:16 wiz Exp $
 #
 
 DISTNAME=	gnome-python-extras-2.12.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
+PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index ce0f12422e5..65cd971039b 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/05/03 13:19:19 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/25 21:23:16 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2EX_BUILDLINK3_MK:=	${PY_GNOME2EX_BUILDLINK3_MK}+
@@ -13,8 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2ex}
 BUILDLINK_PACKAGES+=	pygnome2ex
 
 .if !empty(PY_GNOME2EX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.10.1
-BUILDLINK_RECOMMENDED.pygnome2ex?=	${PYPKGPREFIX}-gnome2-extras>=2.10.1
+BUILDLINK_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb1
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
 .endif	# PY_GNOME2EX_BUILDLINK3_MK