*/*: sync with upstream

Taken from: FreeBSD
opnsense2 · Sep 7, 2021 · fb6cbfb · fb6cbfb
1 parent b221352
commit fb6cbfb
Show file tree

Hide file tree

Showing 592 changed files with 6,581 additions and 5,559 deletions.
diff --git a/archivers/lrzip/Makefile b/archivers/lrzip/Makefile
@@ -17,10 +17,11 @@ CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-asm
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		alias libtool pathfix perl5 shebangfix tar:bzip2
+USES=		alias cpe libtool pathfix perl5 shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/lrztar
 USE_PERL5=	build
 USE_LDCONFIG=	yes
+CPE_VENDOR=	lrzip_project
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblrzip.so.0.0.0

diff --git a/archivers/minizip/Makefile b/archivers/minizip/Makefile
@@ -11,12 +11,13 @@ COMMENT=	Zip library and programs from Zlib distribution
 
 LICENSE=	ZLIB
 
-USES=		autoreconf libtool pathfix tar:xz
+USES=		autoreconf cpe libtool pathfix tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-demos
 INSTALL_TARGET=	install-strip
 WRKSRC=		${WRKDIR}/zlib-${PORTVERSION}/contrib/minizip
+CPE_VENDOR=	minizip_project
 
 post-patch:
 	@${REINPLACE_CMD} 's/#ifdef unix || __APPLE__/#ifdef unix/' ${WRKSRC}/mini???.c

diff --git a/archivers/pear-Horde_Compress/Makefile b/archivers/pear-Horde_Compress/Makefile
@@ -9,12 +9,14 @@ OPTIONS_DEFAULT=	ZLIB
 OPTIONS_DEFINE=		ZLIB
 ZLIB_DESC=	Depend on PHP zlib extension
 
-USES=	horde
+USES=		cpe horde
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Translation \
 		Horde_Util \
 		Horde_Stream_Filter
 
+CPE_VENDOR=	horde
+
 ZLIB_USES=	php
 ZLIB_USE=	PHP=zlib
 

diff --git a/archivers/pear-Horde_Compress_Fast/Makefile b/archivers/pear-Horde_Compress_Fast/Makefile
@@ -5,7 +5,8 @@ CATEGORIES=	archivers www pear
 MAINTAINER=	[email protected]
 COMMENT=	Horde Fast Compression Library
 
-USES=	horde
+USES=		cpe horde
 USE_HORDE_RUN=	Horde_Exception
+CPE_VENDOR=	horde
 
 .include <bsd.port.mk>
diff --git a/archivers/pear-Horde_Pack/Makefile b/archivers/pear-Horde_Pack/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	archivers www pear
 MAINTAINER=	[email protected]
 COMMENT=	Horde Pack Utility
 
-USES=		horde
+USES=		cpe horde
 USE_HORDE_RUN=	Horde_Compress_Fast \
 		Horde_Exception
+CPE_VENDOR=	horde
 
 .include <bsd.port.mk>
diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
@@ -10,10 +10,12 @@ COMMENT=	Free archiver and file compressor
 
 LICENSE=	LGPL3
 
-USES=		desktop-file-utils dos2unix fpc lazarus:flavors zip xorg
+USES=		cpe desktop-file-utils dos2unix fpc lazarus:flavors zip xorg
 USE_FPC=	cairo chm fcl-base fcl-image fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 
+CPE_VENDOR=	giorgio_tani
+
 SUB_FILES=	pea peazip
 
 DOS2UNIX_REGEX=		.*\.([txt]|pas|lpi|txt)

diff --git a/archivers/ppmd-7z/Makefile b/archivers/ppmd-7z/Makefile
@@ -18,13 +18,15 @@ LICENSE_FILE_UNRAR=	${WRKSRC}/DOCS/unRarLicense.txt
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/DOCS/copying.txt
 LICENSE_PERMS_UNRAR=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		tar:bzip2 gmake
+USES=		cpe tar:bzip2 gmake
 WRKSRC=		${WRKDIR}/p7zip_${DISTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/CPP/7zip/Compress/PPMD_Alone
 MAKEFILE=	makefile
 PLIST_FILES=	bin/${PKGBASE}
 MAKE_ARGS=	PROG=${PORTNAME} CXX="${CXX}" LIB="-pthread"
 TEST_TARGET=	test
+CPE_VENDOR=	7-zip
+CPE_PRODUCT=	p7zip
 
 post-patch:
 	@${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\

diff --git a/archivers/ppmd/Makefile b/archivers/ppmd/Makefile
@@ -10,6 +10,10 @@ COMMENT=	Fast archiver with good compression ratio
 
 LICENSE=	PD
 
+USES=		cpe
+
+CPE_VENDOR=	ppmd_project
+
 PORTDOCS=	read_me.txt
 PLIST_FILES=	bin/ppmd man/man1/ppmd.1.gz
 

diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
@@ -15,9 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		compiler:openmp tar:xz
+USES=		cpe compiler:openmp tar:xz
 PLIST_FILES=	bin/pxz share/man/man1/pxz.1.gz
 
+CPE_VENDOR=	pxz_project
+
 MAKE_ENV+=	BINDIR=${PREFIX}/bin \
 		MANDIR=${PREFIX}/share/man
 

diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile
@@ -11,9 +11,10 @@ COMMENT=	Qt/C++ wrapper for ZIP/UNZIP package
 
 LICENSE=	LGPL21
 
-USES=		cmake compiler:c++11-lang qt:5
+USES=		cmake compiler:c++11-lang cpe qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	stachenov
+CPE_VENDOR=	quazip_project
 USE_LDCONFIG=	yes
 USE_QT=		core network testlib \
 		buildtools_build qmake_build

diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
@@ -18,6 +18,9 @@ LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
 ONLY_FOR_ARCHS=	amd64 i386
 
+USES=		cpe
+CPE_VENDOR=	rarlab
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/rar
 

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
@@ -16,7 +16,9 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_NAME=	UnRAR license
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
-USES+=		compiler:c++11-lang
+USES+=		compiler:c++11-lang cpe
+
+CPE_VENDOR=	rarlab
 
 LDFLAGS+=	-lpthread
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" STRIP="${STRIP_CMD}"

diff --git a/astro/indiwebmanagerapp/Makefile b/astro/indiwebmanagerapp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	indiwebmanagerapp
 DISTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 
 MAINTAINER=	[email protected]
@@ -21,4 +21,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	rlancaste
 GH_PROJECT=	INDIWebManagerApp
 
+post-patch:
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e \
+		's|python3|${PYTHON_VERSION}|g' ${WRKSRC}/src/mainwindow.cpp
+	${REINPLACE_CMD} -e 's|On Linux|On Linux\/FreeBSD|g' \
+		${WRKSRC}/src/opsconfiguration.cpp
+
 .include <bsd.port.mk>
diff --git a/astro/indiwebmanagerapp/files/patch-src_mainwindow.cpp b/astro/indiwebmanagerapp/files/patch-src_mainwindow.cpp
@@ -0,0 +1,55 @@
+--- src/mainwindow.cpp	2021-09-04 23:55:40.427687000 -0500
++++ src/mainwindow.cpp	2021-09-05 00:10:09.774435000 -0500
+@@ -295,6 +295,8 @@
+     #ifdef Q_OS_OSX
+         //Note this is the Path where python3 gets symlinked by homebrew.
+         return "/usr/local/opt/python/libexec/bin";
++    #elif defined(Q_OS_FREEBSD)
++        return "%%LOCALBASE%%/bin";
+     #endif
+         if (flat.isEmpty() == false)
+             return flat + "/bin/";
+@@ -307,6 +309,8 @@
+     {
+     #ifdef Q_OS_OSX
+         return "/usr/local/bin/indi-web";
++    #elif defined(Q_OS_FREEBSD)
++        return "%%LOCALBASE%%/bin/indi-web";
+     #endif
+         return QDir::homePath() + "/.local/bin/indi-web";
+     }
+@@ -316,6 +320,8 @@
+     {
+     #ifdef Q_OS_OSX
+         return QStandardPaths::locate(QStandardPaths::GenericDataLocation, QString(), QStandardPaths::LocateDirectory) + "INDIWebManagerApp/gsc";
++    #elif defined(Q_OS_FREEBSD)
++        return "%%LOCALBASE%%/share/gsc";
+     #endif
+         if (flat.isEmpty() == false)
+             return flat + "/share/GSC";
+@@ -339,6 +345,8 @@
+     #ifdef Q_OS_OSX
+         QString appPath = QCoreApplication::applicationDirPath();
+         return QDir(appPath + "/indi").absolutePath();
++    #elif defined(Q_OS_FREEBSD)
++        return "%%LOCALBASE%%/bin/";
+     #endif
+         if (flat.isEmpty() == false)
+             return flat + "/bin/";
+@@ -352,6 +360,8 @@
+     #ifdef Q_OS_OSX
+         QString appPath = QCoreApplication::applicationDirPath();
+         return QDir(appPath + "/../Resources/DriverSupport").absolutePath();
++    #elif defined(Q_OS_FREEBSD)
++        return "%%LOCALBASE%%/share/indi";
+     #elif defined(Q_OS_LINUX)
+         if (flat.isEmpty() == false)
+             return flat + "/share/indi";
+@@ -544,7 +554,6 @@
+  */
+ bool MainWindow::pythonInstalled(QString pythonExecFolder)
+ {
+-
+     return QFileInfo(pythonExecFolder + "/python").exists() || QFileInfo(pythonExecFolder + "/python2").exists() || QFileInfo(pythonExecFolder + "/python3").exists();
+ }
+
diff --git a/astro/josm/Makefile b/astro/josm/Makefile
@@ -1,7 +1,7 @@
 # Created by: Gleb Smirnoff <[email protected]>
 
 PORTNAME=	josm
-PORTVERSION=	18191
+PORTVERSION=	18193
 CATEGORIES=	astro java
 MASTER_SITES=	https://josm.openstreetmap.de/download/ \
 		https://mirror.amdmi3.ru/distfiles/

diff --git a/astro/josm/distinfo b/astro/josm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630604074
-SHA256 (josm-snapshot-18191.jar) = 39fbc934feed0f1c8c844270dc83274dffc417e80dc6073443d0d59bf35876eb
-SIZE (josm-snapshot-18191.jar) = 16013739
+TIMESTAMP = 1630938120
+SHA256 (josm-snapshot-18193.jar) = e7996b3ce950431d6b9a6233049e76db34a26bb46654d4de1ee136d2f13577a0
+SIZE (josm-snapshot-18193.jar) = 16013832
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kstars
 DISTVERSION=	3.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}

diff --git a/astro/phd2/Makefile b/astro/phd2/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	phd2
 DISTVERSIONPREFIX=v
-DISTVERSION=	2.6.9dev5
-PORTREVISION=	3
+DISTVERSION=	2.6.10
 CATEGORIES=	astro
 
 MAINTAINER=	[email protected]

diff --git a/astro/phd2/distinfo b/astro/phd2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621752833
-SHA256 (OpenPHDGuiding-phd2-v2.6.9dev5_GH0.tar.gz) = 93028d3a8b8d04276db886505176daa5192a21238d0801f2b251905ad4e0a9f7
-SIZE (OpenPHDGuiding-phd2-v2.6.9dev5_GH0.tar.gz) = 110229487
+TIMESTAMP = 1630823115
+SHA256 (OpenPHDGuiding-phd2-v2.6.10_GH0.tar.gz) = f330ae45dfe3c0166b509adcac11a28403dc101e97020ab5f09d8e681e11cd5d
+SIZE (OpenPHDGuiding-phd2-v2.6.10_GH0.tar.gz) = 117658264
diff --git a/astro/py-indiweb/Makefile b/astro/py-indiweb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	indiweb
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +14,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottle>=0:www/py-bottle@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
 
+post-patch:
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/indiweb/driver.py
+
 .include <bsd.port.mk>
diff --git a/astro/py-indiweb/files/patch-indiweb_driver.py b/astro/py-indiweb/files/patch-indiweb_driver.py
@@ -0,0 +1,11 @@
+--- indiweb/driver.py	2021-09-05 00:47:09.163136000 -0500
++++ indiweb/driver.py	2021-09-05 00:47:30.642233000 -0500
+@@ -5,7 +5,7 @@
+ import xml.etree.ElementTree as ET
+
+ # Default INDI data directory
+-INDI_DATA_DIR = "/usr/share/indi/"
++INDI_DATA_DIR = "%%LOCALBASE%%/share/indi/"
+
+
+ class DeviceDriver:
diff --git a/astro/siril/Makefile b/astro/siril/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	siril
 DISTVERSION=	0.99.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro graphics
 MASTER_SITES=	https://free-astro.org/download/
 

diff --git a/astro/siril/pkg-plist b/astro/siril/pkg-plist
@@ -1,6 +1,6 @@
 bin/siril
 bin/siril-cli
-lib/libcm_rtprocess.a
+lib/librtprocess.a
 man/man1/siril-cli.1.gz
 man/man1/siril.1.gz
 share/applications/org.free_astro.siril.desktop

diff --git a/astro/stellarsolver/Makefile b/astro/stellarsolver/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	stellarsolver
-DISTVERSION=	1.5
-PORTREVISION=	1
+DISTVERSION=	1.8
 CATEGORIES=	astro
 
 MAINTAINER=	[email protected]

diff --git a/astro/stellarsolver/distinfo b/astro/stellarsolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621530559
-SHA256 (rlancaste-stellarsolver-1.5_GH0.tar.gz) = 62ce99c066a205c9f7c5cbace1678504750ceeb99cb12bacd4e4a329c4f512bc
-SIZE (rlancaste-stellarsolver-1.5_GH0.tar.gz) = 9113711
+TIMESTAMP = 1630876435
+SHA256 (rlancaste-stellarsolver-1.8_GH0.tar.gz) = 4f0009dfa76b153848abd9bcbea52b8dc27159133cf6a1db165b16e5c7b04841
+SIZE (rlancaste-stellarsolver-1.8_GH0.tar.gz) = 9117094
diff --git a/astro/stellarsolver/pkg-plist b/astro/stellarsolver/pkg-plist
@@ -153,5 +153,5 @@ lib/cmake/StellarSolver/StellarSolverConfig.cmake
 lib/cmake/StellarSolver/StellarSolverConfigVersion.cmake
 lib/libstellarsolver.so
 lib/libstellarsolver.so.1
-lib/libstellarsolver.so.1.5
+lib/libstellarsolver.so.1.8
 libdata/pkgconfig/stellarsolver.pc
diff --git a/audio/fasttracker2/Makefile b/audio/fasttracker2/Makefile
@@ -3,8 +3,12 @@
 PORTNAME=	fasttracker2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.47
+PORTREVISION=	1
 CATEGORIES=	audio
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	14013d2165f6.patch:-p1 # https://github.com/8bitbubsy/ft2-clone/issues/21
+
 MAINTAINER=	[email protected]
 COMMENT=	Fasttracker II clone
 

diff --git a/audio/fasttracker2/distinfo b/audio/fasttracker2/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1621948797
+TIMESTAMP = 1630666288
 SHA256 (8bitbubsy-ft2-clone-v1.47_GH0.tar.gz) = a011c6c13aff8788daa6df5e8c6d44d2e1ce6d470618e41d9ede45c37ce79f5b
 SIZE (8bitbubsy-ft2-clone-v1.47_GH0.tar.gz) = 5234480
+SHA256 (14013d2165f6.patch) = d0a03e33b679a39daf2acd55cf8c91402abc1318779b0fcc42e8318279baa105
+SIZE (14013d2165f6.patch) = 1033
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
@@ -1,7 +1,7 @@
 # Created by: <[email protected]>
 
 PORTNAME=	libsamplerate
-DISTVERSION=	0.2.1
+DISTVERSION=	0.2.2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/libsndfile/${PORTNAME}/releases/download/${DISTVERSION}/
 
@@ -11,7 +11,7 @@ COMMENT=	Secret Rabbit Code: a Sample Rate Converter for audio
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake cpe pkgconfig tar:bz2
+USES=		cmake cpe pkgconfig tar:xz
 
 CPE_VENDOR=	${CPE_PRODUCT}_project
 

diff --git a/audio/libsamplerate/distinfo b/audio/libsamplerate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611794308
-SHA256 (libsamplerate-0.2.1.tar.bz2) = f6323b5e234753579d70a0af27796dde4ebeddf58aae4be598e39b3cee00c90a
-SIZE (libsamplerate-0.2.1.tar.bz2) = 3747188
+TIMESTAMP = 1630910419
+SHA256 (libsamplerate-0.2.2.tar.xz) = 3258da280511d24b49d6b08615bbe824d0cacc9842b0e4caf11c52cf2b043893
+SIZE (libsamplerate-0.2.2.tar.xz) = 3319468