svn commit: r349184 - in head/math/saga: . files

Baptiste Daroussin bapt at FreeBSD.org
Wed Mar 26 07:19:20 UTC 2014 

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/
> 
> Log:
>   - Update to 2.1.1
>   - While I'm here:
>     - Convert to new options helper
>     - Remove deprecated PTHREAD_*
>     - No need to print PKGMESSAGE manually
>   
>   Changes:	http://sourceforge.net/apps/trac/saga-gis/attachment/wiki/Changelog%202.1.1/changelog_saga_2.1.1.txt
>   PR:		ports/187795
>   Submitted by:	Rainer Hurling <rhurlin at gwdg.de> (maintainer)
>   Tested by:	redports
> 
> 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
> 
> Modified: head/math/saga/Makefile
> ==============================================================================
> --- 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$
>  
>  PORTNAME=	saga
> -PORTVERSION=	2.1.0
> -PORTREVISION=	3
> +PORTVERSION=	2.1.1
>  CATEGORIES=	math
>  MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
> -DISTNAME=	${PORTNAME}_${PORTVERSION}_src
> +DISTNAME=	${PORTNAME}_${PORTVERSION}
>  
>  MAINTAINER=	rhurlin at gwdg.de
>  COMMENT=	System for Automated Geoscientific Analyses
>  
>  LICENSE=	GPLv2
>  
> +BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
>  LIB_DEPENDS=	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:=	${BUILD_DEPENDS}
>  
> -USES=		dos2unix zip compiler:features
> -DOS2UNIX_GLOB=	dlg_about.cpp
> +CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
> +		--enable-python
> +CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig2.0"
> +CFLAGS+=	-I${LOCALBASE}/include
> +GNU_CONFIGURE=	yes
> +LDFLAGS+=	-L${LOCALBASE}/lib -lopencv_core
> +# Python no option any more, because it can't be turned off completely
> +USE_PYTHON=	2
> +USE_LDCONFIG=	yes
>  USE_WX=		3.0
> +USES=		compiler:features iconv:wchar_t dos2unix
> +WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>  WX_UNICODE=	yes
> -USE_LDCONFIG=	yes
> -GNU_CONFIGURE=	yes
> -USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtoolize
> -AUTOMAKE_ARGS=	--add-missing
>  
>  DESKTOP_ENTRIES=	"SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \
>  			"saga_gui" "Science;Geoscience;Math;" true
> +DOS2UNIX_GLOB=	*.cpp *.h
>  
> -OPTIONS_DEFINE=	PYTHON OPENMP HARU VIGRA
> -OPTIONS_DEFAULT=	OPENMP HARU VIGRA
> -NO_OPTIONS_SORT=	yes
> +OPTIONS_DEFINE=	PGSQL OPENMP HARU VIGRA
> +OPTIONS_DEFAULT=PGSQL OPENMP HARU VIGRA
> +NO_OPTIONS_SORT=yes
> +OPTIONS_SUB=	yes
>  OPENMP_DESC=	Enable Multiprocessing
>  HARU_DESC=	Enable Haru Free PDF Library
>  VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
>  
> -.include <bsd.port.options.mk>
> -
> -LDFLAGS+=	-L${LOCALBASE}/lib -lopencv_core
> -CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
> -
> -.if ${PORT_OPTIONS:MPYTHON}
> -CONFIGURE_ARGS+=	--enable-python
> -BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20
> -RUN_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20
> -CONFIGURE_ENV+=	SWIG="${LOCALBASE}/bin/swig2.0"
> -USE_PYTHON=	2
> -PLIST_SUB+=	SAGA_PYTHON=""
> -.else
> -CONFIGURE_ARGS+=	--disable-python
> -PLIST_SUB+=	SAGA_PYTHON="@comment "
> -.endif
> -
> -.if ${PORT_OPTIONS:MOPENMP}
> -LDFLAGS+=		${PTHREAD_LIBS}
> -CONFIGURE_ARGS+=	--enable-openmp
> -.else
> -CONFIGURE_ARGS+=	--disable-openmp
> -.endif
> -
> -.if ${PORT_OPTIONS:MHARU}
> -BUILD_DEPENDS+=	${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu
> -RUN_DEPENDS+=	${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu
> -PLIST_SUB+=	HARU=""
> -.else
> -CFLAGS+=	-D_SAGA_DONOTUSE_HARU
> -PLIST_SUB+=	HARU="@comment "
> -.endif
> -
> -.if ${PORT_OPTIONS:MVIGRA}
> -BUILD_DEPENDS+=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
> -RUN_DEPENDS+=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
> -PLIST_SUB+=	VIGRA=""
> -.else
> -PLIST_SUB+=	VIGRA="@comment "
> -.endif
> +HARU_BUILD_DEPENDS=	${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu
> +# Haru docs are build nevertheless -> failure :-(
> +HARU_CFLAGS_OFF=	-D_SAGA_DONOTUSE_HARU
> +HARU_RUN_DEPENDS=	${LOCALBASE}/lib/libhpdf.so:${PORTSDIR}/print/libharu
> +OPENMP_CONFIGURE_ENABLE=openmp
> +OPENMP_LDFLAGS=		-pthread
> +PGSQL_CONFIGURE_OFF=	--with-postgresql=no
> +PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config
> +PGSQL_LIB_DEPENDS=	libpq.so:${PORTSDIR}/databases/postgresql93-client
> +VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
> +VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
>  
>  .include <bsd.port.pre.mk>
>  
> -# Late define USE_GCC (openmp support)
> -# and make g++ use libc++ is possible
> -USE_GCC=	any
> -
> +# CLANG is not able to handle neither Fortran nor OpenMP
> +USE_GCC=	4.8+

USE_GCC=yes or USE_GCC=any should be enough here? I bet USE_GCC=yes is better
for such program that USE_GCC=any.

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140326/92ee0472/attachment.sig>

More information about the svn-ports-all mailing list