Date: Mon, 6 Aug 2012 11:55:56 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r302169 - in head/net/xrdp: . files Message-ID: <201208061155.q76Btu0M033333@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Mon Aug 6 11:55:56 2012 New Revision: 302169 URL: http://svn.freebsd.org/changeset/ports/302169 Log: - 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) Modified: head/net/xrdp/Makefile head/net/xrdp/files/pkg-message.in (contents, props changed) head/net/xrdp/files/xrdp.in (contents, props changed) head/net/xrdp/pkg-plist Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Mon Aug 6 11:53:17 2012 (r302168) +++ head/net/xrdp/Makefile Mon Aug 6 11:55:56 2012 (r302169) @@ -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 \ Modified: head/net/xrdp/files/pkg-message.in ============================================================================== --- head/net/xrdp/files/pkg-message.in Mon Aug 6 11:53:17 2012 (r302168) +++ head/net/xrdp/files/pkg-message.in Mon Aug 6 11:55:56 2012 (r302169) @@ -6,7 +6,6 @@ There is an rc.d script, so the service 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. Modified: head/net/xrdp/files/xrdp.in ============================================================================== --- head/net/xrdp/files/xrdp.in Mon Aug 6 11:53:17 2012 (r302168) +++ head/net/xrdp/files/xrdp.in Mon Aug 6 11:55:56 2012 (r302169) @@ -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" Modified: head/net/xrdp/pkg-plist ============================================================================== --- head/net/xrdp/pkg-plist Mon Aug 6 11:53:17 2012 (r302168) +++ head/net/xrdp/pkg-plist Mon Aug 6 11:55:56 2012 (r302169) @@ -1,3 +1,4 @@ +@stopdaemon xrdp bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208061155.q76Btu0M033333>