diff --git a/lang/ccl/Makefile b/lang/ccl/Makefile index 6a652f44a723..df23dd752148 100644 --- a/lang/ccl/Makefile +++ b/lang/ccl/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ccl -PORTVERSION= 1.10 +PORTVERSION= 1.11 CATEGORIES= lang lisp MASTER_SITES= ftp://ftp.clozure.com/pub/release/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsdx86 @@ -9,6 +9,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsdx86 MAINTAINER= olgeni@FreeBSD.org COMMENT= Clozure CL is a free Common Lisp implementation +LICENSE= LGPL21 + WRKSRC= ${WRKDIR}/ccl ONLY_FOR_ARCHS= i386 amd64 @@ -51,11 +53,11 @@ do-build: do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ccl - @${CP} -r ${WRKSRC}/* ${STAGEDIR}${CCL_DIRECTORY} + ${CP} -r ${WRKSRC}/* ${STAGEDIR}${CCL_DIRECTORY} @for i in ${EXCLUDE}; do \ ${RM} -r -f ${STAGEDIR}${CCL_DIRECTORY}/$${i}; \ done - @${INSTALL_SCRIPT} ${WRKDIR}/ccl.sh ${STAGEDIR}${PREFIX}/bin/ccl + ${INSTALL_SCRIPT} ${WRKDIR}/ccl.sh ${STAGEDIR}${PREFIX}/bin/ccl post-install: @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/ccl/* -type d -empty \ diff --git a/lang/ccl/distinfo b/lang/ccl/distinfo index 9780f275d1bd..357516b00e9e 100644 --- a/lang/ccl/distinfo +++ b/lang/ccl/distinfo @@ -1,2 +1,2 @@ -SHA256 (ccl-1.10-freebsdx86.tar.gz) = d68095f88c6b8c8bafc1e1f6d106fe315a51d62857e3b60bd828859e8023db82 -SIZE (ccl-1.10-freebsdx86.tar.gz) = 45939859 +SHA256 (ccl-1.11-freebsdx86.tar.gz) = 9110e5f4b1b0940c42fcc812b5ceafe6b4b2ca7706db4e2698e5d4943646273f +SIZE (ccl-1.11-freebsdx86.tar.gz) = 44608881 diff --git a/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile b/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile new file mode 100644 index 000000000000..c6cb3ddbd0ea --- /dev/null +++ b/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile @@ -0,0 +1,11 @@ +--- lisp-kernel/freebsdx8632/Makefile.orig 2015-11-06 20:10:03 UTC ++++ lisp-kernel/freebsdx8632/Makefile +@@ -21,7 +21,7 @@ AS = as + M4 = m4 + ASFLAGS = --32 + M4FLAGS = -DFREEBSD -DX86 -DX8632 -DHAVE_TLS +-CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION) ++CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS + CDEBUG = -g + COPT = #-O2 + # Once in a while, -Wformat says something useful. The odds are against that, diff --git a/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile b/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile new file mode 100644 index 000000000000..78bc530c0616 --- /dev/null +++ b/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile @@ -0,0 +1,11 @@ +--- lisp-kernel/freebsdx8664/Makefile.orig 2015-11-06 20:10:02 UTC ++++ lisp-kernel/freebsdx8664/Makefile +@@ -21,7 +21,7 @@ AS = as + M4 = m4 + ASFLAGS = --64 + M4FLAGS = -DFREEBSD -DX86 -DX8664 -DHAVE_TLS +-CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION) ++CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS + CDEBUG = -g + COPT = #-O2 + # Once in a while, -Wformat says something useful. The odds are against that, diff --git a/lang/ccl/files/patch-lisp-kernel_memory.c b/lang/ccl/files/patch-lisp-kernel_memory.c index 24dffad467b9..23b7fad56b32 100644 --- a/lang/ccl/files/patch-lisp-kernel_memory.c +++ b/lang/ccl/files/patch-lisp-kernel_memory.c @@ -1,5 +1,5 @@ ---- lisp-kernel/memory.c.orig 2014-10-08 10:40:13.000000000 -0400 -+++ lisp-kernel/memory.c 2014-10-08 10:41:19.000000000 -0400 +--- lisp-kernel/memory.c.orig 2015-11-06 20:10:03 UTC ++++ lisp-kernel/memory.c @@ -89,7 +89,7 @@ ReserveMemoryForHeap(LogicalAddress want start = mmap((void *)want, totalsize + heap_segment_size, @@ -18,7 +18,7 @@ return NULL; } } -@@ -877,7 +877,7 @@ ReserveMemory(natural size) +@@ -907,7 +907,7 @@ ReserveMemory(natural size) PAGE_NOACCESS); return p; #else diff --git a/lang/ccl/pkg-message b/lang/ccl/pkg-message index f2937a620409..305b8ed74d58 100644 --- a/lang/ccl/pkg-message +++ b/lang/ccl/pkg-message @@ -1,6 +1,4 @@ - You can permanently enable ASDF package management by using the following commands in your .ccl-init.lisp file: (require 'asdf) -