Attachment 137588 Details for Bug 183196 – bash-4.2.45.patch

[patch] bash-4.2.45.patch

bash-4.2.45.patch (text/plain), 2.06 KB, created by Mathieu Arnold on 2013-10-22 11:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2013-10-22 11:30:00 UTC

Size: 2.06 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 183196: 137588