aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Druzenko <vvd@FreeBSD.org>2024-04-13 14:36:06 +0000
committerVladimir Druzenko <vvd@FreeBSD.org>2024-04-13 14:39:12 +0000
commit43757efeb94c5864c62a1d58a6ea51aea66cdd9c (patch)
tree1f7adfbb6ba3a75d21159306d57bc8a436ca7b66
parentd866fc74bce5f709bd9232d6f915072198199e1b (diff)
downloadports-43757efeb94c5864c62a1d58a6ea51aea66cdd9c.tar.gz
ports-43757efeb94c5864c62a1d58a6ea51aea66cdd9c.zip
*/*: remove GNU_CONFIGURE_MANPREFIX and pet the portclippy
Approved by: arrowd (mentor)
-rw-r--r--audio/mumble-server/Makefile18
-rw-r--r--audio/mumble/Makefile4
-rw-r--r--audio/murmur/Makefile25
-rw-r--r--databases/sqldeveloper/Makefile2
-rw-r--r--games/lwjgl3/Makefile7
-rw-r--r--graphics/khronos-texture/Makefile21
-rw-r--r--graphics/openxr/Makefile2
-rw-r--r--graphics/sane-backends/Makefile1
-rw-r--r--graphics/spirv-cross/Makefile2
-rw-r--r--multimedia/lives/Makefile130
-rw-r--r--multimedia/smplayer-skins/Makefile4
-rw-r--r--multimedia/smplayer-themes/Makefile8
-rw-r--r--multimedia/smplayer/Makefile24
-rw-r--r--net/freerdp/Makefile47
-rw-r--r--net/freerdp3/Makefile94
-rw-r--r--www/tomcat-devel/Makefile6
-rw-r--r--www/tomcat101/Makefile6
-rw-r--r--www/tomcat85/Makefile6
-rw-r--r--www/tomcat9/Makefile6
19 files changed, 222 insertions, 191 deletions
diff --git a/audio/mumble-server/Makefile b/audio/mumble-server/Makefile
index 1902068cdddb..e99e491193b6 100644
--- a/audio/mumble-server/Makefile
+++ b/audio/mumble-server/Makefile
@@ -18,29 +18,32 @@ 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
@@ -48,9 +51,6 @@ 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
index ed4802b5337f..7f1284cd373d 100644
--- 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
index df4bfaea7a34..0f0a898268b0 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -17,20 +17,21 @@ 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
@@ -38,24 +39,22 @@ 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
index f08fb29748fa..2ed97edb0885 100644
--- 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
index ba62beff208c..6201422ea2d1 100644
--- 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
index 3613ec994511..ceb477d2643e 100644
--- 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
index eaddcbd93cce..2e998bd964ed 100644
--- 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
index 7996f406a60f..36d7d47d9466 100644
--- 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
index 8c161e613d7d..213620074d58 100644
--- 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
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 4b2d23eeb10d..de7f0c471061 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -26,25 +26,25 @@ RUN_DEPENDS= analyseplugin:audio/ladspa \
ffprobe:multimedia/ffmpeg \
sox:audio/sox
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
USES= autoreconf compiler:c++11-lib gettext-runtime gettext-tools \
gl gnome libtool localbase pathfix perl5 pkgconfig python \
sdl shebangfix xorg
+USE_GL= gl glu
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
+USE_LDCONFIG= yes
+USE_SDL= sdl sdl2
+USE_XORG= x11 xrender
+
SHEBANG_FILES= build-lives-rfx-plugin build-lives-rfx-plugin-multi smogrify \
tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \
lives-plugins/marcos-encoders/*encoder* \
lives-plugins/plugins/encoders/multi_encoder3 \
lives-plugins/plugins/playback/audiostream/audiostreamer.pl
GNU_CONFIGURE= yes
-USE_XORG= x11 xrender
-USE_GL= gl glu
-USE_SDL= sdl sdl2
-USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
-USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-ldvgrab --disable-prctl --disable-system-weed --disable-dirac
INSTALL_TARGET= install-strip
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
DOC_FILES= AUTHORS COPYING COPYING.LGPL ChangeLog FEATURES GETTING.STARTED NEWS README \
OMC/lives-OMC.txt RFX/LiVES-Perl.odt RFX/rfxbuilder.odt \
@@ -55,94 +55,130 @@ DOC_FILES= AUTHORS COPYING COPYING.LGPL ChangeLog FEATURES GETTING.STARTED NEWS
OPTIONS_DEFINE= ALSA DOCS DOXYGEN DV FFTW FREI0R JACK IMAGEMAGICK LIBEXPLAIN \
LIBVISUAL OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \
THEORA V4L WAYLAND
+OPTIONS_DEFAULT= CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
+ MPG123 MPLAYER NLS OGG123 OGG OGM OPENCV \
+ THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
OPTIONS_GROUP= RUNTIME EXT_WIN_CAPTURE MPLAYERS MP3
-OPTIONS_GROUP_RUNTIME= CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
- SSWF X264 XDG_SCREENSAVER XWININFO YTDLP
OPTIONS_GROUP_EXT_WIN_CAPTURE= WMCTRL XDOTOOL
OPTIONS_GROUP_MP3= MPG123 MPG321
OPTIONS_GROUP_MPLAYERS= MPLAYER MPV
-OPTIONS_DEFAULT= CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
- MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV \
- THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
+OPTIONS_GROUP_RUNTIME= CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
+ SSWF X264 XDG_SCREENSAVER XWININFO YTDLP
OPTIONS_SUB= yes
-ALSA_CONFIGURE_OFF= --disable-alsa
+EXT_WIN_CAPTURE_DESC= Allows external window capture via xdotool or wmctrl
+LIBEXPLAIN_DESC= Used to explain Unix and Linux system call errors
+MENCODER_DESC= Use mencoder as video file and movie encoder
+MP3_DESC= Runtime check order is: mpg321, mpg123, mplayer, mplayer2, mpv
+MPG321_DESC= MP3 decoding support via mpg321
+MPLAYERS_DESC= Install mplayer/mpv (runtime check)
+MPV_DESC= MPV media player support
+OGG123_DESC= Use ogg123 from vorbis-tools
+OGM_DESC= Use ogmtools for manipulating with OGM files
+PROJECTM_DESC= projectM support
+RUNTIME_DESC= Runtime detected utilities
+SSWF_DESC= Use sswf for manipulating with Flash movies
+WMCTRL_DESC= Install wmctrl
+XDG_SCREENSAVER_DESC= Used to disable screensaver during playback
+XDOTOOL_DESC= Install xdotool
+XWININFO_DESC= Used for external window capture
+YTDLP_DESC= Install yt-dlp (youtube-dl fork) - requires SYMLINK option
+
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_OFF= --disable-alsa
+
CDDA2WAV_RUN_DEPENDS= cdda2wav:sysutils/cdrtools
+
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_CONFIGURE_OFF= --disable-doxygen
-DV_CONFIGURE_OFF= --disable-libdv
+
DV_LIB_DEPENDS= libdv.so:multimedia/libdv
DV_RUN_DEPENDS= encodedv:multimedia/libdv
-EXT_WIN_CAPTURE_DESC= Allows external window capture via xdotool or wmctrl
-FFTW_CONFIGURE_OFF= --disable-fftw3f
+DV_CONFIGURE_OFF= --disable-libdv
+
FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 \
libfftw3f.so:math/fftw3-float
+FFTW_CONFIGURE_OFF= --disable-fftw3f
+
FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r
-FREI0R_CONFIGURE_OFF= --disable-frei0r
FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r
+FREI0R_CONFIGURE_OFF= --disable-frei0r
+
GHOSTSCRIPT_USES= ghostscript:run
+
IMAGEMAGICK_USES= magick:run
-JACK_CONFIGURE_OFF= --disable-jack
+
JACK_LIB_DEPENDS= libjack.so:audio/jack \
libjackserver.so:audio/jack
+JACK_CONFIGURE_OFF= --disable-jack
+
LAME_RUN_DEPENDS= lame:audio/lame
-LIBEXPLAIN_CONFIGURE_OFF= --disable-libexplain
-LIBEXPLAIN_DESC= Used to explain Unix and Linux system call errors
+
LIBEXPLAIN_LIB_DEPENDS= libexplain.so:devel/libexplain
-LIBVISUAL_CONFIGURE_OFF= --disable-libvisual
+LIBEXPLAIN_CONFIGURE_OFF= --disable-libexplain
+
LIBVISUAL_LIB_DEPENDS= libvisual-0.4.so:graphics/libvisual04
+LIBVISUAL_CONFIGURE_OFF= --disable-libvisual
+
MATROSKA_RUN_DEPENDS= mkvmerge:multimedia/mkvtoolnix
+
MENCODER_RUN_DEPENDS= mencoder:multimedia/mencoder
-MENCODER_DESC= Use mencoder as video file and movie encoder
-MP3_DESC= Runtime check order is: mpg321, mpg123, mplayer, mplayer2, mpv
+
MPG123_RUN_DEPENDS= mpg123:audio/mpg123
-MPG321_DESC= MP3 decoding support via mpg321
+
MPG321_RUN_DEPENDS= mpg321:audio/mpg321
+
MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer
-MPLAYERS_DESC= Install mplayer/mpv (runtime check)
-MPV_DESC= MPV media player support
+
MPV_RUN_DEPENDS= mpv:multimedia/mpv
+
NLS_USES= gettext-tools
-OGG_CONFIGURE_OFF= --disable-ogg
-OGG_LIB_DEPENDS= libogg.so:audio/libogg
-OGG123_DESC= Use ogg123 from vorbis-tools
+
OGG123_RUN_DEPENDS= ogg123:audio/vorbis-tools
-OGM_DESC= Use ogmtools for manipulating with OGM files
+
+OGG_LIB_DEPENDS= libogg.so:audio/libogg
+OGG_CONFIGURE_OFF= --disable-ogg
+
OGM_RUN_DEPENDS= ogmmerge:multimedia/ogmtools
-OPENCV_CONFIGURE_OFF= --disable-opencv
+
OPENCV_LIB_DEPENDS= libopencv_calib3d.so:graphics/opencv \
libopencv_core.so:graphics/opencv
-SSWF_DESC= Use sswf for manipulating with Flash movies
-SSWF_RUN_DEPENDS= sswf:graphics/sswf
-THEORA_CONFIGURE_OFF= --disable-theora
-THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
+OPENCV_CONFIGURE_OFF= --disable-opencv
+
OPTIMIZED_CFLAGS_CONFIGURE_ON= --enable-turbo
-PROJECTM_CONFIGURE_OFF= --disable-projectM
-PROJECTM_DESC= projectM support
+
PROJECTM_LIB_DEPENDS= libprojectM.so:graphics/libprojectm
-PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
+PROJECTM_CONFIGURE_OFF= --disable-projectM
+
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
-RUNTIME_DESC= Runtime detected utilities
+PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
+
+SSWF_RUN_DEPENDS= sswf:graphics/sswf
+
+THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
+THEORA_CONFIGURE_OFF= --disable-theora
+
V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
-V4L_CONFIGURE_OFF= --disable-v4l
V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
-WAYLAND_CONFIGURE_OFF= --disable-wayland
+V4L_CONFIGURE_OFF= --disable-v4l
+
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libwayland-egl.so:graphics/wayland \
libwayland-cursor.so:graphics/wayland
-WMCTRL_DESC= Install wmctrl
+WAYLAND_CONFIGURE_OFF= --disable-wayland
+
WMCTRL_RUN_DEPENDS= wmctrl:x11/wmctrl
-YTDLP_DESC= Install yt-dlp (youtube-dl fork) - requires SYMLINK option
-YTDLP_RUN_DEPENDS= yt-dlp:www/yt-dlp
+
X264_RUN_DEPENDS= x264:multimedia/x264
-XDG_SCREENSAVER_DESC= Used to disable screensaver during playback
+
XDG_SCREENSAVER_RUN_DEPENDS= xdg-screensaver:devel/xdg-utils
-XDOTOOL_DESC= Install xdotool
+
XDOTOOL_RUN_DEPENDS= xdotool:x11/xdotool
-XWININFO_DESC= Used for external window capture
+
XWININFO_RUN_DEPENDS= xwininfo:x11/xwininfo
+YTDLP_RUN_DEPENDS= yt-dlp:www/yt-dlp
+
post-patch:
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
's/^LIBS = $$/&@LIBS@/'
diff --git a/multimedia/smplayer-skins/Makefile b/multimedia/smplayer-skins/Makefile
index eef8b6464c14..5b7bf6c93671 100644
--- a/multimedia/smplayer-skins/Makefile
+++ b/multimedia/smplayer-skins/Makefile
@@ -12,12 +12,12 @@ WWW= https://www.smplayer.info/
USES= qt:5 tar:bzip2
USE_QT= buildtools:build
-NO_ARCH= yes
-
DATADIR= ${PREFIX}/share/smplayer
BINARY_ALIAS= rcc=${RCC}
+NO_ARCH= yes
+
post-patch:
@${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
${WRKSRC}/Makefile
diff --git a/multimedia/smplayer-themes/Makefile b/multimedia/smplayer-themes/Makefile
index 2c9e91a4dd5b..7a0b0674028a 100644
--- a/multimedia/smplayer-themes/Makefile
+++ b/multimedia/smplayer-themes/Makefile
@@ -12,15 +12,15 @@ WWW= https://www.smplayer.info/
USES= qt:5 tar:bzip2
USE_QT= buildtools:build
-NO_ARCH= yes
-
DATADIR= ${PREFIX}/share/smplayer
+BINARY_ALIAS= rcc=${RCC}
+
+NO_ARCH= yes
+
PORTDOCS= Changelog README.txt
OPTIONS_DEFINE= DOCS
-BINARY_ALIAS= rcc=${RCC}
-
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index b5d5c4a2ce4f..9ccfd5917d19 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -12,28 +12,33 @@ LICENSE_FILE= ${WRKSRC}/Copying.txt
USES= cpe compiler:c++11-lang desktop-file-utils dos2unix gl \
gmake qmake qt:5 tar:bzip2 xorg
+CPE_VENDOR= ricardo_villalba
+DOS2UNIX_GLOB= *.md *.txt
USE_GL= gl
USE_QT= buildtools:build linguisttools:build \
core dbus declarative gui network widgets xml
USE_XORG= x11 xext
-CPE_VENDOR= ricardo_villalba
-DOS2UNIX_GLOB= *.md *.txt
-
+QMAKE_ARGS= "DEFINES_DISABLED+=MPLAYER2_SUPPORT"
+MAKE_ENV= DESTDIR=${STAGEDIR} LRELEASE=${LRELEASE}
ALL_TARGET= src/smplayer
+
+# Do not use unstable versions
+PORTSCOUT= site:http://sourceforge.net/projects/smplayer/files/Unstable/releases/
+
+SUB_FILES= pkg-message
+
CONFIGURE_WRKSRC= ${WRKSRC}/src
-MAKE_ENV= DESTDIR=${STAGEDIR} LRELEASE=${LRELEASE}
-QMAKE_ARGS= "DEFINES_DISABLED+=MPLAYER2_SUPPORT"
PORTDOCS= ${DOCS:T}
DOCS= old-docs/Changelog old-docs/dvdmenus.txt old-docs/Finding_subtitles.txt \
old-docs/Not_so_obvious_things.txt old-docs/Release_notes.txt \
old-docs/Watching_TV.txt README.md Readme.txt Release_notes.md
-OPTIONS_MULTI= ENGINE
-OPTIONS_MULTI_ENGINE= MPLAYER MPV
OPTIONS_DEFINE= DOCS DEBUG SKINS THEMES
OPTIONS_DEFAULT= MPV SKINS THEMES
+OPTIONS_MULTI= ENGINE
+OPTIONS_MULTI_ENGINE= MPLAYER MPV
ENGINE_DESC= Multimedia engine
MPLAYER_DESC= Allow to use MPlayer as multimedia engine
@@ -50,11 +55,6 @@ MPV_QMAKE_OFF= "DEFINES_DISABLED+=MPV_SUPPORT"
SKINS_RUN_DEPENDS= smplayer-skins>=0:multimedia/smplayer-skins
THEMES_RUN_DEPENDS= smplayer-themes>=0:multimedia/smplayer-themes
-# Do not use unstable versions
-PORTSCOUT= site:http://sourceforge.net/projects/smplayer/files/Unstable/releases/
-
-SUB_FILES= pkg-message
-
post-patch:
@${REINPLACE_CMD} -e 's|-O2 -W -Wall -Werror|${CFLAGS}|' \
${WRKSRC}/webserver/Makefile
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index c0a9a5c14ff9..984997c031bd 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -17,12 +17,13 @@ WWW= https://www.freerdp.com/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_SSL= libressl-devel
-BROKEN_SSL_REASON_libressl-devel= fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
-
LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim
USES= alias cmake compiler:c++11-lib cpe localbase pathfix pkgconfig ssl
+
+BROKEN_SSL= libressl-devel
+BROKEN_SSL_REASON_libressl-devel= fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
+
USE_LDCONFIG= yes
PATCHVERSION= ${DISTVERSION}
@@ -36,38 +37,44 @@ CMAKE_OFF= WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSSAPI WITH_GSTREAMER_0_10 WITH
WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
+PORTSCOUT= limit:^2\.
+
PLIST_SUB+= PATCHVERSION="${PATCHVERSION}"
PLIST_SUB+= MAJORVERSION="${MAJORVERSION}"
-PORTSCOUT= limit:^2\.
-
OPTIONS_DEFINE= ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG GSM GSTREAMER \
ICU JPEG LAME MANPAGES OPENH264 PCSC \
PULSEAUDIO SOXR WAYLAND X11
-OPTIONS_DEFAULT= CUPS GSTREAMER ICU MANPAGES SWSCALE WAYLAND X11
-OPTIONS_RADIO= SCALE
-OPTIONS_RADIO_SCALE= CAIRO SWSCALE
-OPTIONS_SUB= yes
-
OPTIONS_DEFINE_aarch64= NEON
OPTIONS_DEFINE_amd64= SSE
OPTIONS_DEFINE_armv6= NEON
OPTIONS_DEFINE_armv7= NEON
OPTIONS_DEFINE_i386= SSE
+OPTIONS_DEFAULT= CUPS GSTREAMER ICU MANPAGES SWSCALE WAYLAND X11
OPTIONS_DEFAULT_aarch64= NEON
OPTIONS_DEFAULT_amd64= SSE
OPTIONS_DEFAULT_armv7= NEON
+OPTIONS_RADIO= SCALE
+OPTIONS_RADIO_SCALE= CAIRO SWSCALE
+OPTIONS_SUB= yes
+
+BROKENFOCUS_DESC= Work around focus bug in some WMs (PR \#254908)
+CAIRO_DESC= Use CAIRO image library for screen resizing
+NEON_DESC= Enable Media Processing Engine instructions
+OPENH264_DESC= H.264 video codec support via OpenH264
+PCSC_DESC= Smart card support (smart card device redirection)
+SWSCALE_DESC= Use SWScale image library for screen resizing (recommended)
+WAYLAND_DESC= Build FreeRDP Wayland client
+X11_DESC= Build FreeRDP X11 client
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CMAKE_BOOL= WITH_ALSA
-BROKENFOCUS_DESC= Work around focus bug in some WMs (PR \#254908)
BROKENFOCUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-focusbug.diff
-CAIRO_DESC= Use CAIRO image library for screen resizing
-CAIRO_CMAKE_BOOL= WITH_CAIRO
CAIRO_USES= gnome
CAIRO_USE= gnome=cairo
+CAIRO_CMAKE_BOOL= WITH_CAIRO
CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_CMAKE_BOOL= WITH_CUPS
@@ -85,10 +92,10 @@ FFMPEG_CMAKE_BOOL= WITH_FFMPEG WITH_DSP_FFMPEG
GSM_LIB_DEPENDS= libgsm.so:audio/gsm
GSM_CMAKE_BOOL= WITH_GSM
-GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 CHANNEL_TSMF
+GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1
GSTREAMER_USES= gettext gnome gstreamer xorg
GSTREAMER_USE= gnome=glib20 xorg=x11,xext,xorgproto,xrandr
-GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1
+GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 CHANNEL_TSMF
ICU_LIB_DEPENDS= libicuuc.so:devel/icu
ICU_CMAKE_BOOL= WITH_ICU
@@ -102,14 +109,11 @@ LAME_CMAKE_BOOL= WITH_LAME
MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto
MANPAGES_CMAKE_BOOL= WITH_MANPAGES
-NEON_DESC= Enable Media Processing Engine instructions
NEON_CMAKE_BOOL= WITH_NEON
-OPENH264_DESC= H.264 video codec support via OpenH264
OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264
OPENH264_CMAKE_BOOL= WITH_OPENH264
-PCSC_DESC= Smart card support (smart card device redirection)
# LoadLibraryA("libpcsclite.so")
PCSC_LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite
PCSC_CMAKE_BOOL= WITH_PCSC
@@ -122,11 +126,9 @@ SOXR_CMAKE_BOOL= WITH_SOXR
SSE_CMAKE_BOOL= WITH_SSE2
-SWSCALE_DESC= Use SWScale image library for screen resizing (recommended)
SWSCALE_LIB_DEPENDS= libswscale.so:multimedia/ffmpeg
SWSCALE_CMAKE_BOOL= WITH_SWSCALE
-WAYLAND_DESC= Build FreeRDP Wayland client
WAYLAND_CATEGORIES= wayland
WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
@@ -134,7 +136,8 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libxkbcommon.so:x11/libxkbcommon
WAYLAND_CMAKE_BOOL= WITH_WAYLAND
-X11_DESC= Build FreeRDP X11 client
+X11_USES= xorg
+X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
X11_CMAKE_ON= -DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
-DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \
@@ -142,8 +145,6 @@ X11_CMAKE_ON= -DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
-DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \
-DWITH_XV:BOOL=ON
X11_CMAKE_OFF= -DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF
-X11_USES= xorg
-X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
post-patch:
@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile
index 7d102ef502eb..4bd93dfd4915 100644
--- a/net/freerdp3/Makefile
+++ b/net/freerdp3/Makefile
@@ -13,14 +13,15 @@ WWW= https://www.freerdp.com/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_SSL= libressl-devel
-BROKEN_SSL_REASON_libressl-devel= fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
-
LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim
USES= alias cmake compiler:c++11-lib cpe localbase:ldflags pathfix pkgconfig ssl xorg
-USE_XORG= ice sm x11 xext
+
+BROKEN_SSL= libressl-devel
+BROKEN_SSL_REASON_libressl-devel= fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
+
USE_LDCONFIG= yes
+USE_XORG= ice sm x11 xext
CMAKE_ARGS+= ${CMAKE_ARGS_${ARCH}}
CMAKE_ON= CHANNEL_URBDRC_CLIENT RDTK_FORCE_STATIC_BUILD UWAC_FORCE_STATIC_BUILD \
@@ -35,28 +36,41 @@ CMAKE_OFF= WITH_DSP_EXPERIMENTAL WITH_FUSE WITH_GPROF WITH_GSTREAMER_0_10 WITH_I
PLIST_SUB+= PATCHVERSION="${DISTVERSION}"
PLIST_SUB+= MAJORVERSION="${DISTVERSION:R:R}"
-OPTIONS_DEFINE= AAD ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG \
- GSM GSTREAMER ICU JPEG LAME MANPAGES OPENH264 OPUS PCSC \
- PKCS11 PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11
-OPTIONS_DEFAULT= AAD CUPS GSSAPI_HEIMDAL GSTREAMER ICU MANPAGES \
- SDL SWSCALE WAYLAND X11
-OPTIONS_GROUP= CLIPBOARD_IMAGE
-OPTIONS_GROUP_CLIPBOARD_IMAGE= JPEG_CB PNG WEBP
-OPTIONS_RADIO= GSSAPI SCALE
-OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
-OPTIONS_RADIO_SCALE= CAIRO SWSCALE
-OPTIONS_SUB= yes
-
-OPTIONS_DEFINE_aarch64= NEON
-OPTIONS_DEFINE_amd64= SSE
-OPTIONS_DEFINE_armv6= NEON
-OPTIONS_DEFINE_armv7= NEON
-OPTIONS_DEFINE_i386= SSE
+OPTIONS_DEFINE= AAD ALSA BROKENFOCUS CUPS FAAC FAAD FFMPEG \
+ GSM GSTREAMER ICU JPEG LAME MANPAGES OPENH264 OPUS PCSC \
+ PKCS11 PULSEAUDIO SDL SOXR URIPARSER WAYLAND X11
+OPTIONS_DEFINE_aarch64= NEON
+OPTIONS_DEFINE_amd64= SSE
+OPTIONS_DEFINE_armv6= NEON
+OPTIONS_DEFINE_armv7= NEON
+OPTIONS_DEFINE_i386= SSE
+OPTIONS_DEFAULT= AAD CUPS GSSAPI_HEIMDAL GSTREAMER ICU MANPAGES \
+ SDL SWSCALE WAYLAND X11
OPTIONS_DEFAULT_aarch64= NEON
-OPTIONS_DEFAULT_amd64= SSE
-OPTIONS_DEFAULT_armv7= NEON
+OPTIONS_DEFAULT_amd64= SSE
+OPTIONS_DEFAULT_armv7= NEON
+OPTIONS_GROUP= CLIPBOARD_IMAGE
+OPTIONS_GROUP_CLIPBOARD_IMAGE= JPEG_CB PNG WEBP
+OPTIONS_RADIO= GSSAPI SCALE
+OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
+OPTIONS_RADIO_SCALE= CAIRO SWSCALE
+OPTIONS_SUB= yes
AAD_DESC= Compile with support for Azure AD authentication
+BROKENFOCUS_DESC= Work around focus bug in some WMs (PR \#254908)
+CAIRO_DESC= Use CAIRO image library for screen resizing
+CLIPBOARD_IMAGE_DESC= Add "to/from" BMP conversion support to clipboard (experimental)
+JPEG_CB_DESC= ${JPEG_DESC}
+NEON_DESC= Enable Media Processing Engine instructions
+OPENH264_DESC= H.264 video codec support via OpenH264
+PCSC_DESC= Smart card support (smart card device redirection)
+PKCS11_DESC= Use security/pkcs11-helper
+SDL_DESC= Build FreeRDP SDL client
+SWSCALE_DESC= Use SWScale image library for screen resizing (recommended)
+URIPARSER_DESC= Use uriparser RFC 3986 URI parsing library to handle URIs
+WAYLAND_DESC= Build FreeRDP Wayland client
+X11_DESC= Build FreeRDP X11 client
+
AAD_LIB_DEPENDS= libcjson.so:devel/libcjson \
libcjson_utils.so:devel/libcjson
AAD_CMAKE_BOOL= WITH_AAD
@@ -64,15 +78,11 @@ AAD_CMAKE_BOOL= WITH_AAD
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CMAKE_BOOL= WITH_ALSA
-BROKENFOCUS_DESC= Work around focus bug in some WMs (PR \#254908)
BROKENFOCUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-focusbug.diff
-CAIRO_DESC= Use CAIRO image library for screen resizing
-CAIRO_CMAKE_BOOL= WITH_CAIRO
CAIRO_USES= gnome
CAIRO_USE= gnome=cairo
-
-CLIPBOARD_IMAGE_DESC= Add "to/from" BMP conversion support to clipboard (experimental)
+CAIRO_CMAKE_BOOL= WITH_CAIRO
CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_CMAKE_BOOL= WITH_CUPS
@@ -90,24 +100,23 @@ FFMPEG_CMAKE_BOOL= WITH_FFMPEG WITH_DSP_FFMPEG
GSM_LIB_DEPENDS= libgsm.so:audio/gsm
GSM_CMAKE_BOOL= WITH_GSM
+GSSAPI_HEIMDAL_USES= gssapi:heimdal
+GSSAPI_MIT_USES= gssapi:mit
+
GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1
-GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 CHANNEL_TSMF
GSTREAMER_USES= gettext gnome gstreamer xorg
GSTREAMER_USE= gnome=glib20 xorg=x11,xext,xorgproto,xrandr
-
-GSSAPI_HEIMDAL_USES= gssapi:heimdal
-GSSAPI_MIT_USES= gssapi:mit
+GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 CHANNEL_TSMF
ICU_LIB_DEPENDS= libicuuc.so:devel/icu
ICU_CMAKE_ON= -DWITH_UNICODE_BUILTIN=OFF
ICU_CMAKE_OFF= -DWITH_UNICODE_BUILTIN=ON
-JPEG_CMAKE_BOOL= WITH_JPEG
JPEG_USES= jpeg
+JPEG_CMAKE_BOOL= WITH_JPEG
-JPEG_CB_DESC= ${JPEG_DESC}
-JPEG_CB_CMAKE_BOOL= WINPR_UTILS_IMAGE_JPEG
JPEG_CB_USES= jpeg
+JPEG_CB_CMAKE_BOOL= WINPR_UTILS_IMAGE_JPEG
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
LAME_CMAKE_BOOL= WITH_LAME
@@ -115,22 +124,18 @@ LAME_CMAKE_BOOL= WITH_LAME
MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto
MANPAGES_CMAKE_BOOL= WITH_MANPAGES
-NEON_DESC= Enable Media Processing Engine instructions
NEON_CMAKE_BOOL= WITH_NEON
-OPENH264_DESC= H.264 video codec support via OpenH264
OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264
OPENH264_CMAKE_BOOL= WITH_OPENH264
OPUS_LIB_DEPENDS= libopus.so:audio/opus
OPUS_CMAKE_BOOL= WITH_OPUS
-PCSC_DESC= Smart card support (smart card device redirection)
# LoadLibraryA("libpcsclite.so")
PCSC_LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite
PCSC_CMAKE_BOOL= WITH_PCSC
-PKCS11_DESC= Use security/pkcs11-helper
PKCS11_BUILD_DEPENDS= ${LOCALBASE}/include/pkcs11-helper-1.0/pkcs11.h:security/pkcs11-helper
PKCS11_CMAKE_BOOL= WITH_PKCS11
@@ -140,29 +145,25 @@ PNG_CMAKE_BOOL= WINPR_UTILS_IMAGE_PNG
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= WITH_PULSE
-SDL_DESC= Build FreeRDP SDL client
SDL_LIB_DEPENDS= libatk-1.0.so:accessibility/at-spi2-core \
libsoup-2.4.so:devel/libsoup \
libharfbuzz.so:print/harfbuzz \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
-SDL_CMAKE_BOOL= WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS
SDL_USES= gettext gnome sdl
SDL_USE= gnome=cairo,gdkpixbuf2,glib20,gtk30,pango sdl=sdl2,ttf2,image2
+SDL_CMAKE_BOOL= WITH_CLIENT_SDL WITH_SDL_IMAGE_DIALOGS
SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
SOXR_CMAKE_BOOL= WITH_SOXR
SSE_CMAKE_BOOL= WITH_SSE2
-SWSCALE_DESC= Use SWScale image library for screen resizing (recommended)
SWSCALE_LIB_DEPENDS= libswscale.so:multimedia/ffmpeg
SWSCALE_CMAKE_BOOL= WITH_SWSCALE
-URIPARSER_DESC= Use uriparser RFC 3986 URI parsing library to handle URIs
URIPARSER_LIB_DEPENDS= liburiparser.so:net/uriparser
URIPARSER_CMAKE_BOOL= WITH_URIPARSER
-WAYLAND_DESC= Build FreeRDP Wayland client
WAYLAND_CATEGORIES= wayland
WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
wayland-scanner:graphics/wayland
@@ -175,7 +176,8 @@ WAYLAND_CMAKE_BOOL= WITH_WAYLAND
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
WEBP_CMAKE_BOOL= WINPR_UTILS_IMAGE_WEBP
-X11_DESC= Build FreeRDP X11 client
+X11_USES= xorg
+X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
X11_CMAKE_ON= -DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
-DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \
-DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \
@@ -183,8 +185,6 @@ X11_CMAKE_ON= -DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \
-DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \
-DWITH_XV:BOOL=ON
X11_CMAKE_OFF= -DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF
-X11_USES= xorg
-X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
.include <bsd.port.options.mk>
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 03c0b3c9f6b2..a17d75ee989e 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -21,12 +21,12 @@ USE_RC_SUBR= ${PKGBASE:C/-/_/}
NO_ARCH= yes
NO_BUILD= yes
-PLIST_SUB= T=${TOMCAT_SUBDIR} \
- WWWOWN=${WWWOWN} \
- WWWGRP=${WWWGRP}
SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \
TOMCAT_USER=${WWWOWN} \
JAVA_HOME=${JAVA_HOME}
+PLIST_SUB= T=${TOMCAT_SUBDIR} \
+ WWWOWN=${WWWOWN} \
+ WWWGRP=${WWWGRP}
OPTIONS_DEFINE= HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
OPTIONS_DEFAULT= HOST_MANAGER MANAGER ROOT
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index ddc2e1f853b6..9e3dd97f0d39 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -21,12 +21,12 @@ USE_RC_SUBR= ${PKGBASE:C/-/_/}
NO_ARCH= yes
NO_BUILD= yes
-PLIST_SUB= T=${TOMCAT_SUBDIR} \
- WWWOWN=${WWWOWN} \
- WWWGRP=${WWWGRP}
SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \
TOMCAT_USER=${WWWOWN} \
JAVA_HOME=${JAVA_HOME}
+PLIST_SUB= T=${TOMCAT_SUBDIR} \
+ WWWOWN=${WWWOWN} \
+ WWWGRP=${WWWGRP}
OPTIONS_DEFINE= HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
OPTIONS_DEFAULT= HOST_MANAGER MANAGER ROOT
diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index 07cbcd5ab233..22d33b283269 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -24,12 +24,12 @@ USE_RC_SUBR= ${PKGBASE:C/-/_/}
NO_ARCH= yes
NO_BUILD= yes
-PLIST_SUB= T=${TOMCAT_SUBDIR} \
- WWWOWN=${WWWOWN} \
- WWWGRP=${WWWGRP}
SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \
TOMCAT_USER=${WWWOWN} \
JAVA_HOME=${JAVA_HOME}
+PLIST_SUB= T=${TOMCAT_SUBDIR} \
+ WWWOWN=${WWWOWN} \
+ WWWGRP=${WWWGRP}
OPTIONS_DEFINE= HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
OPTIONS_DEFAULT= HOST_MANAGER MANAGER ROOT
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 2dd0d8397fae..06ff5b6d1331 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -21,12 +21,12 @@ USE_RC_SUBR= ${PKGBASE:C/-/_/}
NO_ARCH= yes
NO_BUILD= yes
-PLIST_SUB= T=${TOMCAT_SUBDIR} \
- WWWOWN=${WWWOWN} \
- WWWGRP=${WWWGRP}
SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \
TOMCAT_USER=${WWWOWN} \
JAVA_HOME=${JAVA_HOME}
+PLIST_SUB= T=${TOMCAT_SUBDIR} \
+ WWWOWN=${WWWOWN} \
+ WWWGRP=${WWWGRP}
OPTIONS_DEFINE= HOST_MANAGER MANAGER DOCS EXAMPLES ROOT NLS
OPTIONS_DEFAULT= HOST_MANAGER MANAGER ROOT