aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2012-12-26 12:27:15 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2012-12-26 12:27:15 +0000
commit4264a1b54e4a07e4042a57ab2d6a4ad5076e517d (patch)
tree72f18caecb340781a25328ee2049bcc842d61f37 /net
parentf178cb85a403864fcbbc410ea4a0b720003c168a (diff)
downloadports-4264a1b54e4a07e4042a57ab2d6a4ad5076e517d.tar.gz
ports-4264a1b54e4a07e4042a57ab2d6a4ad5076e517d.zip
Notes
Diffstat (limited to 'net')
-rw-r--r--net/xrdp/Makefile9
-rw-r--r--net/xrdp/files/pkg-message.in1
-rw-r--r--net/xrdp/files/xrdp.in11
-rw-r--r--net/xrdp/pkg-descr2
-rw-r--r--net/xrdp/pkg-plist48
5 files changed, 38 insertions, 33 deletions
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 8d9515c03efe..9014b9384542 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: xrdp
-# Date created: 2007-02-19
-# Whom: alepulver
-#
+# Created by: alepulver
# $FreeBSD$
-#
PORTNAME= xrdp
PORTVERSION= 0.6.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/xrdp/xrdp/${PORTVERSION}
@@ -79,6 +76,8 @@ post-install:
${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \
fi
.endfor
+ @cmp -s ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini || \
+ ${PREFIX}/bin/xrdp-keygen xrdp ${PREFIX}/etc/xrdp/rsakeys.ini
@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
.include <bsd.port.mk>
diff --git a/net/xrdp/files/pkg-message.in b/net/xrdp/files/pkg-message.in
index 8fec8751eee0..7d4e3914601e 100644
--- a/net/xrdp/files/pkg-message.in
+++ b/net/xrdp/files/pkg-message.in
@@ -6,6 +6,7 @@ There is an rc.d script, so the service can be enabled by adding this line
in /etc/rc.conf:
xrdp_enable="YES"
+xrdp_sesman_enable="YES" # if you want to run xrdp-sesman on the same machine
Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
and the "%%PREFIX%%/etc/xrdp/startwm.sh" script.
diff --git a/net/xrdp/files/xrdp.in b/net/xrdp/files/xrdp.in
index ff239e0b0e10..5009343e2aa7 100644
--- a/net/xrdp/files/xrdp.in
+++ b/net/xrdp/files/xrdp.in
@@ -3,19 +3,24 @@
# $FreeBSD$
#
# REQUIRE: DAEMON
-# PROVIDE: xrdp sesman
+# PROVIDE: xrdp xrdp_sesman
#
. /etc/rc.subr
name="xrdp"
rcvar=xrdp_enable
-xrdp_daemons="xrdp xrdpsesman"
+xrdp_daemons="xrdp"
# Read settings and set default values.
load_rc_config "$name"
: ${xrdp_enable="NO"}
+# Enable/disable dependent daemon.
+if [ -n "${rcvar}" ] && checkyesno "xrdp_sesman_enable"; then
+ xrdp_daemons="xrdp xrdp_sesman"
+fi
+
# Commands.
extra_commands="reload status"
start_cmd="xrdp_cmd"
@@ -36,7 +41,7 @@ xrdp_cmd() {
# Apply to all the daemons.
for name in ${xrdp_daemons}; do
rcvar=${name}_enable
- if [ "${name}" = "xrdpsesman" ]; then
+ if [ "${name}" = "xrdp_sesman" ]; then
command="%%PREFIX%%/sbin/xrdp-sesman"
pidfile="/var/run/xrdp-sesman.pid"
else
diff --git a/net/xrdp/pkg-descr b/net/xrdp/pkg-descr
index 9561b67ea0ad..19b641051001 100644
--- a/net/xrdp/pkg-descr
+++ b/net/xrdp/pkg-descr
@@ -10,4 +10,4 @@ but an X window desktop to the user.
Xrdp uses Xvnc or X11rdp to manage the X session.
-WWW: http://xrdp.sourceforge.net/
+WWW: http://www.xrdp.org/
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index 389771974fcb..913704238cc2 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -5,30 +5,6 @@ bin/xrdp-keygen
bin/xrdp-sesadmin
bin/xrdp-sesrun
bin/xrdp-sestest
-etc/pam.d/xrdp-sesman
-etc/xrdp/km-0407.ini
-etc/xrdp/km-0409.ini
-etc/xrdp/km-040c.ini
-etc/xrdp/km-0410.ini
-etc/xrdp/km-0419.ini
-etc/xrdp/km-041d.ini
-%%JP106%%etc/xrdp/km-0411.ini
-%%JP106%%etc/xrdp/km-e0200411.ini
-%%JP106%%etc/xrdp/km-e0010411.ini
-%%JP106%%etc/xrdp/km-e0210411.ini
-@unexec if cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini; then rm -f %D/etc/xrdp/rsakeys.ini; fi
-@unexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
-@unexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
-@unexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
-etc/xrdp/rsakeys.ini.sample
-etc/xrdp/sesman.ini.sample
-etc/xrdp/startwm.sh.sample
-etc/xrdp/xrdp.ini.sample
-@exec [ -f %D/etc/xrdp/rsakeys.ini ] || cp -p %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini
-@exec [ -f %D/etc/xrdp/sesman.ini ] || cp -p %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini
-@exec [ -f %D/etc/xrdp/startwm.sh ] || cp -p %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh
-@exec [ -f %D/etc/xrdp/xrdp.ini ] || cp -p %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini
-etc/xrdp/xrdp.sh
lib/xrdp/libcommon.a
lib/xrdp/libcommon.la
lib/xrdp/libcommon.so
@@ -57,6 +33,30 @@ lib/xrdp/libxup.a
lib/xrdp/libxup.la
lib/xrdp/libxup.so
lib/xrdp/libxup.so.0
+etc/pam.d/xrdp-sesman
+etc/xrdp/km-0407.ini
+etc/xrdp/km-0409.ini
+etc/xrdp/km-040c.ini
+etc/xrdp/km-0410.ini
+etc/xrdp/km-0419.ini
+etc/xrdp/km-041d.ini
+%%JP106%%etc/xrdp/km-0411.ini
+%%JP106%%etc/xrdp/km-e0200411.ini
+%%JP106%%etc/xrdp/km-e0010411.ini
+%%JP106%%etc/xrdp/km-e0210411.ini
+@unexec if cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini; then rm -f %D/etc/xrdp/rsakeys.ini; fi
+@unexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
+@unexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
+@unexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
+etc/xrdp/rsakeys.ini.sample
+etc/xrdp/sesman.ini.sample
+etc/xrdp/startwm.sh.sample
+etc/xrdp/xrdp.ini.sample
+@exec cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini || %D/bin/xrdp-keygen xrdp %D/etc/xrdp/rsakeys.ini
+@exec [ -f %D/etc/xrdp/sesman.ini ] || cp -p %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini
+@exec [ -f %D/etc/xrdp/startwm.sh ] || cp -p %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh
+@exec [ -f %D/etc/xrdp/xrdp.ini ] || cp -p %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini
+etc/xrdp/xrdp.sh
sbin/xrdp
sbin/xrdp-chansrv
sbin/xrdp-sesman