[pkgsrc/trunk]: pkgsrc/math/pari Make x11 support optional, default off. Bump...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f464ef26550e
branches:  trunk
changeset: 572007:f464ef26550e
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Feb 19 08:33:28 2010 +0000

description:
Make x11 support optional, default off. Bump PKGREVISION.

diffstat:

 math/pari/Makefile   |  10 ++--------
 math/pari/options.mk |  17 +++++++++++++++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diffs (67 lines):

diff -r 1a8c4325be15 -r f464ef26550e math/pari/Makefile
--- a/math/pari/Makefile        Fri Feb 19 06:48:47 2010 +0000
+++ b/math/pari/Makefile        Fri Feb 19 08:33:28 2010 +0000
@@ -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 @@
 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 @@
 
 .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 -r 1a8c4325be15 -r f464ef26550e math/pari/options.mk
--- a/math/pari/options.mk      Fri Feb 19 06:48:47 2010 +0000
+++ b/math/pari/options.mk      Fri Feb 19 08:33:28 2010 +0000
@@ -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 @@
 .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