diff options
| author | Alex Kozlov <ak@FreeBSD.org> | 2012-08-06 11:55:56 +0000 |
|---|---|---|
| committer | Alex Kozlov <ak@FreeBSD.org> | 2012-08-06 11:55:56 +0000 |
| commit | 81e9f5a4b5f677808abc72dbb32ba6ea4be5f233 (patch) | |
| tree | b210fc532390ceadd177ad7e8b68e5454eeebd1f /net/xrdp | |
| parent | d3d1b3c31bb9a1b6cf469593c34a31a57342cc81 (diff) | |
- Convert to new options framework
- Add @stopdaemon for xrdp
- Remove xrdpsesman_enable (no longer needed)
PR: ports/170308
Submitted by: Koichiro IWAO <meta@vmeta.jp> (maintainer)
Notes
Notes:
svn path=/head/; revision=302169
Diffstat (limited to 'net/xrdp')
| -rw-r--r-- | net/xrdp/Makefile | 11 | ||||
| -rw-r--r-- | net/xrdp/files/pkg-message.in | 1 | ||||
| -rw-r--r-- | net/xrdp/files/xrdp.in | 7 | ||||
| -rw-r--r-- | net/xrdp/pkg-plist | 1 |
4 files changed, 7 insertions, 13 deletions
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index 7cbc8fd22106..4ab9eceb3085 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrdp PORTVERSION= 0.6.0.20110117 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/ \ http://key2.jp/~meta/distfiles/ @@ -35,16 +35,17 @@ RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc USE_LDCONFIG= ${PREFIX}/lib/xrdp -OPTIONS= DEBUG "Build with debugging symbols" off \ - JP106 "Install Japanese JP106 Keymap" on +OPTIONS_DEFINE= DEBUG JP106 +OPTIONS_DEFAULT= JP106 +JP106_DESC= Install Japanese JP106 keymap .include <bsd.port.options.mk> -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CFLAGS+= -DXRDP_DEBUG .endif -.if defined(WITH_JP106) +.if ${PORT_OPTIONS:MJP106} PATCHFILES+= patch-instfiles__Makefile.am \ patch-instfiles__km-0411.ini \ patch-instfiles__km-e0010411.ini \ diff --git a/net/xrdp/files/pkg-message.in b/net/xrdp/files/pkg-message.in index 733b6dbf354a..8fec8751eee0 100644 --- a/net/xrdp/files/pkg-message.in +++ b/net/xrdp/files/pkg-message.in @@ -6,7 +6,6 @@ There is an rc.d script, so the service can be enabled by adding this line in /etc/rc.conf: xrdp_enable="YES" -xrdpsesman_enable="YES" 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 83cd57e9583f..ff239e0b0e10 100644 --- a/net/xrdp/files/xrdp.in +++ b/net/xrdp/files/xrdp.in @@ -16,13 +16,6 @@ xrdp_daemons="xrdp xrdpsesman" load_rc_config "$name" : ${xrdp_enable="NO"} -# Enable/disable dependent daemon. -if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then - : ${sesman_enable="YES"} -else - : ${sesman_enable="NO"} -fi - # Commands. extra_commands="reload status" start_cmd="xrdp_cmd" diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist index a8fafc581b08..b45ef6ab6f19 100644 --- a/net/xrdp/pkg-plist +++ b/net/xrdp/pkg-plist @@ -1,3 +1,4 @@ +@stopdaemon xrdp bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin |