Sat Jun 3 18:09:50 2017 UTC ()
Pullup ticket #5453 - requested by sevan
lang/guile20: FreeSD build fix

Revisions pulled up:
- lang/guile20/Makefile                                         1.13

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Wed May 17 12:06:20 UTC 2017

   Modified Files:
           pkgsrc/lang/guile20: Makefile

   Log Message:
   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.


(bsiegert)
diff -r1.12 -r1.12.2.1 pkgsrc/lang/guile20/Makefile
cvs diff -r1.12 -r1.12.2.1 pkgsrc/lang/guile20/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile20/Makefile 2017/03/16 10:07:27 1.12
+++ pkgsrc/lang/guile20/Makefile 2017/06/03 18:09:50 1.12.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2017/03/16 10:07:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.12.2.1 2017/06/03 18:09:50 bsiegert 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.
@@ -40,27 +40,26 @@ PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.i @@ -40,27 +40,26 @@ PKGCONFIG_OVERRIDE+= meta/guile-2.0.pc.i
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"