summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/ecl/DESCR3
-rw-r--r--lang/ecl/Makefile10
-rw-r--r--lang/ecl/PLIST5
-rw-r--r--lang/ecl/buildlink3.mk4
-rw-r--r--lang/ecl/distinfo8
-rw-r--r--lang/ecl/options.mk25
6 files changed, 44 insertions, 11 deletions
diff --git a/lang/ecl/DESCR b/lang/ecl/DESCR
index 1e1374a2d17..cf234682344 100644
--- a/lang/ecl/DESCR
+++ b/lang/ecl/DESCR
@@ -15,3 +15,6 @@ The current ECL implementation features:
* The Gnu Multiprecision library for fast bignum operations.
* A simple conservative mark & sweep garbage collector.
* The Boehm-Weiser garbage collector.
+ * Threads using the POSIX threads library.
+ * CLX, an X11 client not needing extra X11 libraries.
+ * Unicode.
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index bfec1f342e9..03c31501e11 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/12/15 15:14:54 asau Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/15 05:20:13 asau Exp $
#
-DISTNAME= ecl-9.12.3
+DISTNAME= ecl-10.3.1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ecls/}
EXTRACT_SUFX= .tgz
@@ -22,6 +22,12 @@ INFO_FILES= yes
CONFIGURE_ARGS+= --enable-boehm=system --with-system-gmp
+SUBST_CLASSES+= fix-libffi-include
+SUBST_STAGE.fix-libdir= post-patch
+SUBST_MESSAGE.fix-libdir= Fixing libffi layout.
+SUBST_FILES.fix-libdir= src/c/ffi.d
+SUBST_SED.fix-libdir= -e '/include.*<ffi/ffi.h>/s:ffi/ffi.h:ffi.h:'
+
.include "options.mk"
PLIST_SUBST= PKGVERSION_MAJOR_MINOR=${PKGVERSION_NOREV:R} \
diff --git a/lang/ecl/PLIST b/lang/ecl/PLIST
index f2ba341ed11..aaa3fe548ec 100644
--- a/lang/ecl/PLIST
+++ b/lang/ecl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/10/11 11:15:40 asau Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/03/15 05:20:13 asau Exp $
bin/ecl
bin/ecl-config
include/ecl/bytecodes.h
@@ -17,9 +17,12 @@ include/ecl/page.h
include/ecl/stacks.h
include/ecl/unify.h
lib/${PKGNAME}/BUILD-STAMP
+lib/${PKGNAME}/TAGS
lib/${PKGNAME}/asdf.fas
lib/${PKGNAME}/bytecmp.asd
lib/${PKGNAME}/bytecmp.fas
+${PLIST.clx}lib/${PKGNAME}/clx.asd
+${PLIST.clx}lib/${PKGNAME}/clx.fas
lib/${PKGNAME}/cmp.asd
lib/${PKGNAME}/cmp.fas
lib/${PKGNAME}/defsystem.asd
diff --git a/lang/ecl/buildlink3.mk b/lang/ecl/buildlink3.mk
index d034ac8cad2..91e3e6c1f7b 100644
--- a/lang/ecl/buildlink3.mk
+++ b/lang/ecl/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/03/15 05:20:13 asau Exp $
BUILDLINK_TREE+= ecl
.if !defined(ECL_BUILDLINK3_MK)
ECL_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.ecl+= ecl>=0.9.12
+BUILDLINK_API_DEPENDS.ecl+= ecl>=10.3.1
BUILDLINK_PKGSRCDIR.ecl?= ../../lang/ecl
.include "../../devel/boehm-gc/buildlink3.mk"
diff --git a/lang/ecl/distinfo b/lang/ecl/distinfo
index ea9f5dbb8ae..2329e4d8f89 100644
--- a/lang/ecl/distinfo
+++ b/lang/ecl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/12/15 15:14:54 asau Exp $
+$NetBSD: distinfo,v 1.7 2010/03/15 05:20:13 asau Exp $
-SHA1 (ecl-9.12.3.tgz) = cf293b029f33b0b0f9539e9163618a9d31df6f30
-RMD160 (ecl-9.12.3.tgz) = 10deb139394edffce8f1f7f4b1c682b9a86f93d9
-Size (ecl-9.12.3.tgz) = 5758828 bytes
+SHA1 (ecl-10.3.1.tgz) = b3e95fc0bf10ab953fffc04badbc28df1e1e37fc
+RMD160 (ecl-10.3.1.tgz) = e8c6dce125c973bc4e3ad07035046aad7bb6ca8c
+Size (ecl-10.3.1.tgz) = 5906221 bytes
diff --git a/lang/ecl/options.mk b/lang/ecl/options.mk
index 971bce226b7..792d571586f 100644
--- a/lang/ecl/options.mk
+++ b/lang/ecl/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2009/08/19 14:21:03 asau Exp $
+# $NetBSD: options.mk,v 1.3 2010/03/15 05:20:13 asau Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ecl
-PKG_SUPPORTED_OPTIONS+= threads unicode
+PKG_SUPPORTED_OPTIONS+= threads unicode ffi clx
PKG_SUGGESTED_OPTIONS+= # empty
# Unicode support proved to break Axioms.
# Threads are off, since threaded ECL requires threads support
@@ -16,6 +16,11 @@ CONFIGURE_ARGS+= --enable-threads --enable-debug
CONFIGURE_ENV+= THREAD_CFLAGS=${PTHREAD_CFLAGS:Q}
CONFIGURE_ENV+= THREAD_LDLAGS=${BUILDLINK_LDLAGS.pthread:Q}
CONFIGURE_ENV+= THREAD_LIBS=${BUILDLINK_LIBS.pthread:Q}
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= --with-__thread=yes
+.else
+CONFIGURE_ARGS+= --with-__thread=no
+.endif
.include "../../mk/pthread.buildlink3.mk"
.endif
@@ -23,3 +28,19 @@ CONFIGURE_ENV+= THREAD_LIBS=${BUILDLINK_LIBS.pthread:Q}
CONFIGURE_ARGS+= --enable-unicode
PLIST_SRC+= PLIST.unicode
.endif
+
+.if !empty(PKG_OPTIONS:Mffi)
+.include "../../devel/libffi/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mclx)
+CONFIGURE_ARGS+= --with-clx
+.endif
+
+PLIST_VARS+= clx
+
+.for option in clx
+. if !empty(PKG_OPTIONS:M${option})
+PLIST.${option}= yes
+. endif
+.endfor