From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 08:34:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE7AA7FA; Fri, 27 Dec 2013 08:34:06 +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 B08B51CF2; Fri, 27 Dec 2013 08:34:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR8Y68U032915; Fri, 27 Dec 2013 08:34:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR8Y6nl032913; Fri, 27 Dec 2013 08:34:06 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312270834.rBR8Y6nl032913@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Dec 2013 08:34:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337652 - head/shells/lshell 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.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 08:34:06 -0000 Author: bapt Date: Fri Dec 27 08:34:05 2013 New Revision: 337652 URL: http://svnweb.freebsd.org/changeset/ports/337652 Log: Support stage Modified: head/shells/lshell/Makefile head/shells/lshell/pkg-plist Modified: head/shells/lshell/Makefile ============================================================================== --- head/shells/lshell/Makefile Fri Dec 27 08:32:02 2013 (r337651) +++ head/shells/lshell/Makefile Fri Dec 27 08:34:05 2013 (r337652) @@ -12,31 +12,17 @@ COMMENT= Shell environment to limited se USE_PYDISTUTILS= yes USE_PYTHON= yes -SHELLS= /etc/shells - -MAN1= lshell.1 - PORTDOCS= CHANGES COPYING README -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g; \ - s|share/man|${LOCALBASE}/man|g; 45d' ${WRKSRC}/setup.py + s|share/man|${MANPREFIX}/man|g; 45d' ${WRKSRC}/setup.py + post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for docs in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR} .endfor -.endif - @${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample - @if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \ - ${INSTALL_DATA} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \ - fi - @${ECHO_MSG} "Updating ${SHELLS}" - @${CP} ${SHELLS} ${SHELLS}.bak - @(${GREP} -v ${PREFIX}/bin/${PORTNAME} ${SHELLS}.bak; \ - ${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > ${SHELLS} - @${RM} ${SHELLS}.bak + ${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample .include Modified: head/shells/lshell/pkg-plist ============================================================================== --- head/shells/lshell/pkg-plist Fri Dec 27 08:32:02 2013 (r337651) +++ head/shells/lshell/pkg-plist Fri Dec 27 08:34:05 2013 (r337652) @@ -1,4 +1,5 @@ bin/lshell +man/man1/lshell.1.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 @unexec if cmp -s %D/etc/lshell.conf %D/etc/lshell.conf.sample; then rm -f %D/etc/lshell.conf; fi