From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 1 06:50:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69896106566B for ; Wed, 1 Aug 2012 06:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 410DE8FC0C for ; Wed, 1 Aug 2012 06:50:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q716oAFg070101 for ; Wed, 1 Aug 2012 06:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q716oAPK070100; Wed, 1 Aug 2012 06:50:10 GMT (envelope-from gnats) Resent-Date: Wed, 1 Aug 2012 06:50:10 GMT Resent-Message-Id: <201208010650.q716oAPK070100@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Koichiro IWAO Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB09B106566B for ; Wed, 1 Aug 2012 06:41:20 +0000 (UTC) (envelope-from meta@rosetta.club.kyutech.ac.jp) Received: from rosetta.club.kyutech.ac.jp (rosetta.club.kyutech.ac.jp [131.206.108.15]) by mx1.freebsd.org (Postfix) with ESMTP id 6EDF18FC0A for ; Wed, 1 Aug 2012 06:41:20 +0000 (UTC) Received: from rosetta.club.kyutech.ac.jp (localhost [127.0.0.1]) by rosetta.club.kyutech.ac.jp (8.14.5/8.14.5) with ESMTP id q716aOXP028648; Wed, 1 Aug 2012 15:36:24 +0900 (JST) (envelope-from meta@rosetta.club.kyutech.ac.jp) Received: (from meta@localhost) by rosetta.club.kyutech.ac.jp (8.14.5/8.14.5/Submit) id q716aMX6028647; Wed, 1 Aug 2012 15:36:22 +0900 (JST) (envelope-from meta) Message-Id: <201208010636.q716aMX6028647@rosetta.club.kyutech.ac.jp> Date: Wed, 1 Aug 2012 15:36:22 +0900 (JST) From: Koichiro IWAO To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: meta+ports@vmeta.jp Subject: ports/170308: [MAINTAINER] net/xrdp: Convert to OptionsNG etc X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Aug 2012 06:50:10 -0000 >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@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 -.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 @@ +@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: