diff options
| author | asau <asau@pkgsrc.org> | 2012-06-06 23:14:10 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2012-06-06 23:14:10 +0000 |
| commit | 850966c4906211ada02f37cac220f27ffbf256c1 (patch) | |
| tree | cb2e50d02a1039404c16120d5aba8380b3a7c5df | |
| parent | 12dd32452c995c128e2026132be9a9cfbd3b751c (diff) | |
| download | pkgsrc-850966c4906211ada02f37cac220f27ffbf256c1.tar.gz | |
PCRE is no longer optional.
| -rw-r--r-- | math/octave/Makefile | 3 | ||||
| -rw-r--r-- | math/octave/options.mk | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 54f44287b38..b5efbb3a956 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2012/03/03 12:54:19 wiz Exp $ +# $NetBSD: Makefile,v 1.100 2012/06/06 23:14:10 asau Exp $ DISTNAME= octave-${OCTAVE_VER} PKGREVISION= 2 @@ -92,6 +92,7 @@ post-build: .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../math/blas/buildlink3.mk" diff --git a/math/octave/options.mk b/math/octave/options.mk index 35e3e1ae6f2..b4fe9b614f1 100644 --- a/math/octave/options.mk +++ b/math/octave/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.4 2010/06/02 18:35:38 adam Exp $ +# $NetBSD: options.mk,v 1.5 2012/06/06 23:14:10 asau Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.octave -PKG_SUPPORTED_OPTIONS= glpk graphicsmagick hdf5 pcre qhull -PKG_SUGGESTED_OPTIONS= glpk hdf5 pcre qhull +PKG_SUPPORTED_OPTIONS= glpk graphicsmagick hdf5 qhull +PKG_SUGGESTED_OPTIONS= glpk hdf5 qhull .include "../../mk/bsd.options.mk" @@ -24,12 +24,6 @@ CONFIGURE_ENV+= ac_cv_prog_MAGICK_CONFIG=no CONFIGURE_ARGS+= --without-hdf5 .endif -.if !empty(PKG_OPTIONS:Mpcre) -.include "../../devel/pcre/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-pcre -.endif - .if !empty(PKG_OPTIONS:Mqhull) .include "../../math/qhull/buildlink3.mk" .else |