Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 May 2014 07:03:23 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r353072 - head/math/saga
Message-ID:  <201405060703.s4673NgC038590@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue May  6 07:03:22 2014
New Revision: 353072
URL: http://svnweb.freebsd.org/changeset/ports/353072
QAT: https://qat.redports.org/buildarchive/r353072/

Log:
  Fix build after r353029
  Change to 'USES=compiler:gcc-c++11-lib' to simplify the makefile
  
  PR:		ports/189389
  Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)

Modified:
  head/math/saga/Makefile

Modified: head/math/saga/Makefile
==============================================================================
--- head/math/saga/Makefile	Tue May  6 06:57:42 2014	(r353071)
+++ head/math/saga/Makefile	Tue May  6 07:03:22 2014	(r353072)
@@ -3,7 +3,7 @@
 
 PORTNAME=	saga
 PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libproj.so:${PORTSDIR}/grap
 		libgdal.so:${PORTSDIR}/graphics/gdal \
 		libjasper.so:${PORTSDIR}/graphics/jasper \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libiodbc.so:${PORTSDIR}/databases/libiodbc \
+		libodbc.so:${PORTSDIR}/databases/unixODBC \
 		liblas.so:${PORTSDIR}/devel/liblas \
 		libopencv_ml.so:${PORTSDIR}/graphics/opencv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
@@ -33,7 +33,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lopencv_co
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 USE_WX=		3.0
-USES=		compiler:features iconv:wchar_t dos2unix libtool
+USES=		compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WX_UNICODE=	yes
 
@@ -64,15 +64,6 @@ VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libv
 
 .include <bsd.port.pre.mk>
 
-# CLANG is not able to handle neither Fortran nor OpenMP
-USE_GCC=	yes
-.if ${COMPILER_FEATURES:Mlibc++}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
-CFLAGS+=	-isystem ${LOCALBASE}/include/c++/v1
-CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-LDFLAGS+=	-L${LOCALBASE}/lib/c++
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' \
 		${WRKSRC}/configure \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405060703.s4673NgC038590>