Fix paths for GConf, libglade, libart, libsigc++, lablgtk moves.

Bump PKGREVISION.

22 files changed, 64 insertions, 59 deletions

diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index c869349de5e..c3db4391091 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/04/18 11:53:04 tron Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:10 wiz Exp $
 
 .include "../../net/bittorrent/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/BitTorrent/bittorrent-gui/}
-PKGREVISION=	2
+PKGREVISION=	3
 
 COMMENT+=	(GTK+ GUI)
 
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index d80c4ce293d..76ed412b505 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2007/09/20 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/21 13:04:10 wiz Exp $
 #
 
 DISTNAME=		bug-buddy-2.18.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -17,20 +17,20 @@ USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 
-GCONF2_SCHEMAS=		bug-buddy.schemas
+GCONF_SCHEMAS=		bug-buddy.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.9.0
 BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.96
 
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 946a27fecb0..1b1366134f4 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/21 13:04:11 wiz Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/ \
 		http://brainz.servebeer.com/dctc/
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 881b819c15b..e821213b0b1 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:04:11 wiz Exp $
 
 DISTNAME=	etherape-0.9.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}
 
@@ -29,7 +29,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/services ${EGDIR}
 
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../textproc/scrollkeeper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 5fd68559316..e0d114ff03b 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:11 wiz Exp $
 #
 
 DISTNAME=	gnome-netstatus-2.12.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-netstatus/2.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,12 +17,12 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
-GCONF2_SCHEMAS=		netstatus.schemas
+GCONF_SCHEMAS=		netstatus.schemas
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index dcbb31f477b..fae3066f43a 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2007/07/04 20:54:49 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:11 wiz Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
 PKGNAME=	hobbit-4.0b6
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
 
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 6eacdd783e9..5c024e0cbf1 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2007/06/23 21:41:23 markd Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:11 wiz Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index 1679fb4805c..26df0bbf0f9 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/05/05 21:39:11 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:04:12 wiz Exp $
 
 DISTNAME=	kftpgrabber-0.8.1
+PKGREVISION=	1
 CATEGORIES=	net kde
 MASTER_SITES=	http://www.kftp.org/uploads/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index c1d482df504..a1033f586f6 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/08/23 16:40:29 abs Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:12 wiz Exp $
 
 DISTNAME=	ktorrent-${KTORRENT_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net kde
 MASTER_SITES=	http://ktorrent.org/downloads/${KTORRENT_VER}/
 
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 9d3d5ae5e4e..3af3549f48d 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/09/18 12:35:12 tron Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:12 wiz Exp $
 
 DISTNAME=	libtorrent-0.11.7
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${HOMEPAGE:=downloads/}
 
@@ -35,5 +36,5 @@ CONFIGURE_ENV+=	OPENSSL_CFLAGS=${OPENSSL_CFLAGS:Q}
 CONFIGURE_ENV+=	OPENSSL_LIBS=${OPENSSL_LIBS:Q}
 .endif
 
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index 67eea9c22b2..0f3354c6e61 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/01/30 14:04:05 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/09/21 13:04:12 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTORRENT_BUILDLINK3_MK:=	${LIBTORRENT_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.libtorrent+=	libtorrent>=0.11.0
 BUILDLINK_PKGSRCDIR.libtorrent?=	../../net/libtorrent
 .endif	# LIBTORRENT_BUILDLINK3_MK
 
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/logjam/Makefile b/net/logjam/Makefile
index e8dc0d4b897..c755d92c5bb 100644
--- a/net/logjam/Makefile
+++ b/net/logjam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:12 wiz Exp $
 #
 
 DISTNAME=	logjam-4.5.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://logjam.danga.com/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index 2f54f55804f..d73d311fc68 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:12 wiz Exp $
 #
 
 .include "../../net/mldonkey/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mldonkey/mldonkey-gui/}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT+=		(GTK interface)
 
 DEPENDS+=		mldonkey-[0-9]*:../../net/mldonkey
diff --git a/net/mldonkey-gui/options.mk b/net/mldonkey-gui/options.mk
index 7c2128e5e60..09b6da85fff 100644
--- a/net/mldonkey-gui/options.mk
+++ b/net/mldonkey-gui/options.mk
@@ -1,22 +1,22 @@
-# $NetBSD: options.mk,v 1.7 2007/09/20 21:37:42 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2007/09/21 13:04:13 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mldonkey-gui
 PKG_OPTIONS_REQUIRED_GROUPS+=	toolkit
-PKG_OPTIONS_GROUP.toolkit=	lablgtk lablgtk2
-PKG_SUGGESTED_OPTIONS=	lablgtk2
+PKG_OPTIONS_GROUP.toolkit=	lablgtk1 lablgtk
+PKG_SUGGESTED_OPTIONS=	lablgtk
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mlablgtk)
+.if !empty(PKG_OPTIONS:Mlablgtk1)
 CONFIGURE_ARGS+=	--enable-gui=newgui1
-.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/lablgtk1/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mlablgtk2)
+.if !empty(PKG_OPTIONS:Mlablgtk)
 CONFIGURE_ARGS+=	--enable-gui=newgui2
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 # 2.6.0 is the first ~stable version (for mldonkey)
-BUILDLINK_API_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0
-.include "../../x11/lablgtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=2.6.0
+.include "../../x11/lablgtk/buildlink3.mk"
 .endif
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index b13e01cd23b..69d90c2f6f1 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/12 07:33:30 seb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:13 wiz Exp $
 #
 
 DISTNAME=	nfdump-1.5.5
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nfdump/}
 
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 5c9c17e8721..a0403e3eae1 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:56 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:04:13 wiz Exp $
 #
 
 DISTNAME=	nicotine-1.0.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net audio x11
 MASTER_SITES=	http://nicotine.thegraveyard.org/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 3dfe9bd38a5..574e2d2746b 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2007/09/15 07:35:37 adam Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/21 13:04:13 wiz Exp $
 
 DISTNAME=	ntop-3.3
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
 
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index cac325d67d1..ecfe1ccfe9b 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/09/18 12:35:13 tron Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:13 wiz Exp $
 
 DISTNAME=	rtorrent-0.7.7
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${HOMEPAGE:=downloads/}
 
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 9b2731cfc19..b1184ed3937 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/09/19 23:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:13 wiz Exp $
 #
 
 DISTNAME=		tsclient-0.132
-PKGREVISION=		19
+PKGREVISION=		20
 CATEGORIES=		net
 MASTER_SITES=		http://www.gnomepro.com/tsclient/
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 6aebffec114..2b8efafb014 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/12/11 23:00:31 tonio Exp $
+# $NetBSD: Makefile,v 1.34 2007/09/21 13:04:13 wiz Exp $
 
 DISTNAME=	unison-2.13.16
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
 
diff --git a/net/unison/options.mk b/net/unison/options.mk
index dab19863bf1..b7b08024f49 100644
--- a/net/unison/options.mk
+++ b/net/unison/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2006/12/11 23:00:31 tonio Exp $
+# $NetBSD: options.mk,v 1.2 2007/09/21 13:04:13 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unison
-PKG_SUPPORTED_OPTIONS=	lablgtk2
+PKG_SUPPORTED_OPTIONS=	lablgtk
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mlablgtk2)
+.if !empty(PKG_OPTIONS:Mlablgtk)
 MAKE_FLAGS+=	UISTYLE=gtk2
-.include "../../x11/lablgtk2/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .else
 MAKE_FLAGS+=	UISTYLE=text
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 61c548b90e2..3400e2058a2 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/21 13:04:14 wiz Exp $
 
 DISTNAME=	vino-2.18.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,16 +16,16 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 GNU_CONFIGURE=		yes
 
-GCONF2_SCHEMAS=		vino-server.schemas
+GCONF_SCHEMAS=		vino-server.schemas
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "options.mk"
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"