From owner-svn-ports-all@FreeBSD.ORG Fri Nov 1 10:29:19 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 ESMTP id 6B68831B; Fri, 1 Nov 2013 10:29:19 +0000 (UTC) (envelope-from ehaupt@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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 591502F7F; Fri, 1 Nov 2013 10:29: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 rA1ATJai033588; Fri, 1 Nov 2013 10:29:19 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1ATI7E033585; Fri, 1 Nov 2013 10:29:18 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201311011029.rA1ATI7E033585@svn.freebsd.org> From: Emanuel Haupt Date: Fri, 1 Nov 2013 10:29:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332349 - in head/shells: bash-devel bash-static-devel 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.14 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, 01 Nov 2013 10:29:19 -0000 Author: ehaupt Date: Fri Nov 1 10:29:18 2013 New Revision: 332349 URL: http://svnweb.freebsd.org/changeset/ports/332349 Log: Support staging. Deleted: head/shells/bash-devel/pkg-deinstall head/shells/bash-devel/pkg-install Modified: head/shells/bash-devel/Makefile head/shells/bash-devel/pkg-plist head/shells/bash-static-devel/Makefile Modified: head/shells/bash-devel/Makefile ============================================================================== --- head/shells/bash-devel/Makefile Fri Nov 1 10:26:17 2013 (r332348) +++ head/shells/bash-devel/Makefile Fri Nov 1 10:29:18 2013 (r332349) @@ -33,7 +33,6 @@ HELP_DESC= Enable builtin help USES= bison -NO_STAGE= yes .include .if ${PORT_OPTIONS:MIMPLICITCD} @@ -44,7 +43,6 @@ EXTRA_PATCHES+= ${PATCHDIR}/extrapatch- EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-colonbreakswords .endif -MAN1= bash.1 bashbug.1 INFO= bash MAKE_JOBS_UNSAFE= yes @@ -107,22 +105,16 @@ post-configure: pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build -pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" \ - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - post-install: - @cd ${PREFIX}/bin ; ${LN} -sf bash rbash + @cd ${STAGEDIR}${PREFIX}/bin ; ${LN} -sf bash rbash .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ - ${WRKSRC}/doc/INTRO ${DOCSDIR} + ${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR} @for d in ${PORTDOCS:NFAQ:NINTRO}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${d} ${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \ done .endif - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL regress: build cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test @@ -130,6 +122,7 @@ regress: build ckp: ${MAKE} -DPATCH_DEBUG clean patch +# requires ftp/ncftp3 cklatest: @${ECHO} -n "Currently at: " @${MAKE} -V PATCHLEVEL Modified: head/shells/bash-devel/pkg-plist ============================================================================== --- head/shells/bash-devel/pkg-plist Fri Nov 1 10:26:17 2013 (r332348) +++ head/shells/bash-devel/pkg-plist Fri Nov 1 10:29:18 2013 (r332349) @@ -1,7 +1,13 @@ @comment $FreeBSD$ bin/bash +@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 bin/rbash +@exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak +@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak bin/bashbug +man/man1/bash.1.gz +man/man1/bashbug.1.gz %%NLS%%share/locale/af/LC_MESSAGES/bash.mo %%NLS%%share/locale/bg/LC_MESSAGES/bash.mo %%NLS%%share/locale/ca/LC_MESSAGES/bash.mo Modified: head/shells/bash-static-devel/Makefile ============================================================================== --- head/shells/bash-static-devel/Makefile Fri Nov 1 10:26:17 2013 (r332348) +++ head/shells/bash-static-devel/Makefile Fri Nov 1 10:29:18 2013 (r332349) @@ -5,5 +5,4 @@ MASTERDIR= ${.CURDIR}/../../shells/bash- OPTIONS_SLAVE= STATIC -NO_STAGE= yes .include "${MASTERDIR}/Makefile"