Fix path to proj after its reimport.

8 files changed, 19 insertions, 19 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 1316da2995d..621b22fcf7d 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/03/10 11:45:26 adam Exp $
+# $NetBSD: Makefile,v 1.26 2010/03/14 16:32:15 wiz Exp $
 
 DISTNAME=	gdal-1.7.1
 PKGNAME=	gdal-lib-1.7.1
@@ -37,11 +37,11 @@ INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/gdal
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../misc/proj/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index f230cd86673..44c279343f7 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2010/01/26 08:26:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/03/14 16:32:15 wiz Exp $
 
 BUILDLINK_TREE+=	gdal-lib
 
@@ -22,11 +22,11 @@ pkgbase := gdal-lib
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../misc/proj/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .endif # GDAL_LIB_BUILDLINK3_MK
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 29a6fdb932a..13a12479269 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2010/02/09 18:29:44 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/03/14 16:32:15 wiz Exp $
 
 DISTNAME=	mapserver-5.6.1
 CATEGORIES=	geography www
@@ -48,11 +48,11 @@ do-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../misc/proj/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index f2451757736..0f4bb04aeed 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/03/07 21:13:13 jkunz Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/14 16:32:15 wiz Exp $
 #
 
 DISTNAME=	merkaartor-0.15.2
@@ -32,9 +32,9 @@ do-configure:
 		${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \
 		${MAKE} qmake
 
-.include "../../misc/proj/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../geography/gpsd/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/geography/proj-swig/Makefile b/geography/proj-swig/Makefile
index 8291f0ed56d..738f1ccecef 100644
--- a/geography/proj-swig/Makefile
+++ b/geography/proj-swig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/03/14 16:32:15 wiz Exp $
 #
 
 DISTNAME=		proj-swig-0.02
@@ -30,7 +30,7 @@ SUBST_FILES.pkg=	Makefile.in
 SUBST_SED.pkg=		-e 's,/usr/pkg,${PREFIX},g'
 
 .include "../../devel/swig/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../misc/proj/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/py-proj/Makefile b/geography/py-proj/Makefile
index a04aaedce96..783d32d254a 100644
--- a/geography/py-proj/Makefile
+++ b/geography/py-proj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/02/09 18:51:19 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/03/14 16:32:15 wiz Exp $
 #
 
 DISTNAME=		pyproj-1.8.3
@@ -22,5 +22,5 @@ post-install:
 
 .include "../../lang/python/extension.mk"
 
-.include "../../misc/proj/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/qlandkartegt/Makefile b/geography/qlandkartegt/Makefile
index 3af364ed2e8..22f07ac0e87 100644
--- a/geography/qlandkartegt/Makefile
+++ b/geography/qlandkartegt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/03/08 22:00:01 jkunz Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/14 16:32:15 wiz Exp $
 #
 
 DISTNAME=	qlandkartegt-0.18.0
@@ -18,10 +18,10 @@ USE_CMAKE=	yes
 
 DEPENDS+=	qlandkartegt-garmindev>=0.3:../../geography/qlandkartegt-garmindev
 
-.include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../misc/proj/buildlink3.mk"
 .include "../../devel/cmake/buildlink3.mk"
+.include "../../geography/gdal-lib/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../graphics/libexif/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/qlandkartem/Makefile b/geography/qlandkartem/Makefile
index 035e3df191e..e939fa1229f 100644
--- a/geography/qlandkartem/Makefile
+++ b/geography/qlandkartem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/03/02 21:48:54 jkunz Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/14 16:32:16 wiz Exp $
 #
 
 DISTNAME=	QLandkarteM.0.2.0
@@ -26,10 +26,10 @@ do-install:
 
 DEPENDS+=		qt4-sqlite3>=4.4:../../x11/qt4-sqlite3
 
+.include "../../devel/cmake/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
+.include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../misc/proj/buildlink3.mk"
-.include "../../devel/cmake/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"