Attachment #183796 for bug #220182

View | Details | Raw Unified | Return to bug 220182
Collapse All | Expand All





PORTNAME=	saga
PORTVERSION=	4.1.0
PORTREVISION=	1
CATEGORIES=	math
MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
#DISTNAME=	${PORTNAME}_${PORTVERSION}

RUN_DEPENDS:=	${BUILD_DEPENDS}

CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
		--enable-python --with-system-svm
CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
#USE_CXXSTD=	c++11
USE_WX=		3.0
USES=		autoreconf desktop-file-utils libtool localbase compiler:c++11-lib \
		iconv:wchar_t dos2unix pkgconfig python:2
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}



SUB_FILES=	pkg-message

.if ${PORT_OPTIONS:MOPENMP} && ${ARCH} == amd64 && ${COMPILER_TYPE} == clang
BUILD_DEPENDS+=	clang40:devel/llvm40
LIB_DEPENDS+=	libomp.so.0:devel/openmp
CPP=		clang-cpp40
CC=		clang40
CXX=		clang++40
OPENMP_FLAGS+=	-L${LOCALBASE}/lib -lm -lomp
LDFLAGS+=	${OPENMP_FLAGS}
.endif

post-extract:
	@${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \
		${WRKSRC}/configure.ac \

		${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am
	@${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \
		${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile.am
	@${REINPLACE_CMD} -e 's|libsvm/svm.h|svm.h|' \
		${WRKSRC}/configure \
		${WRKSRC}/configure.ac \
		${WRKSRC}/src/tools/imagery/imagery_svm/MLB_Interface.cpp \
		${WRKSRC}/src/tools/imagery/imagery_svm/svm_grids.h

post-patch:
.if ${ARCH} == "powerpc"




--- configure.ac.orig	2016-08-23 13:23:41 UTC
+++ configure.ac
@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU
 AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
 AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
 AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
-AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
+AC_CHECK_HEADER([svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
 PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
 PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
 


Return to bug 220182

Lines 3-8 Link Here

(-)saga/Makefile (-3 / +19 lines)
3		3
4	PORTNAME= saga	4	PORTNAME= saga
5	PORTVERSION= 4.1.0	5	PORTVERSION= 4.1.0
		6	PORTREVISION= 1
6	CATEGORIES= math	7	CATEGORIES= math
7	MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}	8	MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
8	#DISTNAME= ${PORTNAME}_${PORTVERSION}	9	#DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 29-41 Link Here
29	RUN_DEPENDS:= ${BUILD_DEPENDS}	30	RUN_DEPENDS:= ${BUILD_DEPENDS}
30		31
31	CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \	32	CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
32	--enable-python	33	--enable-python --with-system-svm
33	CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0"	34	CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0"
34	GNU_CONFIGURE= yes	35	GNU_CONFIGURE= yes
35	USE_LDCONFIG= yes	36	USE_LDCONFIG= yes
36	USE_CXXSTD= c++11	37	#USE_CXXSTD= c++11
37	USE_WX= 3.0	38	USE_WX= 3.0
38	USES= autoreconf desktop-file-utils libtool localbase compiler:gcc-c++11-lib \	39	USES= autoreconf desktop-file-utils libtool localbase compiler:c++11-lib \
39	iconv:wchar_t dos2unix pkgconfig python:2	40	iconv:wchar_t dos2unix pkgconfig python:2
40	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	41	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
41		42
Lines 64-69 Link Here
64		65
65	SUB_FILES= pkg-message	66	SUB_FILES= pkg-message
66		67
		68	.if ${PORT_OPTIONS:MOPENMP} && ${ARCH} == amd64 && ${COMPILER_TYPE} == clang
		69	BUILD_DEPENDS+= clang40:devel/llvm40
		70	LIB_DEPENDS+= libomp.so.0:devel/openmp
		71	CPP= clang-cpp40
		72	CC= clang40
		73	CXX= clang++40
		74	OPENMP_FLAGS+= -L${LOCALBASE}/lib -lm -lomp
		75	LDFLAGS+= ${OPENMP_FLAGS}
		76	.endif
		77
67	post-extract:	78	post-extract:
68	@${REINPLACE_CMD} -e 's\|wx-config \|${WX_CONFIG} \|g' \	79	@${REINPLACE_CMD} -e 's\|wx-config \|${WX_CONFIG} \|g' \
69	${WRKSRC}/configure.ac \	80	${WRKSRC}/configure.ac \
Lines 82-87 Link Here
82	${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am	93	${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am
83	@${REINPLACE_CMD} -e 's\|/usr/include/opencv\|${LOCALBASE}/include/opencv ${LOCALBASE}/include\|g' \	94	@${REINPLACE_CMD} -e 's\|/usr/include/opencv\|${LOCALBASE}/include/opencv ${LOCALBASE}/include\|g' \
84	${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile.am	95	${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile.am
		96	@${REINPLACE_CMD} -e 's\|libsvm/svm.h\|svm.h\|' \
		97	${WRKSRC}/configure \
		98	${WRKSRC}/configure.ac \
		99	${WRKSRC}/src/tools/imagery/imagery_svm/MLB_Interface.cpp \
		100	${WRKSRC}/src/tools/imagery/imagery_svm/svm_grids.h
85		101
86	post-patch:	102	post-patch:
87	.if ${ARCH} == "powerpc"	103	.if ${ARCH} == "powerpc"

Lines 1-12 Link Here

(-)saga/files/patch-configure.ac (-12 lines)
1	--- configure.ac.orig 2016-08-23 13:23:41 UTC
2	+++ configure.ac
3	@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU
4	AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
5	AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
6	AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
7	-AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
8	+AC_CHECK_HEADER([svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
9	PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
10	PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
11
12