diff options
| author | adam <adam> | 2011-03-18 15:00:01 +0000 |
|---|---|---|
| committer | adam <adam> | 2011-03-18 15:00:01 +0000 |
| commit | 6fe4195490c5a2e1276920111f005183332cbff3 (patch) | |
| tree | 9b9ea9d2bc61a76c03dcf7d380d4b3444bacb125 /math | |
| parent | b44b20bb5902ef864e2ea217a06b0b1f705d33bb (diff) | |
| download | pkgsrc-6fe4195490c5a2e1276920111f005183332cbff3.tar.gz | |
Pass CFLAGS to configure scripts, fixing problems on Mac OS X; clean up some pkglint issues.
Diffstat (limited to 'math')
| -rw-r--r-- | math/pari/Makefile | 12 | ||||
| -rw-r--r-- | math/pari/buildlink3.mk | 8 | ||||
| -rw-r--r-- | math/pari/options.mk | 10 |
3 files changed, 18 insertions, 12 deletions
diff --git a/math/pari/Makefile b/math/pari/Makefile index 6f50e1bfe6f..da90adfdde6 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -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_TOOLS+= perl:run 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 @@ BUILD_TARGET= all 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 --git a/math/pari/buildlink3.mk b/math/pari/buildlink3.mk index fb7a63d71bb..403c9d176b3 100644 --- a/math/pari/buildlink3.mk +++ b/math/pari/buildlink3.mk @@ -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 @@ pkgbase := pari .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 --git a/math/pari/options.mk b/math/pari/options.mk index 57f0adb8d1d..5255307cc47 100644 --- a/math/pari/options.mk +++ b/math/pari/options.mk @@ -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 @@ BUILD_DEPENDS+= tex-pdftex>=1.40.11:../../print/tex-pdftex 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 @@ PLIST.nogmp= yes .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" |