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)
Responsible Changed From-To: freebsd-ports-bugs->obrien Over to maintainer (via the GNATS Auto Assign Tool)
State Changed From-To: open->closed Committed, thanks!
Author: mat Date: Wed Nov 6 12:18:54 2013 New Revision: 332973 URL: http://svnweb.freebsd.org/changeset/ports/332973 Log: - Support staging maintainer timeout. PR: ports/183196 Submitted by: mat Modified: head/shells/bash/Makefile head/shells/bash/pkg-plist Modified: head/shells/bash/Makefile ============================================================================== --- head/shells/bash/Makefile Wed Nov 6 12:18:29 2013 (r332972) +++ head/shells/bash/Makefile Wed Nov 6 12:18:54 2013 (r332973) @@ -34,7 +34,6 @@ HELP_DESC= Install the help files USES+= bison -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MIMPLICITCD} @@ -45,7 +44,6 @@ EXTRA_PATCHES+= ${PATCHDIR}/xpatch-impl EXTRA_PATCHES+= ${PATCHDIR}/xpatch-colonbreakswords .endif -MAN1= bash.1 bashbug.1 INFO= bash MAKE_JOBS_UNSAFE= yes @@ -117,26 +115,24 @@ pre-build: @${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 Modified: head/shells/bash/pkg-plist ============================================================================== --- head/shells/bash/pkg-plist Wed Nov 6 12:18:29 2013 (r332972) +++ head/shells/bash/pkg-plist Wed Nov 6 12:18:54 2013 (r332973) @@ -2,6 +2,8 @@ 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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"