net/xrdp: Relax dependency on x11-drivers/xorgxrdp

Now x11-drivers/xorgxrdp provides the default xorg flavor and the xlibre
flavor.

To avoid tying xrdp to a specific xorgxrdp flavor, the runtime
dependency on xorgxrdp has been removed. In addition, pkg-message has
been updated to instruct users to install either flavor of xorgxrdp
according to their environment.
This commit is contained in:
Koichiro Iwao
2026-02-04 08:49:37 +09:00
parent d04570a49a
commit ff32f199e4
2 changed files with 17 additions and 16 deletions

View File

@@ -1,5 +1,6 @@
PORTNAME= xrdp
DISTVERSION= 0.10.5
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= https://github.com/neutrinolabs/${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -16,8 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm
LIB_DEPENDS= libImlib2.so:graphics/imlib2
RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
xterm:x11/xterm
RUN_DEPENDS= xterm:x11/xterm
USES= autoreconf:build compiler:c11 cpe jpeg libtool localbase \
pkgconfig ssl xorg
@@ -26,6 +26,7 @@ USE_LDCONFIG= ${PREFIX}/lib/xrdp
USE_XORG= ice pixman sm x11 xfixes xrandr
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
CONFIGURE_ARGS= --enable-imlib2 \
--enable-jpeg \
--enable-painter \
@@ -70,8 +71,6 @@ OPUS_CONFIGURE_ENABLE= opus
X264_LIB_DEPENDS= libx264.so:multimedia/libx264
X264_CONFIGURE_ENABLE= x264
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
GROUP= _xrdp
USER= _xrdp

View File

@@ -1,22 +1,24 @@
[
{ type: install
message: <<EOM
xrdp has been installed.
The following step are required for a complete xrdp setup.
There is an rc.d script, so the service can be enabled by adding this line
in /etc/rc.conf:
1) Edit the configuration files in "%%ETCDIR%%" and the
"%%ETCDIR%%/startwm.sh" script.
xrdp_enable="YES"
xrdp_sesman_enable="YES"
2) Install either of the following packages depending on your needs:
- pkg install x11-drivers/xorgxrdp (xorg flavor)
- pkg install x11-drivers/xorgxrdp@xlibre (xlibre flavor)
Do not forget to edit the configuration files in "%%ETCDIR%%"
and the "%%ETCDIR%%/startwm.sh" script.
3) To enable audio redirection, install either of the following packages
according to your environment:
- pkg install audio/pipewire-module-xrdp
- pkg install audio/pulseaudio-module-xrdp
To enable audio redirection, install the following ports/packages to meet
your environment.
- audio/pipewire-module-xrdp
- audio/pulseaudio-module-xrdp
4) Enable and start xrdp daemons:
- sysrc xrdp_enable="YES"
- sysrc xrdp_sesman_enable="YES"
- service xrdp allstart
EOM
}