prefer pkgsrc over wip in some cases where the pkgsrc package is newer

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Wed Sep 23 20:27:29 2015 +0200
Changeset:	52232fd76b31788174f5dee85034e09b27795adc

Modified Files:
	gnome-core/Makefile
	gnome-do/Makefile
	hs-cabal-query/Makefile
	hs-cabal-query/buildlink3.mk
	libchamplain012/Makefile
	libchamplain012/buildlink3.mk
	mate-screensaver/Makefile
	p5-Catalyst-Controller-DBIC-API/Makefile
	py-watchdog/Makefile

Log Message:
prefer pkgsrc over wip in some cases where the pkgsrc package is newer

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=52232fd76b31788174f5dee85034e09b27795adc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnome-core/Makefile                      | 2 +-
 gnome-do/Makefile                        | 2 +-
 hs-cabal-query/Makefile                  | 2 +-
 hs-cabal-query/buildlink3.mk             | 2 +-
 libchamplain012/Makefile                 | 2 +-
 libchamplain012/buildlink3.mk            | 2 +-
 mate-screensaver/Makefile                | 2 +-
 p5-Catalyst-Controller-DBIC-API/Makefile | 2 +-
 py-watchdog/Makefile                     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diffs:
diff --git a/gnome-core/Makefile b/gnome-core/Makefile
index ea12922..919565e 100644
--- a/gnome-core/Makefile
+++ b/gnome-core/Makefile
@@ -87,7 +87,7 @@ DEPENDS+=	gupnp>=0.20.14:../../net/gupnp
 DEPENDS+=	gupnp-igd>=0.2.4:../../net/gupnp-igd
 DEPENDS+=	gvfs>=1.24.1:../../sysutils/gvfs
 DEPENDS+=	json-glib>=1.0.4:../../textproc/json-glib
-DEPENDS+=	libchamplain>=0.12.10:../../wip/libchamplain012
+DEPENDS+=	libchamplain>=0.12.10:../../geography/libchamplain012
 DEPENDS+=	libcroco>=0.6.8:../../textproc/libcroco
 DEPENDS+=	libgdata>=0.17.1:../../net/libgdata
 DEPENDS+=	libgee>=0.18.0:../../devel/libgee
diff --git a/gnome-do/Makefile b/gnome-do/Makefile
index fc286e1..8f83b6b 100644
--- a/gnome-do/Makefile
+++ b/gnome-do/Makefile
@@ -38,6 +38,6 @@ PKGCONFIG_OVERRIDE+=	Do.Interface.Linux.AnimationBase/do.interface.linux.animati
 .include "../../x11/gnome-desktop-sharp/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
-.include "../../wip/gnome-keyring-sharp/buildlink3.mk"
+.include "../../security/gnome-keyring-sharp/buildlink3.mk"
 .include "../../wip/notify-sharp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/hs-cabal-query/Makefile b/hs-cabal-query/Makefile
index 03b47a5..d29c360 100644
--- a/hs-cabal-query/Makefile
+++ b/hs-cabal-query/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Helpers for querying .cabal files or hackageDB's 00-index.tar
 LICENSE=	modified-bsd
 
 .include "../../wip/mk/haskell.mk"
-.include "../../wip/ghc/buildlink3.mk"
+.include "../../lang/ghc7/buildlink3.mk"
 .include "../../wip/hs-MissingH/buildlink3.mk"
 .include "../../wip/hs-derive/buildlink3.mk"
 .include "../../devel/hs-mtl/buildlink3.mk"
diff --git a/hs-cabal-query/buildlink3.mk b/hs-cabal-query/buildlink3.mk
index 62c016d..3bd21cd 100644
--- a/hs-cabal-query/buildlink3.mk
+++ b/hs-cabal-query/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.hs-cabal-query+=	hs-cabal-query>=0.1
 BUILDLINK_ABI_DEPENDS.hs-cabal-query+=	hs-cabal-query>=0.1
 BUILDLINK_PKGSRCDIR.hs-cabal-query?=	../../wip/hs-cabal-query
 
-.include "../../wip/ghc/buildlink3.mk"
+.include "../../lang/ghc7/buildlink3.mk"
 .include "../../wip/hs-MissingH/buildlink3.mk"
 .include "../../wip/hs-derive/buildlink3.mk"
 .include "../../devel/hs-mtl/buildlink3.mk"
diff --git a/libchamplain012/Makefile b/libchamplain012/Makefile
index 2947823..e8e02af 100644
--- a/libchamplain012/Makefile
+++ b/libchamplain012/Makefile
@@ -28,5 +28,5 @@ PKGCONFIG_OVERRIDE+=	champlain.pc.in
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../wip/libmemphis02/buildlink3.mk"
+.include "../../geography/libmemphis02/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libchamplain012/buildlink3.mk b/libchamplain012/buildlink3.mk
index 64bace6..526bc36 100644
--- a/libchamplain012/buildlink3.mk
+++ b/libchamplain012/buildlink3.mk
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.libchamplain012?=	../../wip/libchamplain012
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"
-.include "../../wip/libmemphis02/buildlink3.mk"
+.include "../../geography/libmemphis02/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .endif	# LIBCHAMPLAIN012_BUILDLINK3_MK
 
diff --git a/mate-screensaver/Makefile b/mate-screensaver/Makefile
index 4f5b676..1e472da 100644
--- a/mate-screensaver/Makefile
+++ b/mate-screensaver/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 CONFLICTS+=	gnome-screensaver-[0-9]*
 
-DEPENDS+=	consolekit-[0-9]*:../../wip/consolekit
+DEPENDS+=	consolekit-[0-9]*:../sysutils/consolekit
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
diff --git a/p5-Catalyst-Controller-DBIC-API/Makefile b/p5-Catalyst-Controller-DBIC-API/Makefile
index 1f731ad..2c50de4 100644
--- a/p5-Catalyst-Controller-DBIC-API/Makefile
+++ b/p5-Catalyst-Controller-DBIC-API/Makefile
@@ -13,7 +13,7 @@ DEPENDS+=	p5-ExtUtils-MakeMaker>0:../../devel/p5-ExtUtils-MakeMaker
 DEPENDS+=	p5-MooseX-Types-Structured>0:../../devel/p5-MooseX-Types-Structured
 DEPENDS+=	p5-CGI-Expand>0:../../wip/p5-CGI-Expand
 DEPENDS+=	p5-Catalyst-Model-DBIC-Schema>0:../../wip/p5-Catalyst-Model-DBIC-Schema
-DEPENDS+=	p5-Catalyst-Action-REST>0:../../wip/p5-Catalyst-Action-REST
+DEPENDS+=	p5-Catalyst-Action-REST>0:../../www/p5-Catalyst-Action-REST
 DEPENDS+=	p5-Data-Printer>0:../../devel/p5-Data-Printer
 DEPENDS+=	p5-Test-WWW-Mechanize-Catalyst>0:../../www/p5-Test-WWW-Mechanize-Catalyst
 DEPENDS+=	p5-JSON>0:../../converters/p5-JSON
diff --git a/py-watchdog/Makefile b/py-watchdog/Makefile
index e3cdb78..63b18c8 100644
--- a/py-watchdog/Makefile
+++ b/py-watchdog/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Filesystem events monitoring
 LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
-DEPENDS+=	${PYPKGPREFIX}-argh>=0.8.1:../../wip/py-argh
+DEPENDS+=	${PYPKGPREFIX}-argh>=0.8.1:../../devel/py-argh
 DEPENDS+=	${PYPKGPREFIX}-pathtools>=0.1.1:../../wip/py-pathtools
 
 .include "../../lang/python/egg.mk"