From cc12c18d21d271128456636a9be77b7721c0ced1 Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 7 Nov 2010 20:33:58 +0000 Subject: [PATCH] WANTLIB for math --- math/arpack/Makefile | 7 ++++--- math/calcoo/Makefile | 5 +++-- math/cblas/Makefile | 7 ++++--- math/galculator/Makefile | 5 +++-- math/ginac/Makefile | 6 +++--- math/gnuplot/Makefile | 10 +++++----- math/grace/Makefile | 22 +++++++++++++--------- math/grpn/Makefile | 5 +++-- math/kst/Makefile | 18 ++++++++++-------- math/lapack/Makefile | 5 +++-- math/p5-AI-FANN/Makefile | 5 +++-- math/p5-Math-BigInt-GMP/Makefile | 5 +++-- math/p5-Math-GMP/Makefile | 5 +++-- math/py-numpy/Makefile | 6 +++--- math/qtoctave/Makefile | 7 ++++--- math/wcalc/Makefile | 6 +++--- 16 files changed, 70 insertions(+), 54 deletions(-) diff --git a/math/arpack/Makefile b/math/arpack/Makefile index 883c991a80a..4899eb19b64 100644 --- a/math/arpack/Makefile +++ b/math/arpack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/23 15:09:57 steven Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/07 20:33:58 espie Exp $ COMMENT= solve large scale eigenvalue problems @@ -31,8 +31,9 @@ PKG_ARGS+= -Dno_mips64=0 PKG_ARGS+= -Dno_mips64=1 .endif -LIB_DEPENDS= lapack.>=1::math/lapack \ - blas.>=1::math/blas +LIB_DEPENDS = ::math/lapack \ + ::math/blas +WANTLIB = lapack.>=1 blas.>=1 WRKDIST= ${WRKDIR}/ARPACK WRKSRC= ${WRKDIST}/SRC diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile index 37e0fbbe88e..34e3e487794 100644 --- a/math/calcoo/Makefile +++ b/math/calcoo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2010/10/24 21:25:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.39 2010/11/07 20:33:58 espie Exp $ COMMENT= RPN and algebraic scientific calculator @@ -18,13 +18,14 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calcoo/} MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 +LIB_DEPENDS= ::x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 +WANTLIB += gdk-x11-2.0.>=1000 gtk-x11-2.0.>=1000 USE_GROFF = Yes SEPARATE_BUILD= simple diff --git a/math/cblas/Makefile b/math/cblas/Makefile index 988e5110dcf..678e51678ec 100644 --- a/math/cblas/Makefile +++ b/math/cblas/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/23 15:09:57 steven Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/07 20:33:58 espie Exp $ COMMENT= C interface to the BLAS library @@ -31,8 +31,9 @@ WRKSRC= ${WRKDIST}/src MODULES= fortran MODFORTRAN_COMPILER = g77 -BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS} -LIB_DEPENDS= blas.>=1.0::math/blas +BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS} +LIB_DEPENDS = ::math/blas +WANTLIB = blas.>=1.0 CFLAGS+= -DADD_ MAKE_FILE= ${FILESDIR}/Makefile diff --git a/math/galculator/Makefile b/math/galculator/Makefile index aa3b97e372f..2cda39d3059 100644 --- a/math/galculator/Makefile +++ b/math/galculator/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2010/10/24 21:25:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2010/11/07 20:33:58 espie Exp $ COMMENT= GTK2-based scientific calculator @@ -30,7 +30,8 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galculator/} EXTRACT_SUFX= .tar.bz2 RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= glade-2.0::devel/libglade2 +LIB_DEPENDS= ::devel/libglade2 +WANTLIB += glade-2.0 SEPARATE_BUILD= simple USE_GMAKE= Yes diff --git a/math/ginac/Makefile b/math/ginac/Makefile index 1dc31ebc7ae..e96ae419b84 100644 --- a/math/ginac/Makefile +++ b/math/ginac/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.10 2010/10/24 22:36:37 pirofti Exp $ +# $Id: Makefile,v 1.11 2010/11/07 20:33:58 espie Exp $ COMMENT= GiNaC is Not a Computer Algebra System (CAS) @@ -21,9 +21,9 @@ MASTER_SITES= ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ \ ${HOMEPAGE} EXTRACT_SUFX= .tar.bz2 -WANTLIB= c m ncurses readline stdc++ gmp +WANTLIB= c m ncurses readline stdc++ gmp cln -LIB_DEPENDS= cln::devel/cln +LIB_DEPENDS= ::devel/cln MODULES= gcc3 MODGCC3_ARGHES= sparc diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index d8e31928372..d5fab2c0a1c 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2010/10/24 21:25:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2010/11/07 20:33:58 espie Exp $ COMMENT= command-driven interactive function plotting program @@ -35,12 +35,12 @@ REGRESS_IS_INTERACTIVE= x11 SUBST_VARS= V .if ${FLAVOR:L:Mno_x11} -CONFIGURE_ARGS+= --without-x --without-gd +CONFIGURE_ARGS += --without-x --without-gd .else -LIB_DEPENDS= gd.>=20::graphics/gd +LIB_DEPENDS = ::graphics/gd USE_GROFF = Yes -WANTLIB+= X11 fontconfig freetype iconv jpeg png -CONFIGURE_ARGS+= --with-x +WANTLIB += X11 fontconfig freetype iconv jpeg png gd.>=20 +CONFIGURE_ARGS += --with-x .endif post-install: diff --git a/math/grace/Makefile b/math/grace/Makefile index 7548039c084..5de06c7653f 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2010/10/24 21:25:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.34 2010/11/07 20:33:58 espie Exp $ COMMENT= GRaphing, Advanced Computation and Exploration of data @@ -29,11 +29,12 @@ CONFIGURE_ARGS+= --with-bundled-xbae \ --enable-grace-home=${PREFIX}/grace USE_GROFF = Yes -LIB_DEPENDS= jpeg.>=62::graphics/jpeg \ - png.>=2::graphics/png \ - t1.>=5::devel/t1lib \ - tiff.>=35::graphics/tiff \ - pdf.>=2::print/pdflib +LIB_DEPENDS = ::graphics/jpeg \ + ::graphics/png \ + ::devel/t1lib \ + ::graphics/tiff \ + ::print/pdflib +WANTLIB += jpeg.>=62 png.>=2 t1.>=5 tiff.>=35 pdf.>=2 FLAVORS= no_x11 fftw netcdf xmhtml FLAVOR?= @@ -49,7 +50,8 @@ REGRESS_IS_INTERACTIVE= x11 USE_MOTIF= openmotif WANTLIB+= ICE SM X11 Xext Xmu Xpm Xt . if ${FLAVOR:L:Mxmhtml} -LIB_DEPENDS+= XmHTML.>=1::www/xmhtml +LIB_DEPENDS += ::www/xmhtml +WANTLIB += XmHTML.>=1 CONFIGURE_ARGS+= --enable-xmhtml . else CONFIGURE_ARGS+= --disable-xmhtml @@ -58,14 +60,16 @@ CONFIGURE_ENV= LDFLAGS=-lm .endif .if ${FLAVOR:L:Mfftw} -LIB_DEPENDS+= fftw.>=2::math/fftw +LIB_DEPENDS += ::math/fftw +WANTLIB += fftw.>=2 CONFIGURE_ARGS+= --with-fftw .else CONFIGURE_ARGS+= --without-fftw .endif .if ${FLAVOR:L:Mnetcdf} -LIB_DEPENDS+= netcdf.>=1::math/netcdf +LIB_DEPENDS += ::math/netcdf +WANTLIB += netcdf.>=1 CONFIGURE_ARGS+= --enable-netcdf .else CONFIGURE_ARGS+= --disable-netcdf diff --git a/math/grpn/Makefile b/math/grpn/Makefile index 71498d31ded..5dd86eb2d2a 100644 --- a/math/grpn/Makefile +++ b/math/grpn/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/10/24 21:25:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.22 2010/11/07 20:33:59 espie Exp $ COMMENT= graphical reverse polish notation calculator @@ -24,8 +24,9 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 +WANTLIB += gdk-x11-2.0 gtk-x11-2.0 -LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= ::x11/gtk+2 MAKE_FLAGS= CC="${CC}" ALL_TARGET= diff --git a/math/kst/Makefile b/math/kst/Makefile index e64029de554..61e72adaec7 100644 --- a/math/kst/Makefile +++ b/math/kst/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/10/24 21:25:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.16 2010/11/07 20:33:59 espie Exp $ CATEGORIES= math x11/kde COMMENT= data viewing/plotting tool @@ -33,17 +33,19 @@ CONFIG_GUESS_DIRS= ${MODKDE_CONFIG_GUESS_DIR} MAKE_FLAGS= ${MODKDE_MAKE_FLAGS} USE_LIBTOOL= Yes USE_GMAKE= Yes -USE_GROFF = Yes +USE_GROFF = Yes LIBTOOL_FLAGS = --tag=disable-static -LIB_DEPENDS+= kdecore.>=6,kwalletclient,DCOP,kutils,kparts,kdeui,kdesu,kmdi,kio,kdefx,kdeprint,khtml,kjs::x11/kde/libs3 \ - gsl.>=7,gslcblas:gsl->=1.6:devel/gsl \ - netcdf,netcdf_c++::math/netcdf \ - cfitsio::math/cfitsio +LIB_DEPENDS += ::x11/kde/libs3 \ + :gsl->=1.6:devel/gsl \ + ::math/netcdf \ + ::math/cfitsio -WANTLIB= c m util stdc++ pthread z X11 ICE Xrender SM Xext \ +WANTLIB = c m util stdc++ pthread z X11 ICE Xrender SM Xext \ png jpeg art_lgpl_2 idn pcre pcreposix \ Xau Xdmcp fam rpcsvc ncurses readline qui \ - pthread-stubs xcb + pthread-stubs xcb kdecore.>=6 kwalletclient DCOP \ + kutils kparts kdeui kdesu kmdi kio kdefx kdeprint khtml kjs \ + gsl.>=7 gslcblas netcdf netcdf_c++ cfitsio .include diff --git a/math/lapack/Makefile b/math/lapack/Makefile index 9056030664f..f5366421c59 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2010/10/23 15:09:57 steven Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/07 20:33:59 espie Exp $ COMMENT= library of Fortran 77 linear algebra subroutines @@ -22,7 +22,8 @@ MASTER_SITES= ftp://ftp.netlib.org/lapack/ \ http://www.netlib.no/netlib/lapack/ EXTRACT_SUFX= .tgz -LIB_DEPENDS= blas.>=1::math/blas +LIB_DEPENDS = ::math/blas +WANTLIB = blas.>=1 MODULES= fortran MODFORTRAN_COMPILER = g77 diff --git a/math/p5-AI-FANN/Makefile b/math/p5-AI-FANN/Makefile index 2b99c92472f..40d178b2d2c 100644 --- a/math/p5-AI-FANN/Makefile +++ b/math/p5-AI-FANN/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 20:52:06 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/07 20:33:59 espie Exp $ SHARED_ONLY= Yes @@ -17,7 +17,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= doublefann::math/fann +LIB_DEPENDS = ::math/fann +WANTLIB = doublefann CONFIGURE_ARGS+= FANN_LIB="${LOCALBASE}/lib" \ FANN_INCLUDE"${LOCALBASE}/include" diff --git a/math/p5-Math-BigInt-GMP/Makefile b/math/p5-Math-BigInt-GMP/Makefile index 0766b1c68a0..74142b8414f 100644 --- a/math/p5-Math-BigInt-GMP/Makefile +++ b/math/p5-Math-BigInt-GMP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 20:52:06 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/07 20:33:59 espie Exp $ SHARED_ONLY= Yes @@ -16,7 +16,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= gmp.>=6::devel/gmp +LIB_DEPENDS = ::devel/gmp +WANTLIB = gmp.>=6 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/math/p5-Math-GMP/Makefile b/math/p5-Math-GMP/Makefile index 087c1eb6c13..902a13fc910 100644 --- a/math/p5-Math-GMP/Makefile +++ b/math/p5-Math-GMP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2010/10/19 09:21:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.21 2010/11/07 20:33:59 espie Exp $ SHARED_ONLY= Yes @@ -15,7 +15,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= gmp.>=4::devel/gmp +LIB_DEPENDS = ::devel/gmp +WANTLIB = gmp.>=4 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index d45f162f8d0..d16e67f34e8 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/10/23 15:09:57 steven Exp $ +# $OpenBSD: Makefile,v 1.27 2010/11/07 20:33:59 espie Exp $ COMMENT= fast array and numeric programming library for Python @@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= blas m ${MODFORTRAN_WANTLIB} +WANTLIB= blas m lapack ${MODFORTRAN_WANTLIB} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=numpy/} @@ -33,7 +33,7 @@ REGRESS_DEPENDS= ::devel/py-nose MODFORTRAN_COMPILER = g77 BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS} -LIB_DEPENDS= lapack::math/lapack \ +LIB_DEPENDS= ::math/lapack \ ${MODFORTRAN_LIB_DEPENDS} # XXX Segmentation fault on powerpc when building py-scipy: diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile index b438e65a166..f31f439eb26 100644 --- a/math/qtoctave/Makefile +++ b/math/qtoctave/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/24 21:25:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/07 20:33:59 espie Exp $ COMMENT= graphical front-end for octave @@ -19,10 +19,11 @@ MASTER_SITES= https://forja.rediris.es/frs/download.php/352/ MODULES= x11/qt4 RUN_DEPENDS= ::math/octave -LIB_DEPENDS= QtGui,QtXml::x11/qt4 +LIB_DEPENDS= ::x11/qt4 WANTLIB= ICE SM X11 Xext Xi Xinerama Xrender \ c fontconfig freetype glib-2.0 gthread-2.0 iconv intl \ - m png pthread pthread-stubs stdc++ xcb z expat gobject-2.0 + m png pthread pthread-stubs stdc++ xcb z expat gobject-2.0 \ + QtGui QtXml WRKDIST= ${WRKDIR}/project CONFIGURE_STYLE=simple diff --git a/math/wcalc/Makefile b/math/wcalc/Makefile index 943ff1b91ce..71aa0608dac 100644 --- a/math/wcalc/Makefile +++ b/math/wcalc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/19 09:21:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/07 20:33:59 espie Exp $ # Original from: Kyle Wheeler COMMENT = natural-expression command-line calculator @@ -16,8 +16,8 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=w-calc/} -WANTLIB = c m readline termcap -LIB_DEPENDS = gmp.>=7::devel/gmp mpfr.>=0.2::devel/mpfr +WANTLIB = c m readline termcap gmp.>=7 mpfr.>=0.2 +LIB_DEPENDS = ::devel/gmp ::devel/mpfr USE_GMAKE = Yes CONFIGURE_STYLE = gnu