diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 94bf2eee52e9..20cd2883e2f4 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -241,9 +241,18 @@ CXX= ${LOCALBASE}/bin/clang++34 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .if ${COMPILER_FEATURES:Mlibc++} +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001508 LDFLAGS+= -L${LOCALBASE}/lib/c++ CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ +.else +CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1 +LDFLAGS+= -L${WRKDIR} + +_USES_configure+= 200:gcc-libc++-configure +gcc-libc++-configure: + @${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so +.endif # OSVERSION < 1001508 .endif .endif diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile index 248862b1d988..998285960f74 100644 --- a/audio/csound6/Makefile +++ b/audio/csound6/Makefile @@ -3,7 +3,7 @@ PORTNAME= csound PORTVERSION= 6.06 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION} PKGNAMESUFFIX= 6 diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile index 45e7f2cd1f18..311c7d77ce44 100644 --- a/audio/gbsplay/Makefile +++ b/audio/gbsplay/Makefile @@ -3,6 +3,7 @@ PORTNAME= gbsplay PORTVERSION= 0.0.93 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 4db11b9a909b..28e74aff294d 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -3,7 +3,7 @@ PORTNAME= kicad DISTVERSION= 20140622%2Bbzr4027 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= https://launchpadlibrarian.net/179199115/ diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 271871a253da..8828e14d4352 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -4,6 +4,7 @@ PORTNAME= openvsp PORTVERSION= 3.9.1 DISTVERSIONPREFIX= ${GH_PROJECT}_ +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= fernando.apesteguia@gmail.com diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile index 5942e57be929..41441f1310cb 100644 --- a/comms/sdr-wspr/Makefile +++ b/comms/sdr-wspr/Makefile @@ -3,8 +3,8 @@ PORTNAME= sdr-wspr PORTVERSION= 0.1.0 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= comms hamradio MAINTAINER= jeff@baitis.net diff --git a/emulators/pipelight/Makefile b/emulators/pipelight/Makefile index b6fa7fde4d48..0376e6699f1f 100644 --- a/emulators/pipelight/Makefile +++ b/emulators/pipelight/Makefile @@ -3,7 +3,7 @@ PORTNAME= pipelight PORTVERSION= 0.2.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://bitbucket.org/mmueller2012/pipelight/get/ \ http://repos.fds-team.de/pluginloader/v${DISTVERSION}/:plg diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 207a6a684d61..6930bd9395bc 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 2_14_3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 57a5e845dc6f..908bc87722d8 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -3,6 +3,7 @@ PORTNAME= shotwell PORTVERSION= 0.24.2 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R} diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index ebcd46bc2dcb..4b56df88df0d 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -3,7 +3,7 @@ PORTNAME= vigra DISTVERSION= 1.11.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index 81efae3ab1be..3a9bcbb796c7 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -2,7 +2,7 @@ PORTNAME= ceres-solver DISTVERSION= 1.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile index bf146ca9e2fa..15a42ab1dc9b 100644 --- a/math/octave-forge-parallel/Makefile +++ b/math/octave-forge-parallel/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-parallel PORTVERSION= 3.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/saga/Makefile b/math/saga/Makefile index 12b71f59ca1e..633a172a7d1f 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index 7d33e601ce2f..ee115dffbc5a 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -3,7 +3,7 @@ PORTNAME= bombono PORTVERSION= 1.2.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R} DISTNAME= ${PORTNAME}-dvd-${PORTVERSION} diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile index d9e552f7cf65..a0a471452c1f 100644 --- a/net/mediatomb/Makefile +++ b/net/mediatomb/Makefile @@ -3,7 +3,7 @@ PORTNAME= mediatomb PORTVERSION= 0.12.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net multimedia MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION} diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 081f7d65d8da..dd964b1d6bcb 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= lilypond PORTVERSION= 2.19.51 +PORTREVISION= 1 CATEGORIES= print audio MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ PKGNAMESUFFIX= -devel diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 0a49d8d6baca..034cf220ab5f 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.6v2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION:R} .if defined(BUILD_PYTHON_MODULE)