svn commit: r512079 - in head: biology/jellyfish biology/jellyfish/files devel/jsoncpp devel/llvm60 devel/llvm70 devel/llvm80 devel/llvm90 devel/qtcreator devel/sdl2pp dns/powerdns-recursor finance...
Jan Beich
jbeich at FreeBSD.org
Sat Sep 14 22:01:23 UTC 2019
Author: jbeich
Date: Sat Sep 14 22:01:13 2019
New Revision: 512079
URL: https://svnweb.freebsd.org/changeset/ports/512079
Log:
Drop C++11 workaround for GCC < 6 after r449590
lang/gcc5 will expire in ~1 month. If someone still uses lang/gcc48
they should backport C++11 fix instead. QA on GCC architecuters is
currently limited to powerpc64 which uses GCC_DEFAULT.
PR: 193528
Deleted:
head/biology/jellyfish/files/patch-include_jellyfish_file__header.hpp
head/finance/moneymanagerex/files/patch-src_webapp.cpp
head/net/ulxmlrpcpp/files/patch-ulxmlrpcpp-ulxmlrpcpp.h
head/x11/slim/files/patch-Ck.cpp
Modified:
head/biology/jellyfish/Makefile (contents, props changed)
head/devel/jsoncpp/Makefile (contents, props changed)
head/devel/llvm60/Makefile (contents, props changed)
head/devel/llvm70/Makefile (contents, props changed)
head/devel/llvm80/Makefile (contents, props changed)
head/devel/llvm90/Makefile (contents, props changed)
head/devel/qtcreator/Makefile (contents, props changed)
head/devel/sdl2pp/Makefile (contents, props changed)
head/dns/powerdns-recursor/Makefile (contents, props changed)
head/finance/moneymanagerex/Makefile (contents, props changed)
head/finance/moneymanagerex/files/patch-src_import__export_univcsvdialog.cpp (contents, props changed)
head/games/pioneer/Makefile (contents, props changed)
head/games/rlvm/Makefile (contents, props changed)
head/games/stonesoup/Makefile (contents, props changed)
head/graphics/aseprite/Makefile (contents, props changed)
head/graphics/colmap/Makefile (contents, props changed)
head/graphics/hiptext/Makefile (contents, props changed)
head/graphics/libboard/Makefile (contents, props changed)
head/graphics/mapnik/Makefile (contents, props changed)
head/graphics/podofo/Makefile (contents, props changed)
head/graphics/sekrit-twc-zimg/Makefile (contents, props changed)
head/graphics/vapoursynth-waifu2x-w2xc/Makefile (contents, props changed)
head/graphics/waifu2x-converter-cpp/Makefile (contents, props changed)
head/math/GiNaC/Makefile (contents, props changed)
head/math/gringo/Makefile (contents, props changed)
head/math/pdal/Makefile (contents, props changed)
head/math/yacas/Makefile (contents, props changed)
head/multimedia/aegisub/Makefile (contents, props changed)
head/multimedia/ffms2/Makefile (contents, props changed)
head/multimedia/mpc-qt/Makefile (contents, props changed)
head/multimedia/obs-studio/Makefile (contents, props changed)
head/multimedia/vapoursynth/Makefile (contents, props changed)
head/net-p2p/eiskaltdcpp-daemon/Makefile (contents, props changed)
head/net/nethogs/Makefile (contents, props changed)
head/net/ulxmlrpcpp/Makefile (contents, props changed)
head/net/yami4/Makefile (contents, props changed)
head/ports-mgmt/portrac/Makefile (contents, props changed)
head/www/node/Makefile (contents, props changed)
head/www/node10/Makefile (contents, props changed)
head/www/node6/Makefile (contents, props changed)
head/www/node8/Makefile (contents, props changed)
head/x11-fm/wcmcommander/Makefile (contents, props changed)
head/x11/slim/Makefile (contents, props changed)
Modified: head/biology/jellyfish/Makefile
==============================================================================
--- head/biology/jellyfish/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/biology/jellyfish/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -3,7 +3,7 @@
PORTNAME= Jellyfish
DISTVERSIONPREFIX= v
DISTVERSION= 2.2.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= biology
MAINTAINER= jwb at FreeBSD.org
Modified: head/devel/jsoncpp/Makefile
==============================================================================
--- head/devel/jsoncpp/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/devel/jsoncpp/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -21,21 +21,6 @@ USE_LDCONFIG= yes
PLATFORM= linux-gcc-FreeBSD
MAKE_ARGS= platform=${PLATFORM}
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 33 || \
- ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} >= 48
-# Certain new compiler features unlock parts of jsoncpp API (ex. see JSON_HAS_RVALUE_REFERENCES).
-# Use c++11 above to be the most inclusive.
-USES+= compiler:c++11-lang
-# lang/gcc5 fix
-.if ${COMPILER_TYPE} == clang
-CXXFLAGS+= --std=c++11
-.else
-CXXFLAGS+= --std=gnu++11 -D_GLIBCXX_USE_C99=1
-.endif
-.endif
-
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
@@ -56,4 +41,4 @@ do-test:
@${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628"
@cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/devel/llvm60/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -252,10 +252,6 @@ _COMPILER_RT_LIBS+= \
libclang_rt.ubsan_standalone_cxx-i386.a
.endif
-.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
# PR: 235282
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
Modified: head/devel/llvm70/Makefile
==============================================================================
--- head/devel/llvm70/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/devel/llvm70/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -272,10 +272,6 @@ _COMPILER_RT_LIBS+= \
libclang_rt.ubsan_standalone_cxx-i386.a
.endif
-.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
.if ${ARCH} == "armv6"
BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
Modified: head/devel/llvm80/Makefile
==============================================================================
--- head/devel/llvm80/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/devel/llvm80/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -357,10 +357,6 @@ _COMPILER_RT_LIBS+= \
libclang_rt.ubsan_standalone_cxx-i386.a
.endif
-.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
# PR: 235282
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
Modified: head/devel/llvm90/Makefile
==============================================================================
--- head/devel/llvm90/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/devel/llvm90/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -392,10 +392,6 @@ _COMPILER_RT_LIBS+= \
libclang_rt.ubsan_standalone_cxx-i386.a
.endif
-.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
# PR: 235282
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
Modified: head/devel/qtcreator/Makefile
==============================================================================
--- head/devel/qtcreator/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/devel/qtcreator/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -37,10 +37,6 @@ QMAKE_ARGS+= QBS_INSTALL_DIR=${PREFIX} CONFIG+=qbs_ena
# Enforce installation to ${PREFIX}.
QMAKE_ARGS+= QTC_PREFIX=${PREFIX} LLVM_INSTALL_DIR=${PREFIX}/llvm${LLVM_DEFAULT}
-# Required for building the port with GCC: the define below is required for
-# std::to_string() to exist. More details in ports/193528.
-QMAKE_ARGS+= DEFINES+=_GLIBCXX_USE_C99
-
DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \
"${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true
Modified: head/devel/sdl2pp/Makefile
==============================================================================
--- head/devel/sdl2pp/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/devel/sdl2pp/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -28,12 +28,6 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_ALL_TARGET= all doxygen
DOXYGEN_IMPLIES= DOCS
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
-.endif
-
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
@@ -41,4 +35,4 @@ post-install-DOCS-on:
post-install-DOXYGEN-on:
cd ${CONFIGURE_WRKSRC} && ${COPYTREE_SHARE} doxygen ${STAGEDIR}${DOCSDIR}/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/dns/powerdns-recursor/Makefile
==============================================================================
--- head/dns/powerdns-recursor/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/dns/powerdns-recursor/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -32,8 +32,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/pdns \
--with-protobuf \
--without-net-snmp
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-
SUB_FILES= pkg-message
OPTIONS_DEFINE= LUAJIT SETUID
Modified: head/finance/moneymanagerex/Makefile
==============================================================================
--- head/finance/moneymanagerex/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/finance/moneymanagerex/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -47,13 +47,6 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == "gcc"
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-BUILD_DEPENDS+= ${LOCALBASE}/include/boost/lexical_cast.hpp:devel/boost-libs
-.endif
-
post-extract:
@${MV} ${WRKDIR}/bakefile-0.2.9/autoconf/*.m4 ${WRKSRC}/m4
@@ -71,4 +64,4 @@ post-patch:
@${REINPLACE_CMD} -e \
's| -g0 -O2||' ${WRKSRC}/m4/wxpresets.m4
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/finance/moneymanagerex/files/patch-src_import__export_univcsvdialog.cpp
==============================================================================
--- head/finance/moneymanagerex/files/patch-src_import__export_univcsvdialog.cpp Sat Sep 14 21:30:54 2019 (r512078)
+++ head/finance/moneymanagerex/files/patch-src_import__export_univcsvdialog.cpp Sat Sep 14 22:01:13 2019 (r512079)
@@ -1,37 +1,5 @@
--- src/import_export/univcsvdialog.cpp.orig 2016-03-05 06:10:45 UTC
+++ src/import_export/univcsvdialog.cpp
-@@ -37,6 +37,13 @@
-
- #include "csv_parser/csv_parser.hpp"
-
-+#ifdef _LIBCPP_VERSION
-+#define TO_WSTRING(x) std::to_wstring(x)
-+#else
-+#include <boost/lexical_cast.hpp>
-+#define TO_WSTRING(x) boost::lexical_cast<std::wstring>(x)
-+#endif
-+
- wxIMPLEMENT_DYNAMIC_CLASS(mmUnivCSVDialog, wxDialog);
-
- wxBEGIN_EVENT_TABLE(mmUnivCSVDialog, wxDialog)
-@@ -409,7 +416,7 @@ void mmUnivCSVDialog::SetSettings(const
- csvFieldOrder_.clear();
- for (int i = 0; i < 99; i++)
- {
-- const std::wstring w = to_wstring(i);
-+ const std::wstring w = TO_WSTRING(i);
- const wxString& value = wxString(json::String(o[w]));
- if (!value.empty())
- {
-@@ -536,7 +543,7 @@ void mmUnivCSVDialog::OnSave(wxCommandEv
- int count = 0;
- for (std::vector<int>::const_iterator it = csvFieldOrder_.begin(); it != csvFieldOrder_.end(); ++it)
- {
-- const auto w = to_wstring(count++);
-+ const auto w = TO_WSTRING(count++);
- int i = *it;
- o[w] = json::String(CSVFieldName_[i].ToStdWstring());
- wxLogDebug("%i - %i - %s", count-1, i, CSVFieldName_[i]);
@@ -669,7 +676,7 @@ void mmUnivCSVDialog::OnImport(wxCommand
payeeID_ = -1;
categID_ = -1;
Modified: head/games/pioneer/Makefile
==============================================================================
--- head/games/pioneer/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/games/pioneer/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -84,13 +84,6 @@ EXTRA_WARNINGS_CONFIGURE_WITH= extra-warnings
MODELCOMPILER_PLIST_FILES= bin/${PORTNAME}-modelcompiler
PROFILER_CONFIGURE_ON= --enable-profiler
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# Unhide std::to_string() for GCC (ports/193528)
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch: .SILENT
${REINPLACE_CMD} -e '/^OPTIMISE=/d ; s|lua5\.2|lua-5.2|' \
${WRKSRC}/configure.ac
@@ -128,4 +121,4 @@ post-install-MODELCOMPILER-on:
${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \
${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/rlvm/Makefile
==============================================================================
--- head/games/rlvm/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/games/rlvm/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -34,7 +34,6 @@ USE_SDL= image mixer ttf
EXCLUDE= GLEW SDL_image SDL_mixer SDL_ttf gmock gtest guichan \
luabind utf8cpp # leaving only pygame, xclannad, *.cpp
EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude vendor/,}
-CFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps)
MAKE_ARGS= VERBOSE=1
INSTALLS_ICONS= yes
Modified: head/games/stonesoup/Makefile
==============================================================================
--- head/games/stonesoup/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/games/stonesoup/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -80,12 +80,6 @@ SOUND_MAKE_ARGS= SOUND=y
SOUND_RUN_DEPENDS= sox:audio/sox
LUA_MAKE_ARGS_OFF= NO_LUA_BINDINGS=yes
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} != clang
-CFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch-SOUND-on:
@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/sound.h
@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/sound.h
@@ -110,4 +104,4 @@ post-install-EXAMPLES-on:
post-install:
@${RM} -r ${STAGEDIR}${DATADIR}/settings/mac
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/aseprite/Makefile
==============================================================================
--- head/graphics/aseprite/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/aseprite/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -65,8 +65,6 @@ CMAKE_ON= USE_SHARED_ALLEGRO4 \
USE_SHARED_ZLIB
CMAKE_ARGS= -DFREEBSD_LIB_PATH=${LOCALBASE}/lib
-CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
-
OPTIONS_DEFINE= STEAM WEBP
OPTIONS_DEFAULT= WEBP
Modified: head/graphics/colmap/Makefile
==============================================================================
--- head/graphics/colmap/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/colmap/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -34,8 +34,6 @@ USE_QT= qmake_build buildtools_build core gui opengl_
EXCLUDE= SQLite
EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude lib/,}
CMAKE_OFF= BOOST_STATIC CUDA_ENABLED
-CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
- -D_DECLARE_C99_LDBL_MATH # XXX ports/193528
LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu
TEST_TARGET= test ARGS="-V"
Modified: head/graphics/hiptext/Makefile
==============================================================================
--- head/graphics/hiptext/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/hiptext/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -25,7 +25,6 @@ GH_ACCOUNT= jart
GH_TAGNAME= f89b44f
USES= compiler:c++11-lib gmake jpeg localbase
-CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
CPPFLAGS+= -I${LOCALBASE}/include/freetype2
MAKE_ENV= GTEST_DIR="${LOCALBASE}" \
TARGET_ARCH=""
Modified: head/graphics/libboard/Makefile
==============================================================================
--- head/graphics/libboard/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/libboard/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -19,7 +19,6 @@ USE_GITHUB= yes
GH_ACCOUNT= c-koi
GH_TAGNAME= 5b38274
-CXXFLAGS+= -D_GLIBCXX_USE_C99 -fPIC # XXX ports/193528
USE_CXXSTD= c++11
CMAKE_ARGS= -DMYPROJ_RAN_ONCE:BOOL=YES \
-DEXECUTABLE_OUTPUT_PATH:PATH="${STAGEDIR}${EXAMPLESDIR}"
Modified: head/graphics/mapnik/Makefile
==============================================================================
--- head/graphics/mapnik/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/mapnik/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -80,12 +80,6 @@ CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo
CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo@${PY_FLAVOR}
CAIRO_MAKE_ARGS_OFF= CAIRO=False
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
-.endif
-
pre-configure-SQLITE3-on:
@if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \
${ECHO_MSG} "" ; \
@@ -112,4 +106,4 @@ post-install-DOCS-on:
@cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS.md CHANGELOG.md README.md docs" \
${STAGEDIR}${DOCSDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/podofo/Makefile
==============================================================================
--- head/graphics/podofo/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/podofo/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -41,14 +41,8 @@ PNG_LIB_DEPENDS= libpng.so:graphics/png
TIFF_CMAKE_BOOL= WANT_TIFF
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} >= 50
-CXXFLAGS+= -std=gnu++11 -D_GLIBCXX_USE_C99=1
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|$${LIBDIRNAME}/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/src/CMakeLists.txt
@${REINPLACE_CMD} -e '/^Libs: / s|- at PODOFO_VERSION_MAJOR@||' ${WRKSRC}/src/libpodofo.pc.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/sekrit-twc-zimg/Makefile
==============================================================================
--- head/graphics/sekrit-twc-zimg/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/sekrit-twc-zimg/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -20,8 +20,6 @@ CONFLICTS_INSTALL= zimg-[0-9]* # include/zimg.h
USES= autoreconf compiler:c++11-lib gmake libtool pathfix
EXTRACT_AFTER_ARGS= --exclude test/extra
GNU_CONFIGURE= yes
-CPPFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
- -D_DECLARE_C99_LDBL_MATH # XXX ports/193528
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
PORTEXAMPLES= *
Modified: head/graphics/vapoursynth-waifu2x-w2xc/Makefile
==============================================================================
--- head/graphics/vapoursynth-waifu2x-w2xc/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/vapoursynth-waifu2x-w2xc/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -21,8 +21,6 @@ GH_PROJECT= VapourSynth-Waifu2x-w2xc
USES= compiler:c++11-lib gmake localbase pkgconfig
HAS_CONFIGURE= yes
-CPPFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
- -D_DECLARE_C99_LDBL_MATH # XXX ports/193528
CONFIGURE_ARGS= --install="${STAGEDIR}${DATADIR}" \
--cxx="${CXX}" \
--extra-cxxflags="${CPPFLAGS} ${CXXFLAGS}" \
Modified: head/graphics/waifu2x-converter-cpp/Makefile
==============================================================================
--- head/graphics/waifu2x-converter-cpp/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/graphics/waifu2x-converter-cpp/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -26,8 +26,6 @@ DOS2UNIX_GLOB= *.cpp *.hpp
CMAKE_ARGS= -DOPENCV_PREFIX:PATH="${LOCALBASE}" \
-DOpenCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libOpenCL.so"
CMAKE_ON= INSTALL_MODELS
-CFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
- -D_DECLARE_C99_LDBL_MATH # XXX ports/193528
LDFLAGS+= -Wl,--as-needed # avoid overlinking (opencv deps)
TEST_TARGET= test ARGS="-V"
USE_LDCONFIG= yes
Modified: head/math/GiNaC/Makefile
==============================================================================
--- head/math/GiNaC/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/math/GiNaC/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -24,7 +24,6 @@ INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CXXFLAGS+= -D_GLIBCXX_USE_C99
INFO= ginac ginac-examples
Modified: head/math/gringo/Makefile
==============================================================================
--- head/math/gringo/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/math/gringo/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -21,9 +21,6 @@ MAKE_ARGS= ${MAKE_ENV}
CXXFLAGS+= -std=c++11
MAKE_ENV= WITH_LUA=no
-# Unhide std::to_string() with GCC < 4.9 (ports/193528)
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-
PLIST_FILES= bin/${PORTNAME} bin/clingo
do-install:
Modified: head/math/pdal/Makefile
==============================================================================
--- head/math/pdal/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/math/pdal/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -27,9 +27,6 @@ USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME:tu}
GH_PROJECT= ${GH_ACCOUNT}
-# Unhide std::to_string() to fix build with GCC (see ports/193528 for details).
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-
CMAKE_ON= WITH_LASZIP #LASZIP is recommended
OPTIONS_DEFINE= BASH \
Modified: head/math/yacas/Makefile
==============================================================================
--- head/math/yacas/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/math/yacas/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -34,12 +34,6 @@ GH_ACCOUNT= grzegorzmazur
PLIST_SUB= SHLIB_VERSION=${PORTVERSION:S/.//}.0
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == "gcc"
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
# Can't use USES=shebangfix here, cause the path appears several
# times in the file.
@@ -47,4 +41,5 @@ post-patch:
${WRKSRC}/tests/test-yacas
@${REINPLACE_CMD} -e '/^install/s|^|#|' \
${WRKSRC}/tests/CMakeLists.txt
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>
Modified: head/multimedia/aegisub/Makefile
==============================================================================
--- head/multimedia/aegisub/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/multimedia/aegisub/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -32,7 +32,6 @@ USE_GL= gl
USE_CSTD= c99
USE_CXXSTD= c++11
CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1
-CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
LDFLAGS+= -Wl,--as-needed # freetype
GNU_CONFIGURE= yes
CONFIGURE_ENV= ICONV_LIBS="${ICONV_LIB}" PTHREAD_LIBS="-pthread" \
Modified: head/multimedia/ffms2/Makefile
==============================================================================
--- head/multimedia/ffms2/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/multimedia/ffms2/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -22,7 +22,6 @@ EXCLUDE= VSHelper.h VSScript.h VapourSynth.h
EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
-CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
CPPFLAGS+= `pkg-config vapoursynth --cflags`
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
Modified: head/multimedia/mpc-qt/Makefile
==============================================================================
--- head/multimedia/mpc-qt/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/multimedia/mpc-qt/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -22,8 +22,6 @@ USES= compiler:c++14-lang desktop-file-utils pkgconfi
USE_QT= qmake_build buildtools_build linguisttools_build \
core dbus gui network svg_run widgets x11extras
USE_GL= gl
-CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
- -D_DECLARE_C99_LDBL_MATH # XXX ports/193528
OPTIONS_DEFINE= DOCS
Modified: head/multimedia/obs-studio/Makefile
==============================================================================
--- head/multimedia/obs-studio/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/multimedia/obs-studio/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -44,14 +44,8 @@ CMAKE_ARGS= -DUNIX_STRUCTURE:BOOL=ON \
-DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}"
CFLAGS+= -D_WITH_GETLINE
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's| 3.4)| ${PYTHON_VER})|' \
${WRKSRC}/cmake/Modules/FindPythonDeps.cmake
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/multimedia/vapoursynth/Makefile
==============================================================================
--- head/multimedia/vapoursynth/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/multimedia/vapoursynth/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -13,7 +13,6 @@ USE_GITHUB= yes
USES= autoreconf gmake libtool localbase pathfix pkgconfig
GNU_CONFIGURE= yes
-CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
DATADIR= ${PREFIX}/lib/vapoursynth
Modified: head/net-p2p/eiskaltdcpp-daemon/Makefile
==============================================================================
--- head/net-p2p/eiskaltdcpp-daemon/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/net-p2p/eiskaltdcpp-daemon/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -28,7 +28,6 @@ JSONRPC_DESC= JSONRPC interface support
PLIST_FILES= bin/${PORTNAME}${PKGNAMESUFFIX} \
man/man1/${PORTNAME}${PKGNAMESUFFIX}.1.gz
-CXXFLAGS+= -I${LOCALBASE}/include -D_GLIBCXX_USE_C99
CMAKE_ARGS+= -DUSE_QT:BOOL=OFF
CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF
CMAKE_ARGS+= -DCREATE_MO:BOOL=OFF
Modified: head/net/nethogs/Makefile
==============================================================================
--- head/net/nethogs/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/net/nethogs/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -18,7 +18,6 @@ USE_GITHUB= yes
GH_ACCOUNT= raboof
USES= gmake shebangfix
-CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
SHEBANG_FILES= determineVersion.sh
bash_CMD= /bin/sh
Modified: head/net/ulxmlrpcpp/Makefile
==============================================================================
--- head/net/ulxmlrpcpp/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/net/ulxmlrpcpp/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -3,7 +3,7 @@
PORTNAME= ulxmlrpcpp
PORTVERSION= 1.7.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net devel
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
Modified: head/net/yami4/Makefile
==============================================================================
--- head/net/yami4/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/net/yami4/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt
USES= compiler:c++11-lang zip
MAKE_ARGS= COMPILER="${CXX}" OPTIONS="${CXXFLAGS}"
-CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
PORTDOCS= *
Modified: head/ports-mgmt/portrac/Makefile
==============================================================================
--- head/ports-mgmt/portrac/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/ports-mgmt/portrac/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -17,9 +17,6 @@ PLIST_FILES= bin/portrac \
share/portrac/up-to-date.png \
share/portrac/updates-available.png
-# Unhide std::to_string() to fix build with GCC (ports/193528)
-CXXFLAGS= -D_GLIBCXX_USE_C99
-
USES= compiler:c++11-lib qmake qt:5 tar:bzip2
USE_CXXSTD= c++11
USE_QT= widgets buildtools_build
Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/www/node/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -82,13 +82,6 @@ BROKEN_SSL+= base
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/tools/v8_gypfiles/v8.gyp
@@ -106,4 +99,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/node10/Makefile
==============================================================================
--- head/www/node10/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/www/node10/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -83,13 +83,6 @@ BROKEN_SSL+= base
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/deps/v8/gypfiles/v8.gyp
@@ -107,4 +100,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/node6/Makefile
==============================================================================
--- head/www/node6/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/www/node6/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -82,13 +82,6 @@ BROKEN_SSL+= base
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/deps/v8/tools/gyp/v8.gyp
@@ -114,4 +107,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/www/node8/Makefile
==============================================================================
--- head/www/node8/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/www/node8/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -77,13 +77,6 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/deps/v8/src/v8.gyp
@@ -101,4 +94,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/x11-fm/wcmcommander/Makefile
==============================================================================
--- head/x11-fm/wcmcommander/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/x11-fm/wcmcommander/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -34,16 +34,10 @@ SMB_CMAKE_ON= -DSMBCLIENT_LIBRARY=${SAMBALIBS}/libsmb
SSH_LIB_DEPENDS= libssh2.so:security/libssh2
SSH_CMAKE_BOOL= WITH_LIBSSH2
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
-.endif
-
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/x11/slim/Makefile
==============================================================================
--- head/x11/slim/Makefile Sat Sep 14 21:30:54 2019 (r512078)
+++ head/x11/slim/Makefile Sat Sep 14 22:01:13 2019 (r512079)
@@ -3,7 +3,7 @@
PORTNAME= slim
PORTVERSION= 1.3.6
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= x11
MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \
SF/slim.berlios
More information about the svn-ports-head
mailing list