diff options
| author | drochner <drochner> | 2008-01-10 15:23:27 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2008-01-10 15:23:27 +0000 |
| commit | 79d48e0d98c336c7069cbf708528275dccad7b54 (patch) | |
| tree | 8680c1584a3aabca8ac823ceb845fb22009cc389 /print/ghostscript | |
| parent | 2a026e58211593ba9732c0cd3b0c89d6895be8c9 (diff) | |
| download | pkgsrc-79d48e0d98c336c7069cbf708528275dccad7b54.tar.gz | |
-make fontconfig an option, on per default (as is x11)
-add pkg-config to TOOLS (used to locate fontconfig)
Diffstat (limited to 'print/ghostscript')
| -rw-r--r-- | print/ghostscript/Makefile | 5 | ||||
| -rw-r--r-- | print/ghostscript/options.mk | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile index b42c1d37321..4f0ff75ff70 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2008/01/10 09:09:02 tron Exp $ +# $NetBSD: Makefile,v 1.42 2008/01/10 15:23:27 drochner Exp $ DISTNAME= ghostscript-8.61 PKGREVISION= 1 @@ -18,7 +18,7 @@ CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]* DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts -USE_TOOLS+= gmake perl:run lex +USE_TOOLS+= gmake perl:run lex pkg-config GNU_CONFIGURE= yes MAKE_JOBS_SAFE= no @@ -55,7 +55,6 @@ post-extract: .include "../../graphics/png/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../fonts/fontconfig/buildlink3.mk" # pkgsrc jasper is too new #.include "../../graphics/jasper/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk index 5193783f6db..5fb92a2fd79 100644 --- a/print/ghostscript/options.mk +++ b/print/ghostscript/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.4 2007/10/22 12:35:32 dsainty Exp $ +# $NetBSD: options.mk,v 1.5 2008/01/10 15:23:27 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript -PKG_SUPPORTED_OPTIONS= x11 cups -PKG_SUGGESTED_OPTIONS= x11 +PKG_SUPPORTED_OPTIONS= x11 cups fontconfig +PKG_SUGGESTED_OPTIONS= x11 fontconfig .include "../../mk/bsd.options.mk" @@ -34,3 +34,9 @@ SUBST_SED.cupsetc= -e "s|^CUPSCONFIG=.*|CUPSCONFIG=${CUPS_EGDIR}|g" CONFIGURE_ARGS+= --disable-cups PLIST_SUBST+= CUPS="@comment " .endif + +.if !empty(PKG_OPTIONS:Mfontconfig) +.include "../../fonts/fontconfig/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-fontconfig +.endif |