Sat Aug 19 00:28:10 2017 UTC ()
lang/guile20: Mirror changes to lang/guile22/Makefile.

These changes aren't necessary, but on the day when guile-2.0.x is
no longer the primary, then the switch to using a non-default
installation prefix should be seamless.


(jlam)
diff -r1.13 -r1.14 pkgsrc/lang/guile20/Makefile
cvs diff -r1.13 -r1.14 pkgsrc/lang/guile20/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile20/Makefile 2017/05/17 12:06:20 1.13
+++ pkgsrc/lang/guile20/Makefile 2017/08/19 00:28:10 1.14
@@ -1,44 +1,50 @@ @@ -1,44 +1,50 @@
1# $NetBSD: Makefile,v 1.13 2017/05/17 12:06:20 ryoon Exp $ 1# $NetBSD: Makefile,v 1.14 2017/08/19 00:28:10 jlam Exp $
2 2
3DISTNAME= guile-2.0.14 3DISTNAME= guile-2.0.14
4PKGNAME= ${DISTNAME:S/guile/guile20/} 4PKGNAME= ${DISTNAME:S/guile/guile20/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/ 7MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/
8 8
9MAINTAINER= root@zta.lk 9MAINTAINER= root@zta.lk
10HOMEPAGE= https://www.gnu.org/software/guile/ 10HOMEPAGE= https://www.gnu.org/software/guile/
11COMMENT= Official extension language for the GNU operating system (2.0 branch) 11COMMENT= Official extension language for the GNU operating system (2.0 branch)
12LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
13 13
14# Currently, 2.0 is primary. 14# Currently, 2.0 is primary.
15#GUILE_PREFIX= ${PREFIX}/guile/2.0 15#GUILE_SUBDIR= guile/2.0
16GUILE_PREFIX= ${PREFIX} 16GUILE_SUBDIR= # empty
17 17
18# guile does not like the --build and --host triplets on NetBSD 18# guile does not like the --build and --host triplets on NetBSD
19HAS_CONFIGURE= yes 19HAS_CONFIGURE= yes
20CONFIGURE_ARGS+= --disable-shared 20CONFIGURE_ARGS+= --disable-shared
21# not until boehm-gc is threaded 21# not until boehm-gc is threaded
22CONFIGURE_ARGS+= --without-threads 22CONFIGURE_ARGS+= --without-threads
23CONFIGURE_ARGS+= --prefix=${GUILE_PREFIX} 
24CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX}/${PKGMANDIR} 
25CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX}/${PKGINFODIR} 
26 
27CONFIGURE_ARGS+= SHELL=${CONFIG_SHELL} 23CONFIGURE_ARGS+= SHELL=${CONFIG_SHELL}
28 24
29# When GUILE_PREFIX is non-default, these must be enabled. 25.if !empty(GUILE_SUBDIR)
30#BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX} 26# Installation prefix is non-default.
31#LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib 27GUILE_PREFIX= ${PREFIX}/${GUILE_SUBDIR}
 28CONFIGURE_ARGS+= --prefix=${GUILE_PREFIX:Q}
 29CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX:Q}/info
 30CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX:Q}/man
 31BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX}
 32LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
 33.else
 34CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
 35CONFIGURE_ARGS+= --infodir=${PREFIX:Q}/${PKGINFODIR:Q}
 36CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR:Q}
 37.endif
32 38
33INFO_FILES= yes 39INFO_FILES= yes
34USE_LIBTOOL= yes 40USE_LIBTOOL= yes
35USE_TOOLS+= gmake pkg-config 41USE_TOOLS+= gmake pkg-config
36 42
37PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.in 43PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.in
38# known broken: test-loose-ends on NetBSD/current 44# known broken: test-loose-ends on NetBSD/current
39# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24003 45# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24003
40TEST_TARGET= check 46TEST_TARGET= check
41 47
42SUBST_CLASSES+= tools 48SUBST_CLASSES+= tools
43SUBST_SED.tools+= -e "s,\\((define %pkg-config-program .\\).*\\(.)\\),\\1${PREFIX}/bin/pkg-config\\2," 49SUBST_SED.tools+= -e "s,\\((define %pkg-config-program .\\).*\\(.)\\),\\1${PREFIX}/bin/pkg-config\\2,"
44SUBST_STAGE.tools= post-build 50SUBST_STAGE.tools= post-build