ports/170308: [MAINTAINER] net/xrdp: Convert to OptionsNG etc

[Koichiro IWAO]

>Number:         170308
>Category:       ports
>Synopsis:       [MAINTAINER] net/xrdp: Convert to OptionsNG etc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 01 06:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Koichiro IWAO
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD rosetta.club.kyutech.ac.jp 9.0-STABLE FreeBSD 9.0-STABLE #8: Mon Jul  2 11:36:08 JST
>Description:
- OptionsNG'ify
- Add @stopdaemon to pkg-plist
- Modify rc.d script and pkg-message (xrdpsesman_enable="YES" is no longer needed)

Success on redports.org https://redports.org/buildarchive/20120801060358-76618/
This PR is my first conversion to OptionsNG. Thanks in advance,

Port maintainer (meta+ports at vmeta.jp) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- xrdp-0.6.0.20110117_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/xrdp/Makefile ./Makefile
--- /usr/ports/net/xrdp/Makefile	2012-07-21 05:00:43.000000000 +0900
+++ ./Makefile	2012-08-01 14:42:42.979960141 +0900
@@ -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 @@
 
 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
 
 .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}
+JP106_DESC=	Install Japanese JP106 keymap
 PATCHFILES+=	patch-instfiles__Makefile.am \
 	patch-instfiles__km-0411.ini \
 	patch-instfiles__km-e0010411.ini \
diff -ruN --exclude=CVS /usr/ports/net/xrdp/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/net/xrdp/files/pkg-message.in	2011-04-27 18:29:03.000000000 +0900
+++ ./files/pkg-message.in	2012-08-01 14:25:19.671959784 +0900
@@ -6,7 +6,6 @@
 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 -ruN --exclude=CVS /usr/ports/net/xrdp/files/xrdp.in ./files/xrdp.in
--- /usr/ports/net/xrdp/files/xrdp.in	2012-01-14 17:56:32.000000000 +0900
+++ ./files/xrdp.in	2012-08-01 14:29:17.597960289 +0900
@@ -16,13 +16,6 @@
 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 -ruN --exclude=CVS /usr/ports/net/xrdp/pkg-plist ./pkg-plist
--- /usr/ports/net/xrdp/pkg-plist	2012-07-21 05:00:43.000000000 +0900
+++ ./pkg-plist	2012-08-01 12:46:48.147959928 +0900
@@ -1,3 +1,4 @@
+ at stopdaemon xrdp
 bin/xrdp-genkeymap
 bin/xrdp-keygen
 bin/xrdp-sesadmin
--- xrdp-0.6.0.20110117_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: