summaryrefslogtreecommitdiff
path: root/lang/ecl
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ecl')
-rw-r--r--lang/ecl/Makefile6
-rw-r--r--lang/ecl/PLIST3
-rw-r--r--lang/ecl/distinfo12
-rw-r--r--lang/ecl/patches/patch-aa30
-rw-r--r--lang/ecl/patches/patch-ab38
-rw-r--r--lang/ecl/patches/patch-ac132
6 files changed, 9 insertions, 212 deletions
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 3071d3a86e8..748d6b94252 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2015/12/09 21:00:47 asau Exp $
+# $NetBSD: Makefile,v 1.22 2016/03/11 20:32:30 asau Exp $
-DISTNAME= ecl-16.0.0
+DISTNAME= ecl-16.1.2
CATEGORIES= lang
-MASTER_SITES= https://common-lisp.net/project/ecl/files/
+MASTER_SITES= https://common-lisp.net/project/ecl/files/release/$(PKGVERSION_NOREV)/
EXTRACT_SUFX= .tgz
MAINTAINER= asau@inbox.ru
diff --git a/lang/ecl/PLIST b/lang/ecl/PLIST
index 3d40b90b37f..3227fb20ca3 100644
--- a/lang/ecl/PLIST
+++ b/lang/ecl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/07/26 21:09:29 asau Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/03/11 20:32:30 asau Exp $
bin/ecl
bin/ecl-config
include/ecl/bytecodes.h
@@ -22,7 +22,6 @@ include/ecl/object.h
include/ecl/page.h
include/ecl/stacks.h
include/ecl/unify.h
-lib/${PKGNAME}/Copyright
lib/${PKGNAME}/LGPL
lib/${PKGNAME}/TAGS
lib/${PKGNAME}/asdf.fas
diff --git a/lang/ecl/distinfo b/lang/ecl/distinfo
index 9b6b3ef1df4..0726f8763c1 100644
--- a/lang/ecl/distinfo
+++ b/lang/ecl/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.18 2015/12/29 23:34:45 dholland Exp $
+$NetBSD: distinfo,v 1.19 2016/03/11 20:32:30 asau Exp $
-SHA1 (ecl-16.0.0.tgz) = 3309b5f4126d1a024f7eacaec6aca0e391dd3c75
-RMD160 (ecl-16.0.0.tgz) = adf1e77f0bf602534566fd986d27a7c84deac045
-Size (ecl-16.0.0.tgz) = 8009304 bytes
-SHA1 (patch-aa) = da5400c539e42cb8aa773d6dee37c2abd96102ff
-SHA1 (patch-ab) = 4a439636c118ee24448d8069f6fed37fe917b145
-SHA1 (patch-ac) = d4266cdf41f1df3fe3014dcd28c03113d798efd5
+SHA1 (ecl-16.1.2.tgz) = 73a972fa5e42d019a83d9f13447c6e6e080b9af3
+RMD160 (ecl-16.1.2.tgz) = f1b3ab9309cea2fe350fb39b141ea29c670e851e
+SHA512 (ecl-16.1.2.tgz) = f204494907226a12b4ecabc39d555f27c1ce5cba515fccd187d9b7ee584d86278558d6a26b2bbec98bce582239f21ac00c2d854f594c6b1f21e1636793845926
+Size (ecl-16.1.2.tgz) = 7449461 bytes
diff --git a/lang/ecl/patches/patch-aa b/lang/ecl/patches/patch-aa
deleted file mode 100644
index 8315e357213..00000000000
--- a/lang/ecl/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2015/12/29 23:34:46 dholland Exp $
-
-Avoid symbol name conflict on ERR.
-
---- src/c/file.d.orig 2015-08-24 02:41:27.000000000 -0400
-+++ src/c/file.d 2015-10-25 15:28:33.000000000 -0400
-@@ -5367,7 +5367,7 @@ ecl_integer_to_off_t(cl_object offset)
- } else if (ECL_BIGNUMP(offset)) {
- if (sizeof(ECL_BIGNUM_LIMBS(offset)[0]) == sizeof(cl_index)) {
- if (ECL_BIGNUM_SIZE(offset) > 2) {
-- goto ERR;
-+ goto ERROR;
- }
- if (ECL_BIGNUM_SIZE(offset) == 2) {
- output = ECL_BIGNUM_LIMBS(offset)[1];
-@@ -5376,12 +5376,12 @@ ecl_integer_to_off_t(cl_object offset)
- output += ECL_BIGNUM_LIMBS(offset)[0];
- } else if (sizeof(ECL_BIGNUM_LIMBS(offset)[0]) >= sizeof(ecl_off_t)) {
- if (ECL_BIGNUM_SIZE(offset) > 1) {
-- goto ERR;
-+ goto ERROR;
- }
- output = ECL_BIGNUM_LIMBS(offset)[0];
- }
- } else {
-- ERR: FEerror("Not a valid file offset: ~S", 1, offset);
-+ ERROR: FEerror("Not a valid file offset: ~S", 1, offset);
- }
- return output;
- }
diff --git a/lang/ecl/patches/patch-ab b/lang/ecl/patches/patch-ab
deleted file mode 100644
index 925154d067f..00000000000
--- a/lang/ecl/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2015/12/29 23:34:46 dholland Exp $
-
-Dragonfly support.
-Solaris build fixes.
-
---- src/configure.orig 2012-07-24 16:51:53.000000000 +0000
-+++ src/configure
-@@ -4567,6 +4567,16 @@ case "${host_os}" in
- SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
- SONAME_LDFLAGS="-Wl,-soname,SONAME"
- ;;
-+ dragonfly*)
-+ thehost='dragonfly'
-+ THREAD_LIBS='-lpthread'
-+ SHARED_LDFLAGS="-shared ${LDFLAGS}"
-+ BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
-+ ECL_LDRPATH="-Wl,--rpath,~A"
-+ clibs=""
-+ SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
-+ SONAME_LDFLAGS="-Wl,-soname,SONAME"
-+ ;;
- freebsd*)
- thehost='freebsd'
- THREAD_LIBS='-lpthread'
-@@ -4606,10 +4616,12 @@ case "${host_os}" in
- ECL_LDRPATH='-Wl,-R,~A'
- TCPLIBS='-lsocket -lnsl -lintl'
- clibs='-ldl'
-+ SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
-+ SONAME_LDFLAGS="-Wl,-soname,SONAME"
- # We should use C99 and _XOPEN_SOURCE=600, but Solaris 10
- # ships with GCC 3.4.3 which does not support C99
- if test "x$GCC" = "xyes"; then
-- CFLAGS="${CFLAGS} -std=gnu99"
-+ CFLAGS="${CFLAGS} -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__"
- SHARED_LDFLAGS="-shared $SHARED_LDFLAGS"
- BUNDLE_LDFLAGS="-shared $BUNDLE_LDFLAGS"
- fi
diff --git a/lang/ecl/patches/patch-ac b/lang/ecl/patches/patch-ac
deleted file mode 100644
index aee131bd896..00000000000
--- a/lang/ecl/patches/patch-ac
+++ /dev/null
@@ -1,132 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2015/12/09 21:00:47 asau Exp $
-
-Post-release fix:
-commit d077473517d2f5d62a297037b466826b4f0d7d11
-check for GC_get_thr_restart_signal only on threaded build
-
---- src/aclocal.m4.orig
-+++ src/aclocal.m4
-@@ -935,12 +935,12 @@ if test "${enable_boehm}" = auto -o "${enable_boehm}" = system; then
- dnl Try first with the prebuilt versions, if installed and accessible
- dnl
- system_boehm=yes
-- AC_CHECK_LIB( [gc], [GC_get_thr_restart_signal],
-- [], [system_boehm="no"] )
- if test "${enable_threads}" = no; then
- AC_CHECK_LIB( [gc], [GC_malloc],
- [], [system_boehm="no"] )
- else
-+ AC_CHECK_LIB( [gc], [GC_get_thr_restart_signal],
-+ [], [system_boehm="no"] )
- AC_CHECK_LIB( [gc], [GC_register_my_thread],
- [], [system_boehm="no"] )
- fi
---- src/configure.orig
-+++ src/configure
-@@ -5841,9 +5841,10 @@ case "${enable_boehm}" in
- esac
- if test "${enable_boehm}" = auto -o "${enable_boehm}" = system; then
- system_boehm=yes
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_get_thr_restart_signal in -lgc" >&5
--$as_echo_n "checking for GC_get_thr_restart_signal in -lgc... " >&6; }
--if ${ac_cv_lib_gc_GC_get_thr_restart_signal+:} false; then :
-+ if test "${enable_threads}" = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
-+$as_echo_n "checking for GC_malloc in -lgc... " >&6; }
-+if ${ac_cv_lib_gc_GC_malloc+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -5857,27 +5858,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- #ifdef __cplusplus
- extern "C"
- #endif
--char GC_get_thr_restart_signal ();
-+char GC_malloc ();
- int
- main ()
- {
--return GC_get_thr_restart_signal ();
-+return GC_malloc ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_gc_GC_get_thr_restart_signal=yes
-+ ac_cv_lib_gc_GC_malloc=yes
- else
-- ac_cv_lib_gc_GC_get_thr_restart_signal=no
-+ ac_cv_lib_gc_GC_malloc=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_get_thr_restart_signal" >&5
--$as_echo "$ac_cv_lib_gc_GC_get_thr_restart_signal" >&6; }
--if test "x$ac_cv_lib_gc_GC_get_thr_restart_signal" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
-+$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
-+if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGC 1
- _ACEOF
-@@ -5888,10 +5889,10 @@ else
- system_boehm="no"
- fi
-
-- if test "${enable_threads}" = no; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
--$as_echo_n "checking for GC_malloc in -lgc... " >&6; }
--if ${ac_cv_lib_gc_GC_malloc+:} false; then :
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_get_thr_restart_signal in -lgc" >&5
-+$as_echo_n "checking for GC_get_thr_restart_signal in -lgc... " >&6; }
-+if ${ac_cv_lib_gc_GC_get_thr_restart_signal+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -5905,27 +5906,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- #ifdef __cplusplus
- extern "C"
- #endif
--char GC_malloc ();
-+char GC_get_thr_restart_signal ();
- int
- main ()
- {
--return GC_malloc ();
-+return GC_get_thr_restart_signal ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_gc_GC_malloc=yes
-+ ac_cv_lib_gc_GC_get_thr_restart_signal=yes
- else
-- ac_cv_lib_gc_GC_malloc=no
-+ ac_cv_lib_gc_GC_get_thr_restart_signal=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
--$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
--if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_get_thr_restart_signal" >&5
-+$as_echo "$ac_cv_lib_gc_GC_get_thr_restart_signal" >&6; }
-+if test "x$ac_cv_lib_gc_GC_get_thr_restart_signal" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGC 1
- _ACEOF
-@@ -5936,7 +5937,6 @@ else
- system_boehm="no"
- fi
-
-- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_register_my_thread in -lgc" >&5
- $as_echo_n "checking for GC_register_my_thread in -lgc... " >&6; }
- if ${ac_cv_lib_gc_GC_register_my_thread+:} false; then :