diff options
| author | wiz <wiz> | 2011-02-10 09:57:15 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-02-10 09:57:15 +0000 |
| commit | 63931f6b1a262f5f424aa92d9fe699d4acde3f34 (patch) | |
| tree | 9028826873b367a880fcebacf28d687c16cd8fb1 | |
| parent | 33a9bbe4b1214adbe9843fe389bc4b1de2158d85 (diff) | |
| download | pkgsrc-63931f6b1a262f5f424aa92d9fe699d4acde3f34.tar.gz | |
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.
| -rw-r--r-- | geography/gdal-lib/Makefile | 3 | ||||
| -rw-r--r-- | geography/gdal-lib/buildlink3.mk | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index 2f24b71dd2d..71490ada3cf 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2011/02/10 03:45:09 brook Exp $ +# $NetBSD: Makefile,v 1.36 2011/02/10 09:57:15 wiz Exp $ DISTNAME= gdal-1.8.0 PKGNAME= gdal-lib-1.8.0 @@ -44,6 +44,7 @@ INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" # See the comment above about using the internal tiff library +# also re-include in buildlink3.mk when uncommenting it! # .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk index d48a7229c52..d465461bbc1 100644 --- a/geography/gdal-lib/buildlink3.mk +++ b/geography/gdal-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2011/02/10 03:45:09 brook Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2011/02/10 09:57:15 wiz Exp $ BUILDLINK_TREE+= gdal-lib @@ -26,7 +26,8 @@ pkgbase := gdal-lib .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" +# see Makefile +#.include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .endif # GDAL_LIB_BUILDLINK3_MK |