Date: Wed, 26 Mar 2014 08:19:13 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r349184 - in head/math/saga: . files Message-ID: <20140326071913.GE4402@ithaqua.etoilebsd.net> In-Reply-To: <201403251941.s2PJfUJ1059741@svn.freebsd.org> References: <201403251941.s2PJfUJ1059741@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--so9zsI5B81VjUb/o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 25, 2014 at 07:41:30PM +0000, Sunpoet Po-Chuan Hsieh wrote: > Author: sunpoet > Date: Tue Mar 25 19:41:30 2014 > New Revision: 349184 > URL: http://svnweb.freebsd.org/changeset/ports/349184 > QAT: https://qat.redports.org/buildarchive/r349184/ >=20 > Log: > - Update to 2.1.1 > - While I'm here: > - Convert to new options helper > - Remove deprecated PTHREAD_* > - No need to print PKGMESSAGE manually > =20 > Changes: http://sourceforge.net/apps/trac/saga-gis/attachment/wiki/Chan= gelog%202.1.1/changelog_saga_2.1.1.txt > PR: ports/187795 > Submitted by: Rainer Hurling <rhurlin@gwdg.de> (maintainer) > Tested by: redports >=20 > Added: > head/math/saga/files/patch-src__modules_images__modules_opencv__opencv_= _opencv_nnet.cpp (contents, props changed) > head/math/saga/files/patch-src__modules_images__modules_opencv__opencv_= _opencv_nnet.h (contents, props changed) > Deleted: > head/math/saga/files/patch-src-modules_images-modules_vigra-vigra-vigra= _fft.cpp > Modified: > head/math/saga/Makefile > head/math/saga/distinfo > head/math/saga/files/patch-src__modules_images__modules_opencv__opencv_= _opencv.h > head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp > head/math/saga/pkg-plist >=20 > Modified: head/math/saga/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/math/saga/Makefile Tue Mar 25 19:34:38 2014 (r349183) > +++ head/math/saga/Makefile Tue Mar 25 19:41:30 2014 (r349184) > @@ -2,121 +2,97 @@ > # $FreeBSD$ > =20 > PORTNAME=3D saga > -PORTVERSION=3D 2.1.0 > -PORTREVISION=3D 3 > +PORTVERSION=3D 2.1.1 > CATEGORIES=3D math > MASTER_SITES=3D SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//= }/SAGA%20${PORTVERSION} > -DISTNAME=3D ${PORTNAME}_${PORTVERSION}_src > +DISTNAME=3D ${PORTNAME}_${PORTVERSION} > =20 > MAINTAINER=3D rhurlin@gwdg.de > COMMENT=3D System for Automated Geoscientific Analyses > =20 > LICENSE=3D GPLv2 > =20 > +BUILD_DEPENDS=3D swig2.0:${PORTSDIR}/devel/swig20 > LIB_DEPENDS=3D libproj.so:${PORTSDIR}/graphics/proj \ > libgdal.so:${PORTSDIR}/graphics/gdal \ > libjasper.so:${PORTSDIR}/graphics/jasper \ > libtiff.so:${PORTSDIR}/graphics/tiff \ > libiodbc.so:${PORTSDIR}/databases/libiodbc \ > liblas.so:${PORTSDIR}/devel/liblas \ > - libopencv_core.so:${PORTSDIR}/graphics/opencv-core > + libopencv_ml.so:${PORTSDIR}/graphics/opencv > +RUN_DEPENDS:=3D ${BUILD_DEPENDS} > =20 > -USES=3D dos2unix zip compiler:features > -DOS2UNIX_GLOB=3D dlg_about.cpp > +CONFIGURE_ARGS=3D CFLAGS=3D"${CFLAGS}" LDFLAGS=3D"${LDFLAGS}" \ > + --enable-python > +CONFIGURE_ENV=3D SWIG=3D"${LOCALBASE}/bin/swig2.0" > +CFLAGS+=3D -I${LOCALBASE}/include > +GNU_CONFIGURE=3D yes > +LDFLAGS+=3D -L${LOCALBASE}/lib -lopencv_core > +# Python no option any more, because it can't be turned off completely > +USE_PYTHON=3D 2 > +USE_LDCONFIG=3D yes > USE_WX=3D 3.0 > +USES=3D compiler:features iconv:wchar_t dos2unix > +WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION} > WX_UNICODE=3D yes > -USE_LDCONFIG=3D yes > -GNU_CONFIGURE=3D yes > -USE_AUTOTOOLS=3D autoconf autoheader automake aclocal libtoolize > -AUTOMAKE_ARGS=3D --add-missing > =20 > DESKTOP_ENTRIES=3D "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \ > "saga_gui" "Science;Geoscience;Math;" true > +DOS2UNIX_GLOB=3D *.cpp *.h > =20 > -OPTIONS_DEFINE=3D PYTHON OPENMP HARU VIGRA > -OPTIONS_DEFAULT=3D OPENMP HARU VIGRA > -NO_OPTIONS_SORT=3D yes > +OPTIONS_DEFINE=3D PGSQL OPENMP HARU VIGRA > +OPTIONS_DEFAULT=3DPGSQL OPENMP HARU VIGRA > +NO_OPTIONS_SORT=3Dyes > +OPTIONS_SUB=3D yes > OPENMP_DESC=3D Enable Multiprocessing > HARU_DESC=3D Enable Haru Free PDF Library > VIGRA_DESC=3D Enable 'Vision with Generic Algorithms' Library > =20 > -.include <bsd.port.options.mk> > - > -LDFLAGS+=3D -L${LOCALBASE}/lib -lopencv_core > -CONFIGURE_ARGS+=3D CFLAGS=3D"${CFLAGS}" LDFLAGS=3D"${LDFLAGS}" > - > -.if ${PORT_OPTIONS:MPYTHON} > -CONFIGURE_ARGS+=3D --enable-python > -BUILD_DEPENDS+=3D swig2.0:${PORTSDIR}/devel/swig20 > -RUN_DEPENDS+=3D swig2.0:${PORTSDIR}/devel/swig20 > -CONFIGURE_ENV+=3D SWIG=3D"${LOCALBASE}/bin/swig2.0" > -USE_PYTHON=3D 2 > -PLIST_SUB+=3D SAGA_PYTHON=3D"" > -.else > -CONFIGURE_ARGS+=3D --disable-python > -PLIST_SUB+=3D SAGA_PYTHON=3D"@comment " > -.endif > - > -.if ${PORT_OPTIONS:MOPENMP} > -LDFLAGS+=3D ${PTHREAD_LIBS} > -CONFIGURE_ARGS+=3D --enable-openmp > -.else > -CONFIGURE_ARGS+=3D --disable-openmp > -.endif > - > -.if ${PORT_OPTIONS:MHARU} > -BUILD_DEPENDS+=3D ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu > -RUN_DEPENDS+=3D ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu > -PLIST_SUB+=3D HARU=3D"" > -.else > -CFLAGS+=3D -D_SAGA_DONOTUSE_HARU > -PLIST_SUB+=3D HARU=3D"@comment " > -.endif > - > -.if ${PORT_OPTIONS:MVIGRA} > -BUILD_DEPENDS+=3D ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics= /vigra > -RUN_DEPENDS+=3D ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/v= igra > -PLIST_SUB+=3D VIGRA=3D"" > -.else > -PLIST_SUB+=3D VIGRA=3D"@comment " > -.endif > +HARU_BUILD_DEPENDS=3D ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libh= aru > +# Haru docs are build nevertheless -> failure :-( > +HARU_CFLAGS_OFF=3D -D_SAGA_DONOTUSE_HARU > +HARU_RUN_DEPENDS=3D ${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu > +OPENMP_CONFIGURE_ENABLE=3Dopenmp > +OPENMP_LDFLAGS=3D -pthread > +PGSQL_CONFIGURE_OFF=3D --with-postgresql=3Dno > +PGSQL_CONFIGURE_ON=3D --with-postgresql=3D${LOCALBASE}/bin/pg_config > +PGSQL_LIB_DEPENDS=3D libpq.so:${PORTSDIR}/databases/postgresql93-client > +VIGRA_BUILD_DEPENDS=3D ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/gra= phics/vigra > +VIGRA_RUN_DEPENDS=3D ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graph= ics/vigra > =20 > .include <bsd.port.pre.mk> > =20 > -# Late define USE_GCC (openmp support) > -# and make g++ use libc++ is possible > -USE_GCC=3D any > - > +# CLANG is not able to handle neither Fortran nor OpenMP > +USE_GCC=3D 4.8+ USE_GCC=3Dyes or USE_GCC=3Dany should be enough here? I bet USE_GCC=3Dyes i= s better for such program that USE_GCC=3Dany. regards, Bapt --so9zsI5B81VjUb/o Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlMyf3EACgkQ8kTtMUmk6ExaGwCfZIqwnUbzCCMBIov4IsYfD/rS CvAAoIn2ZajFUrvBg+/LCI4VHIhJr/9M =6BGX -----END PGP SIGNATURE----- --so9zsI5B81VjUb/o--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140326071913.GE4402>