*/*: remove GNU_CONFIGURE_MANPREFIX and pet the portclippy

Approved by: arrowd (mentor)
freebsd · Apr 13, 2024 · 43757ef · 43757ef
1 parent d866fc7
commit 43757ef
Show file tree

Hide file tree

Showing 19 changed files with 222 additions and 191 deletions.
diff --git a/audio/mumble-server/Makefile b/audio/mumble-server/Makefile
@@ -18,39 +18,39 @@ LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 USES=		cmake compiler:c++17-lang pkgconfig python:build qt:5 ssl
 USE_CXXSTD=	c++17
 USE_QT=		buildtools:build core dbus network qmake:build sql xml
+USE_RC_SUBR=	mumble_server
 
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_ON=	server
 CMAKE_OFF=	client
-CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 
 CXXFLAGS+=	-Wno-deprecated-declarations
 
-USE_RC_SUBR=	mumble_server
+EXTRA_PATCHES+=	${.CURDIR}/../mumble/files/patch-src_MumbleProtocol.cpp
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
-EXTRA_PATCHES+=	${.CURDIR}/../mumble/files/patch-src_MumbleProtocol.cpp
+USERS=		mumble-server
+GROUPS=		mumble-server
 
 OPTIONS_DEFINE=		AVAHI DOCS ICE LTO
 OPTIONS_DEFAULT=	AVAHI LTO MYSQL SQLITE
 OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL PGSQL SQLITE
 
-AVAHI_CMAKE_BOOL=	zeroconf
+ICE_DESC=		Ice Support
+
 AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
+AVAHI_CMAKE_BOOL=	zeroconf
 
-ICE_DESC=		Ice Support
-ICE_CMAKE_BOOL=		ice
 ICE_LIB_DEPENDS=	libIce.so:devel/ice
+ICE_CMAKE_BOOL=		ice
 
 LTO_CMAKE_BOOL=		lto
 
 MYSQL_USE=		QT=sql-mysql:run
 PGSQL_USE=		QT=sql-pgsql:run
 SQLITE_USE=		QT=sql-sqlite3:run
 
-USERS=		mumble-server
-GROUPS=		mumble-server
-
 .include <bsd.port.pre.mk>
 
 post-install:

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
@@ -31,10 +31,10 @@ USE_QT=		buildtools:build concurrent core dbus gui l10n linguist:build network \
 		qmake:build sql sql-sqlite3:run svg widgets xml
 USE_XORG=	x11 xext xi
 
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_ON=	client oss overlay plugins translations xinput2
 CMAKE_OFF=	bundled-gsl bundled-json bundle-qt-translations bundled-speex \
 		crash-report g15 server tracy update
-CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 
 CONFIGURE_ENV=	MUMBLE_PYTHON=${PYTHON_CMD}
 CXXFLAGS+=	-Wno-deprecated-declarations
@@ -50,8 +50,8 @@ OPTIONS_RADIO_SPEECH=	QTSPEECH SPEECHD
 OVERLAY_32BIT_DESC=	Build and install 32bit overlay module
 QTSPEECH_DESC=		Use Qt's text-to-speech system
 RNNOISE_DESC=		Use RNNoise for machine learning noise reduction
-SPEECH_DESC=		Support text-to-speech
 SPEECHD_DESC=		Support for Speech Dispatcher
+SPEECH_DESC=		Support text-to-speech
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	alsa

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
@@ -17,45 +17,44 @@ USES=		compiler:c++11-lang qmake pkgconfig python:build qt:5 ssl
 BROKEN_SSL=	openssl openssl31
 BROKEN_SSL_REASON=	Requires OpenSSL 3.0.0 deprecated CRYPTO_MEM_CHECK_ON
 USE_CXXSTD=	c++11
-USE_QT=		buildtools:build core network sql xml
-
 USE_GITHUB=	YES
 GH_ACCOUNT=	mumble-voip
 GH_PROJECT=	mumble
+USE_QT=		buildtools:build core network sql xml
+USE_RC_SUBR=	murmur
 
 CONFIG=		no-client
 QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 QMAKE_ENV+=	"MUMBLE_PYTHON=${PYTHON_CMD}"
 
-USE_RC_SUBR=	murmur
+PORTSCOUT=	limit:^1\.3\.
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
-PORTSCOUT=	limit:^1\.3\.
+USERS=		murmur
+GROUPS=		murmur
 
 OPTIONS_DEFINE=		BONJOUR DBUS DOCS ICE
 OPTIONS_DEFAULT=	BONJOUR MYSQL SQLITE
 OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL SQLITE
 
 BONJOUR_DESC=		Bonjour Support
-BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
+ICE_DESC=		Ice Support
+
 BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
+BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
 
-DBUS_VARS_OFF=		CONFIG+=no-dbus
 DBUS_USE=		QT=dbus
+DBUS_VARS_OFF=		CONFIG+=no-dbus
 
-ICE_DESC=		Ice Support
-ICE_VARS_OFF=		CONFIG+=no-ice
 ICE_LIB_DEPENDS=	libIce.so:devel/ice
+ICE_VARS_OFF=		CONFIG+=no-ice
 
-MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
 MYSQL_USE=		QT=sql-mysql
+MYSQL_VARS_OFF=		CONFIG+=no-sql-mysql
 
-SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
 SQLITE_USE=		QT=sql-sqlite3:run
-
-USERS=		murmur
-GROUPS=		murmur
+SQLITE_VARS_OFF=	CONFIG+=no-sqlite3_run
 
 .include <bsd.port.pre.mk>
 # PCH is broken on GCC

diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sqldeveloper
 DISTVERSION=	23.1.1.345.2114
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	-no-jre
+PORTREVISION=	2
 CATEGORIES=	databases java
 # https://www.oracle.com/tools/downloads/sqldev-downloads.html
 MASTER_SITES=

diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile
@@ -50,14 +50,13 @@ LIB_DEPENDS=		libdraco.so:archivers/draco \
 
 USES=		gl gnome
 USE_ANT=	yes
-USE_GL=		gl
-USE_GNOME=	glib20 gtk30
-USE_JAVA=	17+
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	LWJGL
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_TAGNAME=	de8bd86
+USE_GL=		gl
+USE_GNOME=	glib20 gtk30
+USE_JAVA=	17+
 
 MAKE_ARGS=	-Dbuild.offline=true \
 		-Djavadoc.skip=true \

diff --git a/graphics/khronos-texture/Makefile b/graphics/khronos-texture/Makefile
@@ -17,28 +17,25 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	KTX-Software
 
-OPTIONS_SINGLE=			SIMD
-OPTIONS_SINGLE_SIMD=		AVX2 NEON NONE SSE2 SSE41
-OPTIONS_EXCLUDE=		${${ARCH} != amd64 && ${ARCH} != i386:?AVX2 SSE2 SSE41:}
-OPTIONS_EXCLUDE+=		${${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != aarch64:?NEON:}
 OPTIONS_DEFAULT_aarch64=	NEON
 OPTIONS_DEFAULT_amd64=		SSE2
 OPTIONS_DEFAULT_armv7=		NEON
 OPTIONS_DEFAULT_OTHER_ARCHS=	NONE
+OPTIONS_SINGLE=			SIMD
+OPTIONS_SINGLE_SIMD=		AVX2 NEON NONE SSE2 SSE41
+OPTIONS_EXCLUDE=		${${ARCH} != amd64 && ${ARCH} != i386:?AVX2 SSE2 SSE41:}
+OPTIONS_EXCLUDE+=		${${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != aarch64:?NEON:}
 
 AVX2_DESC=		Use the AVX2 instruction set
-AVX2_CMAKE_ON=		-DASTCENC_ISA_AVX2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=ON
-
 NEON_DESC=		Use the NEON instruction set
-NEON_CMAKE_ON=		-DASTCENC_ISA_NEON:BOOL=ON
-
 NONE_DESC=		Don't use any SIMD instructions
-NONE_CMAKE_ON=		-DASTCENC_ISA_NONE:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
-
 SSE2_DESC=		Use the SSE2 instruction set
-SSE2_CMAKE_ON=		-DASTCENC_ISA_SSE2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
-
 SSE41_DESC=		Use the SSE4.1 instruction set
+
+AVX2_CMAKE_ON=		-DASTCENC_ISA_AVX2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=ON
+NEON_CMAKE_ON=		-DASTCENC_ISA_NEON:BOOL=ON
+NONE_CMAKE_ON=		-DASTCENC_ISA_NONE:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
+SSE2_CMAKE_ON=		-DASTCENC_ISA_SSE2:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=OFF
 SSE41_CMAKE_ON=		-DASTCENC_ISA_SSE41:BOOL=ON -DBASISU_SUPPORT_SSE:BOOL=ON
 
 .include <bsd.port.mk>
diff --git a/graphics/openxr/Makefile b/graphics/openxr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openxr
+DISTVERSIONPREFIX=	release-
 DISTVERSION=	1.0.34
 CATEGORIES=	graphics
-DISTVERSIONPREFIX=	release-
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	OpenXR provides access to Augmented and Virtual Reality (XR-platforms)

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
@@ -21,7 +21,6 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	saned
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-locking \
 		--enable-pthread \
 		--without-systemd

diff --git a/graphics/spirv-cross/Makefile b/graphics/spirv-cross/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	spirv-cross
+DISTVERSIONPREFIX=	vulkan-sdk-
 DISTVERSION=	1.3.280.0
 CATEGORIES=	graphics
-DISTVERSIONPREFIX=	vulkan-sdk-
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Tool for parsing and converting SPIR-V to other shader languages