Wed May 17 12:06:20 2017 UTC ()
Fix packaging under FreeBSD/amd64 10.2 and 11.0

At least under 10.2, 10.3-RC3 and 11.0, GUILE_LIBNAME is so.22.8.1 like
other platforms.


(ryoon)
diff -r1.12 -r1.13 pkgsrc/lang/guile20/Makefile
cvs diff -r1.12 -r1.13 pkgsrc/lang/guile20/Makefile (switch to unified diff)

--- pkgsrc/lang/guile20/Makefile 2017/03/16 10:07:27 1.12
+++ pkgsrc/lang/guile20/Makefile 2017/05/17 12:06:20 1.13
@@ -1,74 +1,73 @@ @@ -1,74 +1,73 @@
1# $NetBSD: Makefile,v 1.12 2017/03/16 10:07:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2017/05/17 12:06:20 ryoon 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_PREFIX= ${PREFIX}/guile/2.0
16GUILE_PREFIX= ${PREFIX} 16GUILE_PREFIX= ${PREFIX}
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} 23CONFIGURE_ARGS+= --prefix=${GUILE_PREFIX}
24CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX}/${PKGMANDIR} 24CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX}/${PKGMANDIR}
25CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX}/${PKGINFODIR} 25CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX}/${PKGINFODIR}
26 26
27CONFIGURE_ARGS+= SHELL=${CONFIG_SHELL} 27CONFIGURE_ARGS+= SHELL=${CONFIG_SHELL}
28 28
29# When GUILE_PREFIX is non-default, these must be enabled. 29# When GUILE_PREFIX is non-default, these must be enabled.
30#BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX} 30#BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX}
31#LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib 31#LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
32 32
33INFO_FILES= yes 33INFO_FILES= yes
34USE_LIBTOOL= yes 34USE_LIBTOOL= yes
35USE_TOOLS+= gmake pkg-config 35USE_TOOLS+= gmake pkg-config
36 36
37PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.in 37PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.in
38# known broken: test-loose-ends on NetBSD/current 38# known broken: test-loose-ends on NetBSD/current
39# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24003 39# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24003
40TEST_TARGET= check 40TEST_TARGET= check
41 41
42SUBST_CLASSES+= tools 42SUBST_CLASSES+= tools
43SUBST_SED.tools+= -e "s,\\((define %pkg-config-program .\\).*\\(.)\\),\\1${PREFIX}/bin/pkg-config\\2," 43SUBST_SED.tools+= -e "s,\\((define %pkg-config-program .\\).*\\(.)\\),\\1${PREFIX}/bin/pkg-config\\2,"
44SUBST_STAGE.tools= post-build 44SUBST_STAGE.tools= post-build
45SUBST_FILES.tools+= meta/guile-config 45SUBST_FILES.tools+= meta/guile-config
46SUBST_MESSAGE.tools= Fixing path to pkg-config in installed file. 46SUBST_MESSAGE.tools= Fixing path to pkg-config in installed file.
47 47
48# XXX: less tests would fail if we made libunistring use GNU iconv too 48# XXX: less tests would fail if we made libunistring use GNU iconv too
49#USE_GNU_ICONV= yes 49#USE_GNU_ICONV= yes
50 50
51OPSYSVARS+= GUILE_LIBNAME 51OPSYSVARS+= GUILE_LIBNAME
52GUILE_LIBNAME.Darwin= a 52GUILE_LIBNAME.Darwin= a
53GUILE_LIBNAME.FreeBSD= so.30 
54GUILE_LIBNAME.*= so.22.8.1 53GUILE_LIBNAME.*= so.22.8.1
55 54
56PLIST_SUBST+= GUILE_LIBNAME=${GUILE_LIBNAME} 55PLIST_SUBST+= GUILE_LIBNAME=${GUILE_LIBNAME}
57PRINT_PLIST_AWK+= {gsub(/${GUILE_LIBNAME}/, "$${GUILE_LIBNAME}");} 56PRINT_PLIST_AWK+= {gsub(/${GUILE_LIBNAME}/, "$${GUILE_LIBNAME}");}
58 57
59# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24002 58# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24002
60post-configure: 59post-configure:
61 ${ECHO} '#define FLEXIBLE_ARRAY_MEMBER /**/' >> ${WRKSRC}/config.h 60 ${ECHO} '#define FLEXIBLE_ARRAY_MEMBER /**/' >> ${WRKSRC}/config.h
62 61
63.include "../../devel/gmp/buildlink3.mk" 62.include "../../devel/gmp/buildlink3.mk"
64.include "../../converters/libiconv/buildlink3.mk" 63.include "../../converters/libiconv/buildlink3.mk"
65.include "../../devel/gettext-lib/buildlink3.mk" 64.include "../../devel/gettext-lib/buildlink3.mk"
66.include "../../devel/libltdl/buildlink3.mk" 65.include "../../devel/libltdl/buildlink3.mk"
67.include "../../textproc/libunistring/buildlink3.mk" 66.include "../../textproc/libunistring/buildlink3.mk"
68# needs a particular bug fix on NetBSD 67# needs a particular bug fix on NetBSD
69BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4.2nb1 68BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4.2nb1
70.include "../../devel/boehm-gc/buildlink3.mk" 69.include "../../devel/boehm-gc/buildlink3.mk"
71.include "../../devel/libffi/buildlink3.mk" 70.include "../../devel/libffi/buildlink3.mk"
72.include "../../devel/readline/buildlink3.mk" 71.include "../../devel/readline/buildlink3.mk"
73#.include "../../mk/pthread.buildlink3.mk" 72#.include "../../mk/pthread.buildlink3.mk"
74.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"