Page MenuHomeFreeBSD
Files F109055485

D26645.diff
No OneTemporary
Actions

D26645.diff
View Options

Index: head/math/saga/Makefile
===================================================================
--- head/math/saga/Makefile
+++ head/math/saga/Makefile
@@ -3,6 +3,7 @@
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}
@@ -89,8 +90,6 @@
${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"
@@ -102,8 +101,6 @@
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:
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
+++ head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am
@@ -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\

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 1, 5:29 AM (21 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16376353
Default Alt Text
D26645.diff (2 KB)

Event Timeline