Index: head/math/saga/Makefile =================================================================== --- head/math/saga/Makefile (revision 551287) +++ head/math/saga/Makefile (revision 551288) @@ -1,127 +1,124 @@ # Created by: Rainer Hurling # $FreeBSD$ PORTNAME= saga PORTVERSION= 7.7.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} MAINTAINER= rhurlin@FreeBSD.org COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ swig:devel/swig LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhpdf.so:print/libharu \ libjasper.so:graphics/jasper \ liblas12.so:devel/liblas12 \ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv-core \ libopencv_ml.so:graphics/opencv \ libpdal_base.so:math/pdal \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libtbb.so:devel/tbb \ libtiff.so:graphics/tiff RUN_DEPENDS:= swig:devel/swig USES= autoreconf compiler:c++11-lib dos2unix gnome \ iconv:wchar_t libtool localbase pkgconfig python USE_LDCONFIG= yes USE_WX= 3.0+ CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python --with-system-svm CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig" GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} INSTALLS_ICONS= yes DOS2UNIX_GLOB= *.cpp *.h PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA OPTIONS_DEFAULT= PGSQL VIGRA OPTIONS_DEFAULT_amd64= OPENMP OPTIONS_DEFAULT_i386= OPENMP NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing (only amd64 and i386) VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra INSTALL_TARGET= install-strip .include # make describe needs them here CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} SUB_FILES= pkg-message post-extract: @${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \ ${WRKSRC}/configure.ac \ ${WRKSRC}/src/saga_core/saga_api/Makefile.am \ ${WRKSRC}/src/saga_core/saga_cmd/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gdi/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gui/Makefile.am \ ${WRKSRC}/src/tools/garden/garden_3d_viewer/Makefile.am \ ${WRKSRC}/src/tools/garden/garden_webservices/Makefile.am \ ${WRKSRC}/src/tools/io/io_grid_image/Makefile.am \ ${WRKSRC}/src/tools/io/io_shapes/Makefile.am \ ${WRKSRC}/src/tools/io/io_virtual/Makefile.am \ ${WRKSRC}/src/tools/io/io_webservices/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_tools/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/tools/statistics/statistics_kriging/Makefile.am \ ${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 post-patch: .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ ${WRKSRC}/src/saga_core/saga_api/api_core.h .endif @${REINPLACE_CMD} -e 's|PORTVERSION|${PORTVERSION}|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp post-patch-OPENMP-on: @${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \ - ${WRKSRC}/configure.ac \ - ${WRKSRC}/configure \ ${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile post-configure: @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_core|' \ ${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile post-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} ${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820) (cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) ${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt ${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include Index: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am =================================================================== --- head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am (nonexistent) +++ head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am (revision 551288) @@ -0,0 +1,14 @@ +--- src/tools/imagery/imagery_opencv/Makefile.am.orig 2020-09-28 15:32:31 UTC ++++ src/tools/imagery/imagery_opencv/Makefile.am +@@ -7,9 +7,9 @@ endif + + if HAVE_CV + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD +-CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags` ++CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv --cflags` + AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS) +-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs` ++AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs` + pkglib_LTLIBRARIES = libimagery_opencv.la + libimagery_opencv_la_SOURCES =\ + MLB_Interface.cpp\ Property changes on: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property