Sat May 28 15:25:56 2016 UTC ()
Ensure that SHELL (which may be defined in user environment) is comptabible
with CONFIG_SHELL with respect to possible builtins used such as 'echo -n'.

Fixes install on SunOS using pdksh but with bash as the interactive user shell.


(richard)
diff -r1.1 -r1.2 pkgsrc/lang/guile20/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/lang/guile20/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile20/Makefile 2014/11/01 13:24:37 1.1
+++ pkgsrc/lang/guile20/Makefile 2016/05/28 15:25:56 1.2
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1# $NetBSD: Makefile,v 1.1 2014/11/01 13:24:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2016/05/28 15:25:56 richard Exp $
2 2
3DISTNAME= guile-2.0.11 3DISTNAME= guile-2.0.11
4PKGNAME= ${DISTNAME:S/guile/guile20/} 4PKGNAME= ${DISTNAME:S/guile/guile20/}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/ 6MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/
7 7
8MAINTAINER= root@zta.lk 8MAINTAINER= root@zta.lk
9HOMEPAGE= ftp://ftp.gnu.org/gnu/guile/ 9HOMEPAGE= ftp://ftp.gnu.org/gnu/guile/
10COMMENT= Official extension language for the GNU operating system 10COMMENT= Official extension language for the GNU operating system
11LICENSE= gnu-lgpl-v3 11LICENSE= gnu-lgpl-v3
12 12
13GUILE_PREFIX= ${PREFIX}/guile/2.0 13GUILE_PREFIX= ${PREFIX}/guile/2.0
14 14
15# guile does not like the --build and --host triplets on NetBSD 15# guile does not like the --build and --host triplets on NetBSD
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17CONFIGURE_ARGS+= --disable-shared 17CONFIGURE_ARGS+= --disable-shared
18# not until boehm-gc is threaded 18# not until boehm-gc is threaded
19CONFIGURE_ARGS+= --without-threads 19CONFIGURE_ARGS+= --without-threads
20CONFIGURE_ARGS+= --prefix=${GUILE_PREFIX} 20CONFIGURE_ARGS+= --prefix=${GUILE_PREFIX}
21CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX}/${PKGMANDIR} 21CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX}/${PKGMANDIR}
22CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX}/${PKGINFODIR} 22CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX}/${PKGINFODIR}
23 23
 24CONFIGURE_ARGS+= SHELL=${CONFIG_SHELL}
 25
24BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX} 26BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX}
25LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib 27LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
26 28
27INFO_FILES= yes 29INFO_FILES= yes
28USE_LIBTOOL= yes 30USE_LIBTOOL= yes
29USE_TOOLS+= gmake pkg-config 31USE_TOOLS+= gmake pkg-config
30 32
31PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.in 33PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.in
32TEST_TARGET= check 34TEST_TARGET= check
33 35
34SUBST_CLASSES+= tools 36SUBST_CLASSES+= tools
35SUBST_SED.tools+= -e "s,\\((define %pkg-config-program .\\).*\\(.)\\),\\1${PREFIX}/bin/pkg-config\\2," 37SUBST_SED.tools+= -e "s,\\((define %pkg-config-program .\\).*\\(.)\\),\\1${PREFIX}/bin/pkg-config\\2,"
36SUBST_STAGE.tools= post-build 38SUBST_STAGE.tools= post-build