*/*: sync with upstream

Taken from: HardenedBSD

archivers/peazip/Makefile

@@ -22,6 +22,7 @@ DOS2UNIX_REGEX=		.*\.([txt]|pas|lpi|txt)
 
 LAZARUS_PROJECT_FILES=	project_pea.lpi project_peach.lpi project_gwrap.lpi
 LAZBUILD_ARGS=		-d
+LLD_UNSAFE=		yes
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
 qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5

astro/mkgmap/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkgmap
-PORTVERSION=	r4261
+PORTVERSION=	r4262
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/

astro/mkgmap/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1547047078
-SHA256 (mkgmap-r4261.tar.gz) = 14bdfaf958f7cf6504c56289e1c90eae5d00a973d0bcfa5c3ba7fdd209b9517f
-SIZE (mkgmap-r4261.tar.gz) = 3390307
+TIMESTAMP = 1547519612
+SHA256 (mkgmap-r4262.tar.gz) = 47ee61c8c1ebb917ebef04f5da74075944dd455a7b35106c62e5e06638a7062a
+SIZE (mkgmap-r4262.tar.gz) = 3393734

audio/caps-lv2/Makefile

@@ -26,6 +26,11 @@ CPP=		clang-cpp${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
 
+.if exists(/usr/lib/libstdc++.so)
+CXXFLAGS+=	-stdlib=libstdc++
+LDFLAGS+=	-stdlib=libstdc++
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|__APPLE__|__FreeBSD__|" \
 		${WRKSRC}/dsp/v4f_IIR2.h

audio/carla/Makefile

@@ -2,8 +2,7 @@
 
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.9.12
-PORTREVISION=	3
+DISTVERSION=	1.9.13
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]

audio/carla/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1540661146
-SHA256 (falkTX-Carla-v1.9.12_GH0.tar.gz) = f4711cb857ea5c409b4602ab2254956d4f24311ed292048f9013163c953e0f30
-SIZE (falkTX-Carla-v1.9.12_GH0.tar.gz) = 5691829
+TIMESTAMP = 1547539969
+SHA256 (falkTX-Carla-v1.9.13_GH0.tar.gz) = cc6639dd23b22279f8ab1ae9b51e71d5480b86112c475110daa68cf68fb8cf63
+SIZE (falkTX-Carla-v1.9.13_GH0.tar.gz) = 5690369

audio/fasttracker2/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fasttracker2
-DISTVERSION=	0.1-b128
+DISTVERSION=	0.1-b130
 CATEGORIES=	audio
 MASTER_SITES=	https://16-bits.org/ \
 		LOCAL/ehaupt

audio/fasttracker2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1546842576
-SHA256 (ft2clone-b128-code.zip) = 59961cc61c9bee32b4db8995f623f8e43c6e3344aeb2e5c5d8591dee39b9023d
-SIZE (ft2clone-b128-code.zip) = 3462508
+TIMESTAMP = 1547539355
+SHA256 (ft2clone-b130-code.zip) = f5e80e0f6d480f5bbadc80d08d079d1f939b147e537c01d013d5c9d3b31bde61
+SIZE (ft2clone-b130-code.zip) = 3463164

audio/giada/Makefile

@@ -2,11 +2,11 @@
 
 PORTNAME=	giada
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.15.2
+DISTVERSION=	0.15.3
 CATEGORIES=	audio
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	64a37052fd26d578929e068eb70529f0bd895596.patch:-p1
+PATCHFILES=	ea7a3a8c300cf24cee50a834aa0f579fada5f660.patch:-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	Hardcore loop machine

audio/giada/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1537385334
-SHA256 (monocasual-giada-v0.15.2_GH0.tar.gz) = ca18e6b79b855ebd88a78bcb60de23a25037ba067ed2b535985753b9314f1fad
-SIZE (monocasual-giada-v0.15.2_GH0.tar.gz) = 442887
-SHA256 (64a37052fd26d578929e068eb70529f0bd895596.patch) = 80cfce8291c656c3bfe672de9f2847e71305011566e39a9adc9e31652325931e
-SIZE (64a37052fd26d578929e068eb70529f0bd895596.patch) = 15784
+TIMESTAMP = 1547545001
+SHA256 (monocasual-giada-v0.15.3_GH0.tar.gz) = e2ee3d2f787e9dcd6a57fbf454c1aa2f9ecd2f3172a4b83de726de692c15a2de
+SIZE (monocasual-giada-v0.15.3_GH0.tar.gz) = 456011
+SHA256 (ea7a3a8c300cf24cee50a834aa0f579fada5f660.patch) = a9951add4c151d5f43fbce8c4d5613c6281a32fa519632eb79d3b7ff061f27aa
+SIZE (ea7a3a8c300cf24cee50a834aa0f579fada5f660.patch) = 15156

audio/mixxx21/Makefile

@@ -3,8 +3,7 @@
 
 PORTNAME=	mixxx
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	2.1.5
-PORTREVISION=	3
+DISTVERSION=	2.1.6
 CATEGORIES=	audio
 PKGNAMESUFFIX=  21
 
@@ -44,7 +43,7 @@ USE_QT=		buildtools concurrent core dbus gui network opengl script scripttools \
 		sql sql-sqlite3 svg testlib xml xmlpatterns linguisttools_build \
 		qmake_build widgets
 
-CONFLICTS=	mixxx20*
+CONFLICTS=	mixxx20* mixxx
 
 MAKE_ARGS=	qtdir="${PREFIX}" install_root="${PREFIX}" \
 		build=release optimize=native ${GUI} battery=0 vamp=1 modplug=1

audio/mixxx21/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1541529337
-SHA256 (mixxxdj-mixxx-release-2.1.5_GH0.tar.gz) = 09ef59c1f8ba9fb5d7c31880f5989b8ef198ca026ffeffda7523e94ee068122f
-SIZE (mixxxdj-mixxx-release-2.1.5_GH0.tar.gz) = 34474975
+TIMESTAMP = 1546748571
+SHA256 (mixxxdj-mixxx-release-2.1.6_GH0.tar.gz) = a85bb6bce70d9de22b35cd4bb9dd7330e963f02829a2b12730d731315e91bb5f
+SIZE (mixxxdj-mixxx-release-2.1.6_GH0.tar.gz) = 34533966

audio/mixxx21/files/patch-build_depends.py

@@ -1,5 +1,5 @@
---- build/depends.py	2018-09-05 15:20:52.000000000 -0500
-+++ build/depends.py	2018-10-30 14:47:39.928944000 -0500
+--- build/depends.py	2018-12-27 02:36:10.000000000 -0500
++++ build/depends.py	2019-01-05 23:40:05.463593000 -0500
 @@ -12,7 +12,7 @@
          if not conf.CheckLib('portaudio'):
              raise Exception(
@@ -33,41 +33,43 @@ def configure(self, build, conf):
  class Qt(Dependence):
      DEFAULT_QT4DIRS = {'linux': '/usr/share/qt4',
 -                       'bsd': '/usr/local/lib/qt4',
-+                       'bsd': '%%LOCALBASE%%/share/qt4',
++		       'bsd': '%%LOCALBASE%%/share/qt4',
                         'osx': '/Library/Frameworks',
                         'windows': 'C:\\qt\\4.6.0'}
 
      DEFAULT_QT5DIRS64 = {'linux': '/usr/lib/x86_64-linux-gnu/qt5',
-+                         'bsd': '%%LOCALBASE%%/lib/qt5',
++			 'bsd': '%%LOCALBASE%%/lib/qt5',
                           'osx': '/Library/Frameworks',
                           'windows': 'C:\\qt\\5.0.1'}
 
      DEFAULT_QT5DIRS32 = {'linux': '/usr/lib/i386-linux-gnu/qt5',
-+                         'bsd': '%%LOCALBASE%%/lib/qt5',
++			 'bsd': '%%LOCALBASE%%/lib/qt5',
                           'osx': '/Library/Frameworks',
                           'windows': 'C:\\qt\\5.0.1'}
 
-@@ -319,9 +322,17 @@
+@@ -319,10 +322,18 @@
                  build.env.Append(CCFLAGS='-fPIC')
 
          elif build.platform_is_bsd:
 -            build.env.Append(LIBS=qt_modules)
 -            include_paths = ['$QTDIR/include/%s' % module
 -                             for module in qt_modules]
-+	    qt_modules.extend(['QtDBus'])
-+	    if qt5:
-+		qt5_modules = [w.replace('Qt', 'Qt5') for w in qt_modules]
-+		build.env.Append(LIBS = qt5_modules)
-+		build.env.Append(CCFLAGS='-fPIC')
-+                include_paths = ['%%LOCALBASE%%/include/qt5/%s' % module
+-            build.env.Append(CPPPATH=include_paths)
++           qt_modules.extend(['QtDBus'])
++           if qt5:
++               qt5_modules = [w.replace('Qt', 'Qt5') for w in qt_modules]
++               build.env.Append(LIBS = qt5_modules)
++               build.env.Append(CCFLAGS='-fPIC')
++               include_paths = ['%%LOCALBASE%%/include/qt5/%s' % module
 +                                for module in qt_modules]
-+            else:
-+		build.env.Append(LIBS = qt_modules)
-+                include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
++           else:
++               build.env.Append(LIBS = qt_modules)
++               include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
 +                                for module in qt_modules]
-             build.env.Append(CPPPATH=include_paths)
++           build.env.Append(CPPPATH=include_paths)
          elif build.platform_is_osx:
              qtdir = build.env['QTDIR']
+             build.env.Append(
 @@ -487,7 +498,7 @@
          if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
              qtdir = build.env['QTDIR']
@@ -91,7 +93,7 @@ class Qt(Dependence):
          # it, though might cause issues. This is safe to remove once we
          # deprecate Karmic support. rryan 2/2011
 -        build.env.Append(CPPPATH='/usr/include/taglib/')
-+        build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
++	build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
 
          if build.platform_is_windows and build.static_dependencies:
              build.env.Append(CPPDEFINES='TAGLIB_STATIC')
@@ -103,29 +105,33 @@ class Qt(Dependence):
              build.env.Append(CCFLAGS='-Wall')
              if build.compiler_is_clang:
                  # Quiet down Clang warnings about inconsistent use of override
-@@ -1445,9 +1455,9 @@
+@@ -1445,12 +1455,13 @@
 
          elif build.platform_is_osx:
              # Stuff you may have compiled by hand
 -            if os.path.isdir('/usr/local/include'):
 -                build.env.Append(LIBPATH=['/usr/local/lib'])
--                build.env.Append(CPPPATH=['/usr/local/include'])
 +            if os.path.isdir('%%LOCALBASE%%/include'):
 +                build.env.Append(LIBPATH=['%%LOCALBASE%%/lib'])
+                 # Use -isystem instead of -I to avoid compiler warnings from
+                 # system libraries. This cuts down on Mixxx's compilation output
+                 # significantly when using Homebrew installed to /usr/local.
+-                build.env.Append(CCFLAGS=['-isystem', '/usr/local/include'])
 +                build.env.Append(CPPPATH=['%%LOCALBASE%%/include'])
++                build.env.Append(CCFLAGS=['-isystem', '%%LOCALBASE%%/include'])
 
              # Non-standard libpaths for fink and certain (most?) darwin ports
              if os.path.isdir('/sw/include'):
-@@ -1460,17 +1470,24 @@
+@@ -1463,17 +1474,24 @@
                  build.env.Append(CPPPATH=['/opt/local/include'])
 
          elif build.platform_is_bsd:
-+	    qt5 = Qt.qt5_enabled(build)
++            qt5 = Qt.qt5_enabled(build)
 +
-+	    if qt5:
-+	      qtdirectory = 'qt5'
++            if qt5:
++              qtdirectory = 'qt5'
 +            else:
-+	      qtdirectory = 'qt4'
++              qtdirectory = 'qt4'
 +
              build.env.Append(CPPDEFINES='__BSD__')
              build.env.Append(CPPPATH=['/usr/include',
@@ -146,7 +152,7 @@ class Qt(Dependence):
 
          # Define for things that would like to special case UNIX (Linux or BSD)
          if build.platform_is_bsd or build.platform_is_linux:
-@@ -1503,7 +1520,7 @@
+@@ -1506,7 +1524,7 @@
          # Say where to find resources on Unix. TODO(XXX) replace this with a
          # RESOURCE_PATH that covers Win and OSX too:
          if build.platform_is_linux or build.platform_is_bsd:
@@ -155,7 +161,7 @@ class Qt(Dependence):
              share_path = os.path.join (prefix, build.env.get(
                  'SHAREDIR', default='share'), 'mixxx')
              build.env.Append(
-@@ -1514,7 +1531,7 @@
+@@ -1517,7 +1535,7 @@
                  CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
 
      def depends(self, build):

audio/mixxx21/pkg-plist

@@ -1,7 +1,7 @@
 bin/mixxx
-%%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so
-%%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so
-lib/mixxx/plugins/vamp/libmixxxminimal.so
+%%FAAD%%lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so
+%%WAVPACK%%lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
+lib/mixxx/plugins/vampqt5/libmixxxminimal.so
 share/appdata/mixxx.appdata.xml
 share/applications/mixxx.desktop
 share/pixmaps/mixxx-icon.png

cad/openvsp/Makefile

@@ -24,7 +24,6 @@ LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfltk.so:x11-toolkits/fltk \
-		libGLEW.so:graphics/glew \
 		libcpptest.so:devel/cpptest
 BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
@@ -49,7 +48,7 @@ CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes
 USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
 		xinerama xrender xxf86vm
-USE_GL=		gl glu
+USE_GL=		gl glew glu
 
 USE_GNOME=	libxml2
 

converters/osm2pgrouting/Makefile

@@ -2,8 +2,7 @@
 
 PORTNAME=	osm2pgrouting
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.3
-PORTREVISION=	6
+DISTVERSION=	2.3.6
 CATEGORIES=	converters databases geography
 
 MAINTAINER=	[email protected]
@@ -19,19 +18,20 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 USES=		cmake compiler:c++11-lang pgsql
 USE_GITHUB=	yes
 GH_ACCOUNT=	pgRouting
+
 WANT_PGSQL=	client
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	Readme.md
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/mapconfig.xml|' \
+	@${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/${PORTNAME}/mapconfig.xml|' \
 		${WRKSRC}/src/utilities/prog_options.cpp \
 		${WRKSRC}/Readme.md
 
 post-install:
-	@for cf in ${STAGEDIR}${PREFIX}/etc/*.xml; do \
+	@for cf in ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/*.xml; do \
 		${MV} $${cf} $${cf}.sample; \
 	done
 

converters/osm2pgrouting/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1513628294
-SHA256 (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = ea58d3b2dd0164cf85dfa66044ce1ea2af3080bee2c16ad6f115aa84aa23ba0f
-SIZE (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = 181159
+TIMESTAMP = 1547161773
+SHA256 (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = c4b1f45ff7a9a184956182e40016fdd9455718821adb25822e2ef8182d2712a6
+SIZE (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = 182168

converters/osm2pgrouting/files/patch-CMakeLists.txt

@@ -1,15 +1,15 @@
---- CMakeLists.txt.orig	2017-12-18 15:44:24 UTC
+--- CMakeLists.txt.orig	2019-01-11 07:48:53 UTC
 +++ CMakeLists.txt
-@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting
-     )
+@@ -8,7 +8,7 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} 
+ endif()
 
- INSTALL(TARGETS osm2pgrouting
--    RUNTIME DESTINATION "/usr/bin"
-+    RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
-     )
+ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+-SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting")
++SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/etc/osm2pgrouting")
 
- if(WIN32)
-@@ -114,13 +114,15 @@ if(WIN32)
+ FIND_PACKAGE(PostgreSQL REQUIRED)
+ find_package(LibPQXX REQUIRED)
+@@ -114,8 +114,10 @@ if(WIN32)
  endif()
 
  INSTALL(FILES
@@ -21,9 +21,3 @@
      "${CMAKE_SOURCE_DIR}/mapconfig.xml"
      "${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml"
      "${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml"
-     "${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml"
--    DESTINATION "${SHARE_DIR}")
-+    DESTINATION "${CMAKE_INSTALL_PREFIX}/etc")
-
-
- #INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )