From 55d49f0099308fe022de61c550c758b8b2adf2f5 Mon Sep 17 00:00:00 2001
From: Tobias Nygren <tnn@NetBSD.org>
Date: Wed, 23 Sep 2015 06:20:09 +0200
Subject: [PATCH] fix dangling .includes

---
 avrdude/Makefile         | 2 +-
 dolfin/Makefile          | 2 +-
 libee/Makefile           | 2 +-
 p5-KyotoCabinet/Makefile | 2 +-
 py-pygit2/Makefile       | 2 +-
 rsyslog6/Makefile        | 2 +-
 rsyslog7/Makefile        | 2 +-
 suitesparse/Makefile     | 2 +-
 xphelloworld/Makefile    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/avrdude/Makefile b/avrdude/Makefile
index 5e15a8d03e..2d4f4a9347 100644
--- a/avrdude/Makefile
+++ b/avrdude/Makefile
@@ -42,7 +42,7 @@ BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 .endif
 
 .include "../../devel/libftdi/buildlink3.mk"
-.include "../../wip/libhid/buildlink3.mk"
+.include "../../devel/libhid/buildlink3.mk"
 .include "../../wip/libftdi1/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
diff --git a/dolfin/Makefile b/dolfin/Makefile
index 44763f4380..334bb90cd8 100644
--- a/dolfin/Makefile
+++ b/dolfin/Makefile
@@ -86,7 +86,7 @@ MMVERSION=	1.2
 
 .include "../../lang/python/application.mk"
 .include "../../wip/armadillo/buildlink3.mk"
-.include "../../wip/metis/buildlink3.mk"
+.include "../../devel/metis/buildlink3.mk"
 .include "../../wip/ufc/buildlink3.mk"
 .include "../../wip/py-ffc/buildlink3.mk"
 .include "../../wip/py-fiat/buildlink3.mk"
diff --git a/libee/Makefile b/libee/Makefile
index 7c4dffe0b3..21d4101de3 100644
--- a/libee/Makefile
+++ b/libee/Makefile
@@ -20,6 +20,6 @@ USE_TOOLS+=		bash pkg-config
 
 PKGCONFIG_OVERRIDE+=	libee.pc.in
 
-.include "../../wip/libestr/buildlink3.mk"
+.include "../../devel/libestr/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-KyotoCabinet/Makefile b/p5-KyotoCabinet/Makefile
index 1865b64347..5cc2fb94cf 100644
--- a/p5-KyotoCabinet/Makefile
+++ b/p5-KyotoCabinet/Makefile
@@ -15,6 +15,6 @@ REPLACE_PERL=	*.pl
 
 PERL5_PACKLIST=	auto/KyotoCabinet/.packlist
 
-.include "../../wip/kyotocabinet/buildlink3.mk"
+.include "../../databases/kyotocabinet/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pygit2/Makefile b/py-pygit2/Makefile
index 4cbab26faf..dec2f47cd2 100644
--- a/py-pygit2/Makefile
+++ b/py-pygit2/Makefile
@@ -19,7 +19,7 @@ PY_PATCHPLIST=	yes
 #do-install:
 #	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} setup.py install --root=${DESTDIR} --prefix=${PREFIX}
 
-.include "../../wip/libgit2/buildlink3.mk"
+.include "../../devel/libgit2/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 #.include "../../lang/python/application.mk"
 #.include "../../lang/python/extension.mk"
diff --git a/rsyslog6/Makefile b/rsyslog6/Makefile
index a0ddf8900f..5ef565a40f 100644
--- a/rsyslog6/Makefile
+++ b/rsyslog6/Makefile
@@ -56,7 +56,7 @@ post-install:
 .	endif
 
 .include "../../wip/libee/buildlink3.mk"
-.include "../../wip/libestr/buildlink3.mk"
+.include "../../devel/libestr/buildlink3.mk"
 .include "../../sysutils/liblognorm/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/rsyslog7/Makefile b/rsyslog7/Makefile
index c51d4d2881..b98457095f 100644
--- a/rsyslog7/Makefile
+++ b/rsyslog7/Makefile
@@ -50,7 +50,7 @@ post-install:
 
 .include "../../wip/libee/buildlink3.mk"
 BUILDLINK_ABI_DEPENDS.libestr+=		libestr>=0.1.9
-.include "../../wip/libestr/buildlink3.mk"
+.include "../../devel/libestr/buildlink3.mk"
 .include "../../wip/liblogging/buildlink3.mk"
 .include "../../sysutils/liblognorm/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index 688af7cda6..d0876c2694 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -128,5 +128,5 @@ do-install:
 
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
-.include "../../wip/metis/buildlink3.mk"
+.include "../../math/metis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xphelloworld/Makefile b/xphelloworld/Makefile
index e678c001ea..84168fbad3 100644
--- a/xphelloworld/Makefile
+++ b/xphelloworld/Makefile
@@ -23,7 +23,7 @@ SUBST_STAGE.xaw=	post-patch
 BUILDLINK_DEPMETHOD.libXt=	build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
-.include "../../wip/libXprintAppUtil/buildlink3.mk"
+.include "../../x11/libXprintAppUtil/buildlink3.mk"
 .include "../../x11/libXprintUtil/buildlink3.mk"
 BUILD_DEPENDS+=	xp-[0-9]*:../../x11/xp
 .include "../../x11/libX11/buildlink3.mk"