Thu Feb 10 09:57:15 2011 UTC ()
Stop including tiff/bl3.mk from bl3.mk as well, and add a comment
in the Makefile to re-enable it when we switch back to pkgsrc tiff.


(wiz)
diff -r1.35 -r1.36 pkgsrc/geography/gdal-lib/Makefile
diff -r1.20 -r1.21 pkgsrc/geography/gdal-lib/buildlink3.mk
cvs diff -r1.35 -r1.36 pkgsrc/geography/gdal-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/gdal-lib/Makefile 2011/02/10 03:45:09 1.35
+++ pkgsrc/geography/gdal-lib/Makefile 2011/02/10 09:57:15 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.35 2011/02/10 03:45:09 brook Exp $ 1# $NetBSD: Makefile,v 1.36 2011/02/10 09:57:15 wiz Exp $
2 2
3DISTNAME= gdal-1.8.0 3DISTNAME= gdal-1.8.0
4PKGNAME= gdal-lib-1.8.0 4PKGNAME= gdal-lib-1.8.0
5CATEGORIES= geography 5CATEGORIES= geography
6MASTER_SITES= http://download.osgeo.org/gdal/ 6MASTER_SITES= http://download.osgeo.org/gdal/
7 7
8MAINTAINER= brook@nmsu.edu 8MAINTAINER= brook@nmsu.edu
9HOMEPAGE= http://www.gdal.org/ 9HOMEPAGE= http://www.gdal.org/
10COMMENT= Translator library for raster geospatial data formats 10COMMENT= Translator library for raster geospatial data formats
11LICENSE= mit 11LICENSE= mit
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -34,17 +34,18 @@ MAKE_FILE= GNUmakefile @@ -34,17 +34,18 @@ MAKE_FILE= GNUmakefile
34.include "options.mk" 34.include "options.mk"
35 35
36CHECK_PORTABILITY_SKIP+= mkbindist.sh 36CHECK_PORTABILITY_SKIP+= mkbindist.sh
37 37
38INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal 38INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal
39 39
40.include "../../devel/zlib/buildlink3.mk" 40.include "../../devel/zlib/buildlink3.mk"
41.include "../../geography/geos/buildlink3.mk" 41.include "../../geography/geos/buildlink3.mk"
42.include "../../geography/proj/buildlink3.mk" 42.include "../../geography/proj/buildlink3.mk"
43.include "../../graphics/jasper/buildlink3.mk" 43.include "../../graphics/jasper/buildlink3.mk"
44.include "../../graphics/libungif/buildlink3.mk" 44.include "../../graphics/libungif/buildlink3.mk"
45.include "../../graphics/png/buildlink3.mk" 45.include "../../graphics/png/buildlink3.mk"
46# See the comment above about using the internal tiff library 46# See the comment above about using the internal tiff library
 47# also re-include in buildlink3.mk when uncommenting it!
47# .include "../../graphics/tiff/buildlink3.mk" 48# .include "../../graphics/tiff/buildlink3.mk"
48.include "../../textproc/xerces-c/buildlink3.mk" 49.include "../../textproc/xerces-c/buildlink3.mk"
49.include "../../www/curl/buildlink3.mk" 50.include "../../www/curl/buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/geography/gdal-lib/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/geography/gdal-lib/buildlink3.mk 2011/02/10 03:45:09 1.20
+++ pkgsrc/geography/gdal-lib/buildlink3.mk 2011/02/10 09:57:15 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.20 2011/02/10 03:45:09 brook Exp $ 1# $NetBSD: buildlink3.mk,v 1.21 2011/02/10 09:57:15 wiz Exp $
2 2
3BUILDLINK_TREE+= gdal-lib 3BUILDLINK_TREE+= gdal-lib
4 4
5.if !defined(GDAL_LIB_BUILDLINK3_MK) 5.if !defined(GDAL_LIB_BUILDLINK3_MK)
6GDAL_LIB_BUILDLINK3_MK:= 6GDAL_LIB_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gdal-lib+= gdal-lib>=1.6.1 8BUILDLINK_API_DEPENDS.gdal-lib+= gdal-lib>=1.6.1
9BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=1.8.0 9BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=1.8.0
10BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib 10BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib
11 11
12pkgbase := gdal-lib 12pkgbase := gdal-lib
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
@@ -16,19 +16,20 @@ pkgbase := gdal-lib @@ -16,19 +16,20 @@ pkgbase := gdal-lib
16.include "../../mk/pgsql.buildlink3.mk" 16.include "../../mk/pgsql.buildlink3.mk"
17.endif 17.endif
18 18
19.if !empty(PKG_BUILD_OPTIONS.gdal-lib:Mmysql) 19.if !empty(PKG_BUILD_OPTIONS.gdal-lib:Mmysql)
20.include "../../mk/mysql.buildlink3.mk" 20.include "../../mk/mysql.buildlink3.mk"
21.endif 21.endif
22 22
23.include "../../devel/zlib/buildlink3.mk" 23.include "../../devel/zlib/buildlink3.mk"
24.include "../../geography/geos/buildlink3.mk" 24.include "../../geography/geos/buildlink3.mk"
25.include "../../geography/proj/buildlink3.mk" 25.include "../../geography/proj/buildlink3.mk"
26.include "../../graphics/jasper/buildlink3.mk" 26.include "../../graphics/jasper/buildlink3.mk"
27.include "../../graphics/libungif/buildlink3.mk" 27.include "../../graphics/libungif/buildlink3.mk"
28.include "../../graphics/png/buildlink3.mk" 28.include "../../graphics/png/buildlink3.mk"
29.include "../../graphics/tiff/buildlink3.mk" 29# see Makefile
 30#.include "../../graphics/tiff/buildlink3.mk"
30.include "../../textproc/xerces-c/buildlink3.mk" 31.include "../../textproc/xerces-c/buildlink3.mk"
31.include "../../www/curl/buildlink3.mk" 32.include "../../www/curl/buildlink3.mk"
32.endif # GDAL_LIB_BUILDLINK3_MK 33.endif # GDAL_LIB_BUILDLINK3_MK
33 34
34BUILDLINK_TREE+= -gdal-lib 35BUILDLINK_TREE+= -gdal-lib