From owner-svn-ports-all@freebsd.org Fri Jun 26 20:18:13 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0698798DE5D; Fri, 26 Jun 2015 20:18:13 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDF9B12D8; Fri, 26 Jun 2015 20:18:12 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QKICth047151; Fri, 26 Jun 2015 20:18:12 GMT (envelope-from pgollucci@FreeBSD.org) Received: (from pgollucci@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QKICJR047148; Fri, 26 Jun 2015 20:18:12 GMT (envelope-from pgollucci@FreeBSD.org) Message-Id: <201506262018.t5QKICJR047148@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pgollucci set sender to pgollucci@FreeBSD.org using -f From: "Philip M. Gollucci" Date: Fri, 26 Jun 2015 20:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390666 - head/net/xrdp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 20:18:13 -0000 Author: pgollucci Date: Fri Jun 26 20:18:11 2015 New Revision: 390666 URL: https://svnweb.freebsd.org/changeset/ports/390666 Log: net/xrdp: cleanup - Add LICENSE_FILE - Convert to options helpers - Do not use unnecessary GH_TAGNAME - Fix whitespaces - Remove @stopdaemon - Resurrect DIST_SUBDIR - Bump PORTREVISION for plist change PR: 201067 Submitted by: meta+ports@vmeta.jp (maintainer) Modified: head/net/xrdp/Makefile head/net/xrdp/distinfo head/net/xrdp/pkg-plist Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Fri Jun 26 19:49:15 2015 (r390665) +++ head/net/xrdp/Makefile Fri Jun 26 20:18:11 2015 (r390666) @@ -3,14 +3,17 @@ PORTNAME= xrdp PORTVERSION= 0.6.1 -PORTREVISION= 6 +DISTVERSIONPREFIX= v +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= net +DIST_SUBDIR= ${PORTNAME} MAINTAINER= meta+ports@vmeta.jp COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes USES= autoreconf:build libtool pkgconfig @@ -21,17 +24,17 @@ USE_XORG= x11 xfixes USE_GITHUB= yes GH_ACCOUNT= neutrinolabs -GH_TAGNAME= 5d53758 CONFIGURE_ARGS= --localstatedir=/var CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib +SUB_FILES= pkg-message OPTIONS_DEFINE= DEBUG OPTIONS_DEFAULT= JP106 X11RDP OPTIONS_GROUP= KEYMAP XSERVER -OPTIONS_GROUP_KEYMAP= JP106 -OPTIONS_GROUP_XSERVER= X11RDP +OPTIONS_GROUP_KEYMAP= JP106 +OPTIONS_GROUP_XSERVER= X11RDP OPTIONS_RADIO= XVNC OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC REALVNC_DESC= Use RealVNC @@ -41,42 +44,27 @@ TRIDIAVNC_DESC= Use TridiaVNC X11RDP_DESC= Use X11rdp (most recommended) JP106_DESC= Install Japanese JP106 keymap -.include - -# Which Xserver to use -.if ${PORT_OPTIONS:MREALVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc -.endif -.if ${PORT_OPTIONS:MTIGERVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc -.endif -.if ${PORT_OPTIONS:MTIGHTVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc -.endif -.if ${PORT_OPTIONS:MTRIDIAVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc -.endif +# Debug +DEBUG_CONFIGURE_ENABLE= xrdpdebug +# Xvnc +REALVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc +TIGERVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc +TIGHTVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc +TRIDIAVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc # X11rdp -.if ${PORT_OPTIONS:MX11RDP} || exists(${LOCALBASE}/bin/X11rdp) -RUN_DEPENDS+= X11rdp:${PORTSDIR}/x11-servers/x11rdp -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini -.endif +X11RDP_RUN_DEPENDS= X11rdp:${PORTSDIR}/x11-servers/x11rdp +X11RDP_EXTRA_PATCHES= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini +# JP106 keymap +JP106_PLIST_SUB= JP106="" +JP106_PLIST_SUB_OFF= JP106="@comment" -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-xrdpdebug -CFLAGS+= -DXRDP_DEBUG -.endif +.include .if ${PORT_OPTIONS:MJP106} KEYMAP_FILES+= km-0411.ini km-e0010411.ini \ km-e0200411.ini km-e0210411.ini -PLIST_SUB+= JP106="" -.else -PLIST_SUB+= JP106="@comment " .endif -SUB_FILES= pkg-message - post-patch: .for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini @${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample Modified: head/net/xrdp/distinfo ============================================================================== --- head/net/xrdp/distinfo Fri Jun 26 19:49:15 2015 (r390665) +++ head/net/xrdp/distinfo Fri Jun 26 20:18:11 2015 (r390666) @@ -1,2 +1,2 @@ -SHA256 (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = fd3c9d1c6fb953d71c8184e384f9043039cea514f7791134546fb52444757d5c -SIZE (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = 1559409 +SHA256 (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 7b5a91fc5aa5a36bebff2b5ed19854486bf8836b7d01ad7bb00caa4e6b107c5b +SIZE (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 1559359 Modified: head/net/xrdp/pkg-plist ============================================================================== --- head/net/xrdp/pkg-plist Fri Jun 26 19:49:15 2015 (r390665) +++ head/net/xrdp/pkg-plist Fri Jun 26 20:18:11 2015 (r390666) @@ -1,4 +1,3 @@ -@stopdaemon xrdp bin/xrdp-dis bin/xrdp-genkeymap bin/xrdp-keygen