From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 09:57:19 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42D1538F; Fri, 27 Dec 2013 09:57:19 +0000 (UTC) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 164BE115C; Fri, 27 Dec 2013 09:57:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR9vIXH063962; Fri, 27 Dec 2013 09:57:18 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR9vIcZ063960; Fri, 27 Dec 2013 09:57:18 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312270957.rBR9vIcZ063960@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Dec 2013 09:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337674 - in branches/2014Q1/shells/rssh: . files X-SVN-Group: ports-branches 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.17 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, 27 Dec 2013 09:57:19 -0000 Author: bapt Date: Fri Dec 27 09:57:18 2013 New Revision: 337674 URL: http://svnweb.freebsd.org/changeset/ports/337674 Log: MFH: r337656 Support stage Fix build with clang on head (symbol collision) Added: branches/2014Q1/shells/rssh/files/ - copied from r337656, head/shells/rssh/files/ Modified: branches/2014Q1/shells/rssh/Makefile branches/2014Q1/shells/rssh/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/shells/rssh/Makefile ============================================================================== --- branches/2014Q1/shells/rssh/Makefile Fri Dec 27 09:54:22 2013 (r337673) +++ branches/2014Q1/shells/rssh/Makefile Fri Dec 27 09:57:18 2013 (r337674) @@ -11,29 +11,15 @@ COMMENT= Restricted Secure SHell only fo GNU_CONFIGURE= yes -MAN1= rssh.1 -MAN5= rssh.conf.5 - +USE_CSTD= gnu89 OPTIONS_DEFINE= RDIST RDIST_DESC= rdist support - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MRDIST} -RUN_DEPENDS+= ${LOCALBASE}/bin/rdist6:${PORTSDIR}/net/rdist6 -CONFIGURE_ARGS+=--with-rdist=${LOCALBASE}/bin/rdist6 -.endif +RDIST_RUN_DEPENDS= rdist6:${PORTSDIR}/net/rdist6 +RDIST_CONFIGURE_ON= --with-rdist=${LOCALBASE}/bin/rdist6 post-patch: @${REINPLACE_CMD} -E -e 's,(\$$\(DESTDIR\)\$$\(sysconfdir\)/\$$\$$f),\1.dist,g' \ + -e 's,u\+s ,u+s $$\(DESTDIR\),g' \ ${WRKSRC}/Makefile.in -post-install: - @${ECHO_MSG} "updating /etc/shells" - @${CP} /etc/shells /etc/shells.bak - @(${GREP} -v ${PREFIX}/bin/${PORTNAME} /etc/shells.bak; \ - ${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > /etc/shells - @${RM} /etc/shells.bak - .include Modified: branches/2014Q1/shells/rssh/pkg-plist ============================================================================== --- branches/2014Q1/shells/rssh/pkg-plist Fri Dec 27 09:54:22 2013 (r337673) +++ branches/2014Q1/shells/rssh/pkg-plist Fri Dec 27 09:57:18 2013 (r337674) @@ -1,5 +1,6 @@ -@comment $FreeBSD$ bin/rssh +man/man1/rssh.1.gz +man/man5/rssh.conf.5.gz @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak etc/rssh.conf.default.dist