*/*: sync with upstream

Taken from: HardenedBSD
opnsense2 · Jul 12, 2019 · 797b43c · 797b43c
1 parent 40f51c1
commit 797b43c
Show file tree

Hide file tree

Showing 484 changed files with 3,740 additions and 2,107 deletions.
diff --git a/accessibility/kmag/distinfo b/accessibility/kmag/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621604
-SHA256 (KDE/applications/19.04.2/kmag-19.04.2.tar.xz) = 257d6fa37492c12b0b75c8bcefa3971e7fb563c48e3c2912c1e3b540b7c31b2a
-SIZE (KDE/applications/19.04.2/kmag-19.04.2.tar.xz) = 739696
+TIMESTAMP = 1562690669
+SHA256 (KDE/applications/19.04.3/kmag-19.04.3.tar.xz) = 4fad3d4414884fa8fb7dcfb27e7cc4207dfe219819ffda75355de5c1b4981e35
+SIZE (KDE/applications/19.04.3/kmag-19.04.3.tar.xz) = 671144
diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621605
-SHA256 (KDE/applications/19.04.2/kmousetool-19.04.2.tar.xz) = 4d3040a615b6ad6402d27111df6413195a8e489836d82efd157ed8499797c9c7
-SIZE (KDE/applications/19.04.2/kmousetool-19.04.2.tar.xz) = 111988
+TIMESTAMP = 1562690669
+SHA256 (KDE/applications/19.04.3/kmousetool-19.04.3.tar.xz) = 15c4e02c02a993d2724320b6625e9a44d5658c47136dd9a9895897893305dbd0
+SIZE (KDE/applications/19.04.3/kmousetool-19.04.3.tar.xz) = 112216
diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621605
-SHA256 (KDE/applications/19.04.2/kmouth-19.04.2.tar.xz) = bdb93a85f8c9b6aee51aae5471c112b08a0e73b8fd41eeaddacd49ef9cfbd8f9
-SIZE (KDE/applications/19.04.2/kmouth-19.04.2.tar.xz) = 2057388
+TIMESTAMP = 1562690670
+SHA256 (KDE/applications/19.04.3/kmouth-19.04.3.tar.xz) = 712e21cc8cb45880b02c9cf5aa3a1bb2d54f9a2e09d1bbd2667eb99beded64dc
+SIZE (KDE/applications/19.04.3/kmouth-19.04.3.tar.xz) = 1958784
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621605
-SHA256 (KDE/applications/19.04.2/ark-19.04.2.tar.xz) = b0c4e4150aa6595e1a2c6fdd2a38046fa03cf594875fb1e8af284e84c5923211
-SIZE (KDE/applications/19.04.2/ark-19.04.2.tar.xz) = 2581184
+TIMESTAMP = 1562690670
+SHA256 (KDE/applications/19.04.3/ark-19.04.3.tar.xz) = a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee
+SIZE (KDE/applications/19.04.3/ark-19.04.3.tar.xz) = 2579920
diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist
@@ -1,7 +1,7 @@
 bin/ark
 etc/xdg/ark.categories
 lib/libkerfuffle.so.%%KDE_APPLICATIONS_VERSION_SHORT%%
-lib/libkerfuffle.so.19.4.2
+lib/libkerfuffle.so.19.4.3
 %%QT_PLUGINDIR%%/arkpart.so
 %%QT_PLUGINDIR%%/kerfuffle/kerfuffle_cli7z.so
 %%QT_PLUGINDIR%%/kerfuffle/kerfuffle_clirar.so

diff --git a/astro/gpscorrelate/files/patch-exif-gps.cpp b/astro/gpscorrelate/files/patch-exif-gps.cpp
@@ -0,0 +1,13 @@
+--- exif-gps.cpp.orig	2019-07-07 08:26:16 UTC
++++ exif-gps.cpp
+@@ -40,9 +40,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-
+-#include "exiv2/image.hpp"
+-#include "exiv2/exif.hpp"
++#include <exiv2/exiv2.hpp>
+
+ #include "gpsstructure.h"
+ #include "exif-gps.h"
diff --git a/astro/josm/Makefile b/astro/josm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	josm
-PORTVERSION=	15155
+PORTVERSION=	15238
 CATEGORIES=	astro java
 MASTER_SITES=	http://josm.openstreetmap.de/download/ \
 		http://mirror.amdmi3.ru/distfiles/

diff --git a/astro/josm/distinfo b/astro/josm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559594025
-SHA256 (josm-snapshot-15155.jar) = 3596988ced04d42bed1a2ac6340299a865136263c7e6a6ad8fa1d6b3df2a9a63
-SIZE (josm-snapshot-15155.jar) = 13694626
+TIMESTAMP = 1562860663
+SHA256 (josm-snapshot-15238.jar) = fb85349f156c7fce2f5e8fdb7cb276365b743166cce2a0c1568514b2e823087e
+SIZE (josm-snapshot-15238.jar) = 13755257
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kstars
-DISTVERSION=	3.3.0
+DISTVERSION=	3.3.2
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}

diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561200114
-SHA256 (kstars-3.3.0.tar.xz) = 6d776e37ba2ccf35508078b91628b8f904062af03e0e879967b45094698077ae
-SIZE (kstars-3.3.0.tar.xz) = 70811404
+TIMESTAMP = 1562401594
+SHA256 (kstars-3.3.2.tar.xz) = 0471de89873cd1a9e7328367028fe759722971e132a4b18f5577398341665270
+SIZE (kstars-3.3.2.tar.xz) = 70102428
diff --git a/astro/kstars/files/patch-kstars_kstars.cpp b/astro/kstars/files/patch-kstars_kstars.cpp
diff --git a/astro/kstars/pkg-plist b/astro/kstars/pkg-plist
@@ -464,7 +464,6 @@ share/doc/HTML/en/kstars/viewops.png
 share/doc/HTML/en/kstars/wut.docbook
 share/doc/HTML/en/kstars/wut.png
 share/doc/HTML/en/kstars/zenith.docbook
-share/doc/HTML/es/kstars/aavso.png
 share/doc/HTML/es/kstars/ai-contents.docbook
 share/doc/HTML/es/kstars/altvstime.docbook
 share/doc/HTML/es/kstars/altvstime.png
@@ -1744,28 +1743,21 @@ share/locale/mai/LC_MESSAGES/kstars.mo
 share/locale/mk/LC_MESSAGES/kstars.mo
 share/locale/ml/LC_MESSAGES/kstars.mo
 share/locale/mr/LC_MESSAGES/kstars.mo
-share/locale/ms/LC_MESSAGES/kstars.mo
 share/locale/nb/LC_MESSAGES/kstars.mo
-share/locale/nds/LC_MESSAGES/kstars.mo
 share/locale/ne/LC_MESSAGES/kstars.mo
-share/locale/nl/LC_MESSAGES/kstars.mo
-share/locale/nn/LC_MESSAGES/kstars.mo
 share/locale/oc/LC_MESSAGES/kstars.mo
 share/locale/pa/LC_MESSAGES/kstars.mo
 share/locale/pl/LC_MESSAGES/kstars.mo
 share/locale/pt/LC_MESSAGES/kstars.mo
 share/locale/pt_BR/LC_MESSAGES/kstars.mo
 share/locale/ro/LC_MESSAGES/kstars.mo
-share/locale/ru/LC_MESSAGES/kstars.mo
 share/locale/se/LC_MESSAGES/kstars.mo
 share/locale/si/LC_MESSAGES/kstars.mo
 share/locale/sk/LC_MESSAGES/kstars.mo
 share/locale/sl/LC_MESSAGES/kstars.mo
 share/locale/sq/LC_MESSAGES/kstars.mo
 share/locale/sv/LC_MESSAGES/kstars.mo
 share/locale/ta/LC_MESSAGES/kstars.mo
-share/locale/tg/LC_MESSAGES/kstars.mo
-share/locale/th/LC_MESSAGES/kstars.mo
 share/locale/tr/LC_MESSAGES/kstars.mo
 share/locale/ug/LC_MESSAGES/kstars.mo
 share/locale/uk/LC_MESSAGES/kstars.mo

diff --git a/astro/libkgeomap/distinfo b/astro/libkgeomap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621606
-SHA256 (KDE/applications/19.04.2/libkgeomap-19.04.2.tar.xz) = 77ccdc1b8db1c67f48dc71f7cf3ef8b339b8aeffb08faba9e3e9d68c99016ece
-SIZE (KDE/applications/19.04.2/libkgeomap-19.04.2.tar.xz) = 150196
+TIMESTAMP = 1562690670
+SHA256 (KDE/applications/19.04.3/libkgeomap-19.04.3.tar.xz) = 9266af7950b4cd73b694d61cf7bc0d03fc27d2bde3015f4c698e6d5d480d17bd
+SIZE (KDE/applications/19.04.3/libkgeomap-19.04.3.tar.xz) = 150832
diff --git a/astro/marble/distinfo b/astro/marble/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621606
-SHA256 (KDE/applications/19.04.2/marble-19.04.2.tar.xz) = 2a5978b1415b4b28a4be273dd31d50345ba53a7f37fed38f5a4329ffc35a0137
-SIZE (KDE/applications/19.04.2/marble-19.04.2.tar.xz) = 52173972
+TIMESTAMP = 1562690671
+SHA256 (KDE/applications/19.04.3/marble-19.04.3.tar.xz) = b2451d338bf433d5a0211c954f48fb5c6c80fecbb8fa69d604276fecb45fe826
+SIZE (KDE/applications/19.04.3/marble-19.04.3.tar.xz) = 52188608
diff --git a/astro/merkaartor/files/patch-git_e6d015a9 b/astro/merkaartor/files/patch-git_e6d015a9
@@ -6,7 +6,7 @@ Date:   Mon Jul 27 14:22:37 2015 +0200
 
 --- src/Docks/GeoImageDock.cpp.orig	2015-07-19 14:50:09 UTC
 +++ src/Docks/GeoImageDock.cpp
-@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis
+@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
 
      Exiv2::Image::AutoPtr image;
      Exiv2::ExifData exifData;
@@ -15,7 +15,7 @@ Date:   Mon Jul 27 14:22:37 2015 +0200
 
      Layer *theLayer;
      if (photoLayer == NULL) {
-@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(
+@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
      double lat = 0.0, lon = 0.0;
      Exiv2::Image::AutoPtr image;
      Exiv2::ExifData exifData;
@@ -26,10 +26,13 @@ Date:   Mon Jul 27 14:22:37 2015 +0200
          return pos;
 --- src/Docks/GeoImageDock.h.orig	2015-07-19 14:50:09 UTC
 +++ src/Docks/GeoImageDock.h
-@@ -9,6 +9,7 @@
+@@ -7,8 +7,8 @@
+ #include <QtWidgets/QDockWidget>
+ #include <QtGui/QMouseEvent>
  #include <QtWidgets/QShortcut>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
 +#include <QDrag>
 
  class ImageView;

diff --git a/astro/opencpn/Makefile b/astro/opencpn/Makefile
@@ -22,7 +22,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	${GH_PROJECT}
 GH_PROJECT=	OpenCPN
 
-USES=		cmake compiler:c++11-lib gettext-tools gl gnome localbase
+USES=		cmake compiler:c++11-lang gettext-tools gl gnome localbase
 USE_CXXSTD=	c++11
 USE_GL=		gl
 USE_GNOME=	cairo gdkpixbuf2 gtk20
@@ -36,14 +36,16 @@ LDFLAGS+=	-Wl,--as-needed # ICE, SM, Xext
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/src/mygdal/cpl_csv.cpp \
 		${WRKSRC}/src/mygdal/cpl_findfile.cpp \
 		${WRKSRC}/data/doc/help_en_US.html
-.if exists(/usr/lib/libstdc++.so)
+.if ${ARCH} != amd64 && ${ARCH} != i386
 	@${REINPLACE_CMD} -e '/-msse/d' -e '/-mssse3/d' \
 		-e '/-mavx2/d' ${WRKSRC}/CMakeLists.txt
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/audiocd-kio/distinfo b/audio/audiocd-kio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621607
-SHA256 (KDE/applications/19.04.2/audiocd-kio-19.04.2.tar.xz) = 8111e660ed87690bb3b386f6c338303c6e810814fc2bfe1d4053844a513c08dd
-SIZE (KDE/applications/19.04.2/audiocd-kio-19.04.2.tar.xz) = 353764
+TIMESTAMP = 1562690672
+SHA256 (KDE/applications/19.04.3/audiocd-kio-19.04.3.tar.xz) = 4e684ab03fafd4ee37d7ef7d2c2edb883e76bb5a81e11415173317160997accf
+SIZE (KDE/applications/19.04.3/audiocd-kio-19.04.3.tar.xz) = 354536
diff --git a/audio/audiocd-kio/pkg-plist b/audio/audiocd-kio/pkg-plist
@@ -203,6 +203,7 @@ share/locale/pa/LC_MESSAGES/kcmaudiocd.mo
 share/locale/pa/LC_MESSAGES/kio_audiocd.mo
 share/locale/pl/LC_MESSAGES/audiocd_encoder_flac.mo
 share/locale/pl/LC_MESSAGES/audiocd_encoder_lame.mo
+share/locale/pl/LC_MESSAGES/audiocd_encoder_opus.mo
 share/locale/pl/LC_MESSAGES/audiocd_encoder_vorbis.mo
 share/locale/pl/LC_MESSAGES/kcmaudiocd.mo
 share/locale/pl/LC_MESSAGES/kio_audiocd.mo

diff --git a/audio/juk/distinfo b/audio/juk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621607
-SHA256 (KDE/applications/19.04.2/juk-19.04.2.tar.xz) = f4a4f347012a06d07f2865fc5476d55387127ab6812f742a43043ce30df3ddc7
-SIZE (KDE/applications/19.04.2/juk-19.04.2.tar.xz) = 1867504
+TIMESTAMP = 1562690672
+SHA256 (KDE/applications/19.04.3/juk-19.04.3.tar.xz) = f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750
+SIZE (KDE/applications/19.04.3/juk-19.04.3.tar.xz) = 1868172
diff --git a/audio/kmix/distinfo b/audio/kmix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621617
-SHA256 (KDE/applications/19.04.2/kmix-19.04.2.tar.xz) = 3d57ff5360903be75229967df2d96efde0b346e7d326d33b36fb790941665365
-SIZE (KDE/applications/19.04.2/kmix-19.04.2.tar.xz) = 1069712
+TIMESTAMP = 1562690682
+SHA256 (KDE/applications/19.04.3/kmix-19.04.3.tar.xz) = d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9
+SIZE (KDE/applications/19.04.3/kmix-19.04.3.tar.xz) = 1006048
diff --git a/audio/kwave/distinfo b/audio/kwave/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621618
-SHA256 (KDE/applications/19.04.2/kwave-19.04.2.tar.xz) = 68c19b2f66b13e7a78c6a583ced088a9532bc31f1bb40c653cdd139bc34d2cce
-SIZE (KDE/applications/19.04.2/kwave-19.04.2.tar.xz) = 6209132
+TIMESTAMP = 1562690683
+SHA256 (KDE/applications/19.04.3/kwave-19.04.3.tar.xz) = dc9ad96a59b4bab1cd8f04401b3d87883cf888711898fdfc20d96113faf92431
+SIZE (KDE/applications/19.04.3/kwave-19.04.3.tar.xz) = 6209860
diff --git a/audio/libcoverart/Makefile b/audio/libcoverart/Makefile
@@ -21,7 +21,9 @@ USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-Wno-implicit-fallthrough
 
-.if exists(/usr/lib/libstdc++.so)
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-Wno-unused-function -Wno-class-memaccess -Wno-catch-value
 CFLAGS+=	-Wno-format-overflow
 .endif
@@ -30,4 +32,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		 ${WRKSRC}/cmake/modules/*.cmake
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/libkcddb/distinfo b/audio/libkcddb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621618
-SHA256 (KDE/applications/19.04.2/libkcddb-19.04.2.tar.xz) = b5ca9411b0fb25a6a35c5ac6742dbc939756f928c77aa7e05f8455399bb3b528
-SIZE (KDE/applications/19.04.2/libkcddb-19.04.2.tar.xz) = 424432
+TIMESTAMP = 1562690683
+SHA256 (KDE/applications/19.04.3/libkcddb-19.04.3.tar.xz) = 6471261ffef0e1546317040c4275a6fc11c131fde7229b5d0c9358a40442bec3
+SIZE (KDE/applications/19.04.3/libkcddb-19.04.3.tar.xz) = 423248
diff --git a/audio/libkcompactdisc/distinfo b/audio/libkcompactdisc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559621618
-SHA256 (KDE/applications/19.04.2/libkcompactdisc-19.04.2.tar.xz) = 06652ac4e296897c227cef469b80ebe3faa777b20f010e5a84377202ecb67c72
-SIZE (KDE/applications/19.04.2/libkcompactdisc-19.04.2.tar.xz) = 88892
+TIMESTAMP = 1562690683
+SHA256 (KDE/applications/19.04.3/libkcompactdisc-19.04.3.tar.xz) = 9294aa908f158437241e27d57f924a2b7a07aa4203a51b83566de8c9690e86bc
+SIZE (KDE/applications/19.04.3/libkcompactdisc-19.04.3.tar.xz) = 89120
diff --git a/audio/nekobi-lv2/Makefile b/audio/nekobi-lv2/Makefile
@@ -29,7 +29,9 @@ USE_XORG=	x11
 CFLAGS+=	-I${FILESDIR}
 CFLAGS+=	-Wno-c++11-narrowing # clang prints errors: https://github.com/DISTRHO/Nekobi/issues/7
 
-.if exists(/usr/lib/libstdc++.so)
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	@${REINPLACE_CMD} -e 's/-mtune=generic -msse -msse2 //' \
 		${WRKSRC}/dpf/Makefile.base.mk
@@ -40,4 +42,4 @@ do-install: # https://github.com/DISTRHO/Nekobi/issues/8
 	cd ${WRKSRC}/bin && ${COPYTREE_SHARE} Nekobi.lv2 ${STAGEDIR}${PREFIX}/lib/lv2/
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/Nekobi ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/benchmarks/linux-vdbench/Makefile b/benchmarks/linux-vdbench/Makefile
@@ -25,6 +25,7 @@ EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 JAVA_VERSION=	1.7+
 JAVA_OS=	linux
 NO_BUILD=	yes
+PLIST_SUB=	LINUX_ARCH=${LINUX_ARCH}
 SHEBANG_FILES=	${PORTNAME} linux/config.sh
 bash_CMD=	${SH}
 
@@ -34,16 +35,16 @@ DOWNLOAD_URL=	https://www.oracle.com/technetwork/server-storage/vdbench-download
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTFILES})
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=You must manually download ${DISTFILES} from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again
 .endif
 
-.if ${LINUX_ARCH} == "i386"
-PLIST_SUB+=	LINUX_ARCH_32="" LINUX_ARCH_64="@comment "
+.if ${ARCH} == i386
+LINUX_ARCH=	32
 .endif
 
-.if ${LINUX_ARCH} == "x86_64"
-PLIST_SUB+=	LINUX_ARCH_32="@comment " LINUX_ARCH_64=""
+.if ${ARCH} == amd64
+LINUX_ARCH=	64
 .endif
 
 post-patch:
@@ -59,12 +60,7 @@ do-install:
 	for f in vdbench.jar build_sds.txt swatcharts.txt; do \
 		${INSTALL_DATA} ${WRKSRC}/$${f} ${STAGEDIR}${DATADIR}; \
 	done
-.if ${LINUX_ARCH} == "i386"
-	${INSTALL_DATA} ${WRKSRC}/linux/linux32.so ${STAGEDIR}${DATADIR}/linux
-.endif
-.if ${LINUX_ARCH} == "x86_64"
-	${INSTALL_DATA} ${WRKSRC}/linux/linux64.so ${STAGEDIR}${DATADIR}/linux
-.endif
+	${INSTALL_DATA} ${WRKSRC}/linux/linux${LINUX_ARCH}.so ${STAGEDIR}${DATADIR}/linux
 	${INSTALL_SCRIPT} ${WRKSRC}/linux/config.sh ${STAGEDIR}${DATADIR}/linux
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
 	${RLN} ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${PORTNAME}

diff --git a/benchmarks/linux-vdbench/pkg-plist b/benchmarks/linux-vdbench/pkg-plist
@@ -39,8 +39,7 @@ bin/linux-vdbench
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/raw/seq_write_xfersizes
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/raw/tpcc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/readme.txt
-%%LINUX_ARCH_32%%%%DATADIR%%/linux/linux32.so
-%%LINUX_ARCH_64%%%%DATADIR%%/linux/linux64.so
+%%DATADIR%%/linux/linux%%LINUX_ARCH%%.so
 %%DATADIR%%/build_sds.txt
 %%DATADIR%%/linux/config.sh
 %%DATADIR%%/swatcharts.txt

diff --git a/benchmarks/netperfmeter/Makefile b/benchmarks/netperfmeter/Makefile
@@ -12,15 +12,17 @@ COMMENT=	Network Performance Meter
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake shebangfix
+USES=		cmake compiler shebangfix
 CMAKE_ON=	BUILD_PLOT_PROGRAMS
 CMAKE_OFF=	BUILD_TEST_PROGRAMS WITH_NEAT
 SHEBANG_FILES=	src/pdfembedfonts src/pdfmetadata src/plot-netperfmeter-results
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-.if exists(/usr/lib/libstdc++.so)
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 	@${REINPLACE_CMD} 's, -Wno-array-bounds,,g' ${WRKSRC}/CMakeLists.txt
 .endif
 	@${REINPLACE_CMD} 's,share/man,man,' ${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/biology/Makefile b/biology/Makefile
@@ -65,6 +65,7 @@
     SUBDIR += kallisto
     SUBDIR += lagan
     SUBDIR += lamarc
+    SUBDIR += libbigwig
     SUBDIR += libgtextutils
     SUBDIR += libsbml
     SUBDIR += linux-foldingathome