diff options
| author | wiz <wiz@pkgsrc.org> | 2014-05-30 21:39:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-05-30 21:39:37 +0000 |
| commit | 4364f25c4dfc48ef6581524bc0dac7defbcb1fc1 (patch) | |
| tree | 3aba4d4b2d7bf97ff65830f1d4ecb55b6c39ae32 | |
| parent | 5546c4ca4be3ca1ee082b8152fdbd402cead2b08 (diff) | |
| download | pkgsrc-4364f25c4dfc48ef6581524bc0dac7defbcb1fc1.tar.gz | |
Remove curl from Makefile, it's an option.
Add proper curl option handling to buildlink3.mk.
From Leonardo Taccari.
| -rw-r--r-- | print/mupdf/Makefile | 4 | ||||
| -rw-r--r-- | print/mupdf/buildlink3.mk | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile index 5949da8a535..63c6b3ae55a 100644 --- a/print/mupdf/Makefile +++ b/print/mupdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/05/18 08:12:22 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2014/05/30 21:39:37 wiz Exp $ DISTNAME= mupdf-1.4-source PKGNAME= ${DISTNAME:S/-source//} @@ -47,7 +47,5 @@ post-install: .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/openjpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -# what is it used for? -#.include "../../www/curl/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/mupdf/buildlink3.mk b/print/mupdf/buildlink3.mk index df8223b389f..b0d537cf76a 100644 --- a/print/mupdf/buildlink3.mk +++ b/print/mupdf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/05/15 14:41:58 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2014/05/30 21:39:37 wiz Exp $ BUILDLINK_TREE+= mupdf @@ -9,6 +9,14 @@ BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.3 BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.4nb1 BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf +pkgbase := mupdf +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl) +.include "../../www/curl/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.endif + .include "../../graphics/jbig2dec/buildlink3.mk" .include "../../graphics/openjpeg/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" |