Attachment 140647 Details for Bug 187304 – file.diff

[patch] file.diff

file.diff (text/plain), 1.59 KB, created by Christian Elmerot on 2014-03-05 21:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Elmerot

Created: 2014-03-05 21:30:00 UTC

Size: 1.59 KB

patch

obsolete

>--- Makefile.orig	2014-01-12 17:08:27.000000000 +0100
>+++ Makefile	2014-03-05 22:07:23.721069292 +0100
>@@ -13,7 +13,7 @@
> LICENSE=	BSD
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
>+BUILD_DEPENDS=	${SHELL}:${PORTSDIR}/shells/${SHELL} \
> 		yasm:${PORTSDIR}/devel/yasm
> 
> USES=		gmake perl5
>@@ -22,11 +22,12 @@
> USE_PERL5=	build
> USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=	DEBUG POSTPROC RUNTIME THREADS SHARED
>+OPTIONS_DEFINE=	DEBUG POSTPROC RUNTIME THREADS SHARED EXAMPLES
> OPTIONS_DEFAULT=	POSTPROC RUNTIME THREADS SHARED
> POSTPROC_DESC=	Enable postprocessing
> RUNTIME_DESC=	Enable runtime CPU detection
> SHARED_DESC=	Enable shared-library support
>+EXAMPLES_DESC=	Build and/or install examples (requires Bash)
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
> ALL_TARGET=
>@@ -46,9 +47,18 @@
> RUNTIME_CONFIGURE_ON=	--enable-runtime-cpu-detect
> THREADS_CONFIGURE_OFF=	--disable-multithread
> SHARED_CONFIGURE_ON=	--enable-shared
>+EXAMPLES_CONFIGURE_OFF=	--disable-examples
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+SHELL=		bash
>+.elif exists(${LOCALBASE}/bin/zsh)
>+SHELL=		zsh
>+.else
>+SHELL=		bash
>+.endif
>+
> .if ${OSVERSION}  < 900000
> .if ${ARCH} == "amd64"
> USE_GCC=	yes
>@@ -85,7 +95,7 @@
> 	@${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|g' \
> 	       	${WRKSRC}/build/make/Makefile ${WRKSRC}/libs.mk
> 	@${GREP} -Rl '^#!/bin/bash' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
>-		-e 's,#!/bin/bash,#!/usr/bin/env bash,g'
>+		-e 's,#!/bin/bash,#!/usr/bin/env ${SHELL},g'
> 	@${GREP} -Rl -- '-l\?pthread' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -E \
> 		-e 's/-l?pthread/${PTHREAD_LIBS}/g'

Actions: View | Diff

Attachments on bug 187304: 140647