[pkgsrc/trunk]: pkgsrc/math/pari Pass CFLAGS to configure scripts, fixing pro...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/01f02e82ef69
branches:  trunk
changeset: 586646:01f02e82ef69
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Mar 18 15:00:01 2011 +0000

description:
Pass CFLAGS to configure scripts, fixing problems on Mac OS X; clean up some pkglint issues.

diffstat:

 math/pari/Makefile      |  12 +++++++++---
 math/pari/buildlink3.mk |   8 ++++----
 math/pari/options.mk    |  10 +++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)

diffs (95 lines):

diff -r 483e07b2e18e -r 01f02e82ef69 math/pari/Makefile
--- a/math/pari/Makefile        Fri Mar 18 13:50:34 2011 +0000
+++ b/math/pari/Makefile        Fri Mar 18 15:00:01 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2011/01/13 13:53:29 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2011/03/18 15:00:01 adam Exp $
 
 DISTNAME=      pari-2.3.5
 PKGREVISION=   7
@@ -19,11 +19,11 @@
 USE_LANGUAGES+=                c c++
 USE_GNU_READLINE=      yes     # rl_save_prompt()
 HAS_CONFIGURE=         yes
-CONFIGURE_ENV+=                LOCALBASE=${LOCALBASE:Q}
+CONFIGURE_ENV+=                LOCALBASE=${LOCALBASE}
 CONFIGURE_ENV+=                PERL5=${PERL5:Q}
 
 CONFIGURE_SCRIPT=      ${WRKSRC}/Configure
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}/man1
 CONFIGURE_ARGS+=       --share-prefix=${PREFIX}/share
 
@@ -33,6 +33,12 @@
 TEST_TARGET=           test-compat bench
 INSTALL_TARGET=                install
 
+SUBST_CLASSES+=                fix-cfg
+SUBST_STAGE.fix-cfg=   pre-configure
+SUBST_MESSAGE.fix-cfg= Adding CFLAGS to Configure scripts.
+SUBST_FILES.fix-cfg=   config/get_*
+SUBST_SED.fix-cfg=     -e 's,$$CC $$extraflag,$$CC $$CFLAGS $$extraflag,g'
+
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
diff -r 483e07b2e18e -r 01f02e82ef69 math/pari/buildlink3.mk
--- a/math/pari/buildlink3.mk   Fri Mar 18 13:50:34 2011 +0000
+++ b/math/pari/buildlink3.mk   Fri Mar 18 15:00:01 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2010/03/24 21:54:16 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2011/03/18 15:00:01 adam Exp $
 
 BUILDLINK_TREE+=       pari
 
@@ -13,10 +13,10 @@
 .include "../../mk/pkg-build-options.mk"
 
 PARI_LIB?=     pari
-.  if !empty(PKG_BUILD_OPTIONS.pari:Mgmp)
+.if !empty(PKG_BUILD_OPTIONS.pari:Mgmp)
 PARI_LIB=      pari-gmp
-.    include "../../devel/gmp/buildlink3.mk"
-.  endif
+.  include "../../devel/gmp/buildlink3.mk"
+.endif
 
 .endif # PARI_BUILDLINK3_MK
 
diff -r 483e07b2e18e -r 01f02e82ef69 math/pari/options.mk
--- a/math/pari/options.mk      Fri Mar 18 13:50:34 2011 +0000
+++ b/math/pari/options.mk      Fri Mar 18 15:00:01 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2010/10/01 20:50:55 minskim Exp $
+# $NetBSD: options.mk,v 1.6 2011/03/18 15:00:01 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pari
 PKG_SUPPORTED_OPTIONS= doc gmp x11
@@ -13,13 +13,13 @@
 PLIST.doc=             yes
 BUILD_TARGET+=         doc
 INSTALL_TARGET+=       install-doc
-MAKE_ENV+=             PDFTEX=${LOCALBASE:Q}/bin/pdftex
+MAKE_ENV+=             PDFTEX=${LOCALBASE}/bin/pdftex
 .endif
 
 PLIST_VARS+=           nogmp gmp
 .if !empty(PKG_OPTIONS:Mgmp)
 PLIST.gmp=             yes
-CONFIGURE_ARGS+=       --with-gmp=${PREFIX:Q}
+CONFIGURE_ARGS+=       --with-gmp=${PREFIX}
 .include "../../devel/gmp/buildlink3.mk"
 .else
 PLIST.nogmp=           yes
@@ -28,8 +28,8 @@
 .if !empty(PKG_OPTIONS:Mx11)
 USE_TOOLS+=            imake
 CONFIGURE_ARGS+=       --graphic=X11
-CONFIGURE_ARGS+=       --with-fltk=${PREFIX:Q}
-CONFIGURE_ENV+=                X11BASE=${X11BASE:Q}
+CONFIGURE_ARGS+=       --with-fltk=${PREFIX}
+CONFIGURE_ENV+=                X11BASE=${X11BASE}
 CONFIGURE_ENV+=                Xincroot=${X11BASE}/include
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"