diff options
author | bapt <bapt@FreeBSD.org> | 2014-03-24 22:06:56 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2014-03-24 22:06:56 +0800 |
commit | ca6039ef6fd0c6480385798e9cf27bdb04aeed44 (patch) | |
tree | 1b8a217eda9b521dc2bdf65cb8e2da8de02a4e91 /math | |
parent | be48bf7c7efb2af21ad3d242a1d80106d40fee6f (diff) | |
download | freebsd-ports-gnome-ca6039ef6fd0c6480385798e9cf27bdb04aeed44.tar.gz freebsd-ports-gnome-ca6039ef6fd0c6480385798e9cf27bdb04aeed44.tar.zst freebsd-ports-gnome-ca6039ef6fd0c6480385798e9cf27bdb04aeed44.zip |
Switch to wx 3.0
Use gcc with libc++ on libc++ version of freebsd (this fixes build on FreeBSD 10 and 11)
Support stage
Couple of modernisations
Diffstat (limited to 'math')
-rw-r--r-- | math/saga/Makefile | 36 | ||||
-rw-r--r-- | math/saga/pkg-plist | 2 |
2 files changed, 22 insertions, 16 deletions
diff --git a/math/saga/Makefile b/math/saga/Makefile index 820b37922955..6be31947b2a5 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -21,21 +21,15 @@ LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \ liblas.so:${PORTSDIR}/devel/liblas \ libopencv_core.so:${PORTSDIR}/graphics/opencv-core -USES= zip -USE_WX= 2.9 +USES= dos2unix zip compiler:features +DOS2UNIX_GLOB= dlg_about.cpp +USE_WX= 3.0 WX_UNICODE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf autoheader automake aclocal libtoolize AUTOMAKE_ARGS= --add-missing -# CLANG is not able to handle neither Fortran nor OpenMP -USE_GCC= any -CFLAGS+= -I${LOCALBASE}/include -USE_DOS2UNIX= dlg_about.cpp - -MAN1= saga_cmd.1 saga_gui.1 - DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \ "saga_gui" "Science;Geoscience;Math;" true @@ -46,7 +40,6 @@ OPENMP_DESC= Enable Multiprocessing HARU_DESC= Enable Haru Free PDF Library VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library -NO_STAGE= yes .include <bsd.port.options.mk> LDFLAGS+= -L${LOCALBASE}/lib -lopencv_core @@ -90,6 +83,18 @@ PLIST_SUB+= VIGRA="@comment " .include <bsd.port.pre.mk> +# Late define USE_GCC (openmp support) +# and make g++ use libc++ is possible +USE_GCC= any + +.if ${COMPILER_FEATURES:Mlibc++} +LDFLAGS+= -L${LOCALBASE}/lib/c++ +CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 +BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++ +.else + +.endif + post-extract: @${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' \ ${WRKSRC}/configure.in \ @@ -119,12 +124,11 @@ post-patch: .endif post-install: - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} # library helper files are not needed and cripple some math/qgis extensions - @${RM} ${PREFIX}/lib/saga/*.la - @${RM} ${PREFIX}/lib/saga/*.a - @${CAT} ${PKGMESSAGE} + @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la + @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.a .include <bsd.port.post.mk> diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist index 60424c8331a4..d0977eebdd5a 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -82,6 +82,8 @@ lib/saga/libtable_tools.so lib/saga/libtin_tools.so lib/saga/libtin_viewer.so lib/saga/libtransect.so +man/man1/saga_cmd.1.gz +man/man1/saga_gui.1.gz %%VIGRA%%lib/saga/libvigra.so %%DATADIR%%/saga.png %%DATADIR%%/saga_tip.txt |