Date: Tue, 22 Oct 2013 12:29:13 +0200 (CEST) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: obrien@FreeBSD.org Subject: ports/183196: [PATCH] shells/bash: Support staging Message-ID: <20131022102913.D6C5714269C@aragorn.in.absolight.net> Resent-Message-ID: <201310221030.r9MAU0FS058788@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183196 >Category: ports >Synopsis: [PATCH] shells/bash: Support staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 22 10:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Mathieu Arnold >Release: FreeBSD 9.2-RELEASE i386 >Organization: Absolight >Environment: System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC >Description: Support staging I think I fixed the pre-install target, but it's not doing anything as there is no PRE-INSTALL case in pkg-install. Port maintainer (obrien@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- bash-4.2.45.patch begins here --- diff -ruN /usr/ports/shells/bash/Makefile ./Makefile --- /usr/ports/shells/bash/Makefile 2013-09-21 00:57:23.000000000 +0200 +++ ./Makefile 2013-10-22 12:25:45.000000000 +0200 @@ -1,5 +1,5 @@ # Created by: Oliver Eikemeier # $FreeBSD: shells/bash/Makefile 327770 2013-09-20 22:57:23Z bapt $ PORTNAME= bash PATCHLEVEL= 45 @@ -34,7 +34,6 @@ USES+= bison -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MIMPLICITCD} @@ -45,7 +44,6 @@ EXTRA_PATCHES+= ${PATCHDIR}/xpatch-colonbreakswords .endif -MAN1= bash.1 bashbug.1 INFO= bash MAKE_JOBS_UNSAFE= yes @@ -117,26 +115,24 @@ @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" \ + @${SETENV} PKG_PREFIX="${STAGEDIR}${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} .if !defined(WITH_INCLUDED_FAQ) @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/FAQ \ - ${WRKSRC}/doc/INTRO ${DOCSDIR} + ${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR} .else @${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ - ${WRKSRC}/doc/INTRO ${DOCSDIR} + ${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR} .endif @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 diff -ruN /usr/ports/shells/bash/pkg-plist ./pkg-plist --- /usr/ports/shells/bash/pkg-plist 2012-07-14 16:29:18.000000000 +0200 +++ ./pkg-plist 2013-10-22 12:19:02.000000000 +0200 @@ -1,7 +1,9 @@ @comment $FreeBSD: shells/bash/pkg-plist 300897 2012-07-14 14:29:18Z beat $ bin/bash bin/rbash bin/bashbug +man/man1/bash.1.gz +man/man1/bashbug.1.gz %%HELP%%%%DATADIR%%/alias %%HELP%%%%DATADIR%%/arith %%HELP%%%%DATADIR%%/arith_for --- bash-4.2.45.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131022102913.D6C5714269C>