Mon Sep 19 11:21:11 2016 UTC ()
Improve HOMEPAGE.


(wiz)
diff -r1.107 -r1.108 pkgsrc/lang/guile/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/guile20/Makefile
cvs diff -r1.107 -r1.108 pkgsrc/lang/guile/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/guile/Attic/Makefile 2016/08/03 15:03:03 1.107
+++ pkgsrc/lang/guile/Attic/Makefile 2016/09/19 11:21:11 1.108
@@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
1# $NetBSD: Makefile,v 1.107 2016/08/03 15:03:03 wiz Exp $ 1# $NetBSD: Makefile,v 1.108 2016/09/19 11:21:11 wiz Exp $
2 2
3DISTNAME= guile-1.8.8 3DISTNAME= guile-1.8.8
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=guile/} 6MASTER_SITES= ${MASTER_SITE_GNU:=guile/}
7 7
8MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/guile/guile.html 9HOMEPAGE= https://www.gnu.org/software/guile/
10COMMENT= GNU's Ubiquitous Intelligent Language for Extension 10COMMENT= GNU's Ubiquitous Intelligent Language for Extension
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]* 13CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]*
14 14
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_TOOLS+= gmake makeinfo 16USE_TOOLS+= gmake makeinfo
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18PTHREAD_AUTO_VARS= YES 18PTHREAD_AUTO_VARS= YES
19INFO_FILES= YES 19INFO_FILES= YES
20PKGCONFIG_OVERRIDE= guile-1.8.pc.in 20PKGCONFIG_OVERRIDE= guile-1.8.pc.in
21 21
22GUILE_PREFIX= ${PREFIX}/guile/1.8 22GUILE_PREFIX= ${PREFIX}/guile/1.8
23GNU_CONFIGURE_PREFIX= ${GUILE_PREFIX} 23GNU_CONFIGURE_PREFIX= ${GUILE_PREFIX}
24BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX} 24BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX}
25LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib 25LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
26 26
27# XXX Make this conditional on the problematic systems. 27# XXX Make this conditional on the problematic systems.
28# couldn't figure out how to work around an error on solaris-2.9/sparc with gcc when 28# couldn't figure out how to work around an error on solaris-2.9/sparc with gcc when
29# compiling ${WRKSRC}/libguile/filesys.c. The warning is that readdir64_r was missing 29# compiling ${WRKSRC}/libguile/filesys.c. The warning is that readdir64_r was missing
30# a prototype. 30# a prototype.
31CONFIGURE_ARGS+= --disable-error-on-warning 31CONFIGURE_ARGS+= --disable-error-on-warning
32 32
33#CONFIGURE_ARGS+= --without-threads 33#CONFIGURE_ARGS+= --without-threads
34 34
35TEST_DIRS= . 35TEST_DIRS= .
36TEST_TARGET= check 36TEST_TARGET= check
37 37
38OWN_DIRS= ${PREFIX}/share/guile/site 38OWN_DIRS= ${PREFIX}/share/guile/site
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42# scmconfig.h will be rebuilt first thing. This hack is here because 42# scmconfig.h will be rebuilt first thing. This hack is here because
43# gen-scmconfig.c includes string.h (from /usr/include) which in turn 43# gen-scmconfig.c includes string.h (from /usr/include) which in turn
44# tries to include /usr/include/strings.h but instead the compiler picks 44# tries to include /usr/include/strings.h but instead the compiler picks
45# up ./strings.h which tries to include scmconfig.h which doesn't exist 45# up ./strings.h which tries to include scmconfig.h which doesn't exist
46# yet. While not a clean fix, this seems to work around the problem. 46# yet. While not a clean fix, this seems to work around the problem.
47# 47#
48# 48#
49# for info on the slib part, see 49# for info on the slib part, see
50# http://lists.gnu.org/archive/html/guile-user/2006-11/msg00035.html 50# http://lists.gnu.org/archive/html/guile-user/2006-11/msg00035.html
51post-patch: 51post-patch:
52 ${TOUCH} ${WRKSRC}/libguile/scmconfig.h 52 ${TOUCH} ${WRKSRC}/libguile/scmconfig.h
53 ${ECHO} "(define-module (ice-9 slib))" > ${WRKSRC}/ice-9/slib.scm 53 ${ECHO} "(define-module (ice-9 slib))" > ${WRKSRC}/ice-9/slib.scm
54 ${ECHO} "(load-from-path \"slib/guile.init\")" >> ${WRKSRC}/ice-9/slib.scm 54 ${ECHO} "(load-from-path \"slib/guile.init\")" >> ${WRKSRC}/ice-9/slib.scm
55 55
56CONFIGURE_ARGS.DragonFly+= ac_cv_type_complex_double=no 56CONFIGURE_ARGS.DragonFly+= ac_cv_type_complex_double=no
57 57
58.if ${OPSYS} == "Darwin" 58.if ${OPSYS} == "Darwin"
59#This define has been reported to break builds on 10.8. 59#This define has been reported to break builds on 10.8.
60#CPPFLAGS+= -Dmacosx 60#CPPFLAGS+= -Dmacosx
61 61
62# Darwin does not use -rpath, so back out the patch that adds it. It 62# Darwin does not use -rpath, so back out the patch that adds it. It
63# is not clear that guile works properly if directories with modules 63# is not clear that guile works properly if directories with modules
64# are not in LTDL_LIBRARY_PATH or LD_LIBRARY_PATH. See the following 64# are not in LTDL_LIBRARY_PATH or LD_LIBRARY_PATH. See the following
65# PRs: 65# PRs:
66# http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=33665 66# http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=33665
67# http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=36975 67# http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=36975
68post-patch: post-patch-darwin 68post-patch: post-patch-darwin
69post-patch-darwin: .PHONY 69post-patch-darwin: .PHONY
70 ${MV} ${WRKSRC}/guile-config/guile-config.in.orig \ 70 ${MV} ${WRKSRC}/guile-config/guile-config.in.orig \
71 ${WRKSRC}/guile-config/guile-config.in 71 ${WRKSRC}/guile-config/guile-config.in
72.endif 72.endif
73 73
74.include "../../devel/gmp/buildlink3.mk" 74.include "../../devel/gmp/buildlink3.mk"
75.include "../../devel/libltdl/buildlink3.mk" 75.include "../../devel/libltdl/buildlink3.mk"
76.include "../../devel/readline/buildlink3.mk" 76.include "../../devel/readline/buildlink3.mk"
77.include "../../mk/pthread.buildlink3.mk" 77.include "../../mk/pthread.buildlink3.mk"
78.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/lang/guile20/Makefile (switch to unified diff)

--- pkgsrc/lang/guile20/Makefile 2016/09/16 06:26:13 1.5
+++ pkgsrc/lang/guile20/Makefile 2016/09/19 11:21:11 1.6
@@ -1,66 +1,66 @@ @@ -1,66 +1,66 @@
1# $NetBSD: Makefile,v 1.5 2016/09/16 06:26:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2016/09/19 11:21:11 wiz Exp $
2 2
3DISTNAME= guile-2.0.12 3DISTNAME= guile-2.0.12
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= ftp://ftp.gnu.org/gnu/guile/ 10HOMEPAGE= https://www.gnu.org/software/guile/
11COMMENT= Official extension language for the GNU operating system 11COMMENT= Official extension language for the GNU operating system
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
51# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24002 51# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24002
52post-configure: 52post-configure:
53 ${ECHO} '#define FLEXIBLE_ARRAY_MEMBER /**/' >> ${WRKSRC}/config.h 53 ${ECHO} '#define FLEXIBLE_ARRAY_MEMBER /**/' >> ${WRKSRC}/config.h
54 54
55.include "../../devel/gmp/buildlink3.mk" 55.include "../../devel/gmp/buildlink3.mk"
56.include "../../converters/libiconv/buildlink3.mk" 56.include "../../converters/libiconv/buildlink3.mk"
57.include "../../devel/gettext-lib/buildlink3.mk" 57.include "../../devel/gettext-lib/buildlink3.mk"
58.include "../../devel/libltdl/buildlink3.mk" 58.include "../../devel/libltdl/buildlink3.mk"
59.include "../../textproc/libunistring/buildlink3.mk" 59.include "../../textproc/libunistring/buildlink3.mk"
60# needs a particular bug fix on NetBSD 60# needs a particular bug fix on NetBSD
61BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4.2nb1 61BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4.2nb1
62.include "../../devel/boehm-gc/buildlink3.mk" 62.include "../../devel/boehm-gc/buildlink3.mk"
63.include "../../devel/libffi/buildlink3.mk" 63.include "../../devel/libffi/buildlink3.mk"
64.include "../../devel/readline/buildlink3.mk" 64.include "../../devel/readline/buildlink3.mk"
65#.include "../../mk/pthread.buildlink3.mk" 65#.include "../../mk/pthread.buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"