diff options
| author | schmonz <schmonz@pkgsrc.org> | 2010-02-19 08:33:28 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2010-02-19 08:33:28 +0000 |
| commit | 04f00860a10668cfa7b448fd6b0528fc17f8cf19 (patch) | |
| tree | b565c5e440d6433eb9a3364e90dbec9471ecd9db /math | |
| parent | 04495e104beeb3dc369df7bf478cf292b8a89e62 (diff) | |
| download | pkgsrc-04f00860a10668cfa7b448fd6b0528fc17f8cf19.tar.gz | |
Make x11 support optional, default off. Bump PKGREVISION.
Diffstat (limited to 'math')
| -rw-r--r-- | math/pari/Makefile | 10 | ||||
| -rw-r--r-- | math/pari/options.mk | 17 |
2 files changed, 17 insertions, 10 deletions
diff --git a/math/pari/Makefile b/math/pari/Makefile index 983dc0b3440..86e8a4821d6 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2010/02/12 18:18:29 sno Exp $ +# $NetBSD: Makefile,v 1.45 2010/02/19 08:33:28 schmonz Exp $ DISTNAME= pari-2.3.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= math MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ EXTRACT_SUFX= .tar.gz @@ -27,15 +27,11 @@ USE_GNU_READLINE= yes # rl_save_prompt() HAS_CONFIGURE= yes CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} CONFIGURE_ENV+= PERL5=${PERL5:Q} -CONFIGURE_ENV+= X11BASE=${X11BASE:Q} -CONFIGURE_ENV+= Xincroot=${X11BASE}/include CONFIGURE_SCRIPT= ${WRKSRC}/Configure -CONFIGURE_ARGS+= --graphic=X11 CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1 CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share -CONFIGURE_ARGS+= --with-fltk=${PREFIX:Q} REPLACE_PERL+= src/desc/PARI/822.pm @@ -45,7 +41,5 @@ TEST_TARGET= test-compat bench .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/fltk/buildlink3.mk" .include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pari/options.mk b/math/pari/options.mk index 55044c025f2..aba92f96187 100644 --- a/math/pari/options.mk +++ b/math/pari/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2010/02/06 10:37:06 sno Exp $ +# $NetBSD: options.mk,v 1.2 2010/02/19 08:33:28 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pari -PKG_SUPPORTED_OPTIONS= gmp +PKG_SUPPORTED_OPTIONS= gmp x11 PKG_SUGGESTED_OPTIONS= gmp .include "../../mk/bsd.options.mk" @@ -17,3 +17,16 @@ CONFIGURE_ARGS+= --with-gmp=${PREFIX:Q} .else PLIST.nogmp= yes .endif + +.if !empty(PKG_OPTIONS:Mx11) +CONFIGURE_ARGS+= --graphic=X11 +CONFIGURE_ARGS+= --with-fltk=${PREFIX:Q} +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} +CONFIGURE_ENV+= Xincroot=${X11BASE}/include +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/fltk/buildlink3.mk" +.else +CONFIGURE_ARGS+= --graphic=none +# don't let the configure script find an installed fltk +CONFIGURE_ARGS+= --with-fltk={BUILDLINK_DIR:Q}/nonexistent +.endif |