From owner-svn-ports-head@freebsd.org Tue Nov 24 15:06:51 2015 Return-Path: Delivered-To: svn-ports-head@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 587B0A36BDE; Tue, 24 Nov 2015 15:06:51 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 0DC341ED8; Tue, 24 Nov 2015 15:06:50 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAOF6oEf055431; Tue, 24 Nov 2015 15:06:50 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAOF6oNU055430; Tue, 24 Nov 2015 15:06:50 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201511241506.tAOF6oNU055430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Tue, 24 Nov 2015 15:06:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402366 - head/shells/scponly X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2015 15:06:51 -0000 Author: garga Date: Tue Nov 24 15:06:49 2015 New Revision: 402366 URL: https://svnweb.freebsd.org/changeset/ports/402366 Log: - Add openssh-portable dependency explicit when /usr/bin/sftp is not present - Remove ${PORTSDIR} from depends - Take maintainership PR: 204779 Approved by: gjb (maintainer) Obtained from: pfSense Sponsored by: Rubicon Communications (Netgate) Modified: head/shells/scponly/Makefile Modified: head/shells/scponly/Makefile ============================================================================== --- head/shells/scponly/Makefile Tue Nov 24 14:56:04 2015 (r402365) +++ head/shells/scponly/Makefile Tue Nov 24 15:06:49 2015 (r402366) @@ -3,14 +3,16 @@ PORTNAME= scponly PORTVERSION= 4.8.20110526 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-snapshots DISTNAME= ${PORTNAME}-20110526 -MAINTAINER= gjb@FreeBSD.org +MAINTAINER= garga@FreeBSD.org COMMENT= Tiny shell that only permits scp and sftp +LICENSE= BSD2CLAUSE + PORTDOCS= BUILDING-JAILS.TXT INSTALL README SECURITY USES= tar:tgz @@ -31,20 +33,22 @@ WINSCP_DESC= WinSCP support OPTIONS_SUB= yes -BUILD_DEPENDS= sftp:${PORTSDIR}/security/openssh-portable +.if !exists(/usr/bin/sftp) +BUILD_DEPENDS= ${LOCALBASE}/bin/sftp:security/openssh-portable +.endif DEFAULT_CHDIR_CONFIGURE_ON= --with-default-chdir=${SCPONLY_DEFAULT_CHDIR} WILDCARDS_CONFIGURE_ENABLE= wildcards GFTP_CONFIGURE_ENABLE= gftp-compat CHROOT_CONFIGURE_ENABLE= chrooted-binary CHROOT_USE= RC_SUBR=scponlyc -RSYNC_BUILD_DEPENDS= rsync:${PORTSDIR}/net/rsync +RSYNC_BUILD_DEPENDS= rsync:net/rsync RSYNC_CONFIGURE_ENABLE= rsync-compat SCP_CONFIGURE_ENABLE= scp-compat SVN_CONFIGURE_ENABLE= svn-compat -SVN_BUILD_DEPENDS= svn:${PORTSDIR}/devel/subversion -SVNSERVE_BUILD_DEPENDS= svn:${PORTSDIR}/devel/subversion +SVN_BUILD_DEPENDS= svn:devel/subversion +SVNSERVE_BUILD_DEPENDS= svn:devel/subversion SVNSERVE_CONFIGURE_ENABLE= svnserv-compat -UNISON_BUILD_DEPENDS= unison:${PORTSDIR}/net/unison +UNISON_BUILD_DEPENDS= unison:net/unison UNISON_CONFIGURE_ENABLE= unison-compat WINSCP_CONFIGURE_ENABLE= winscp-compat @@ -62,7 +66,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/config.h ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} .endfor .include