diff --git a/lang/ccl/Makefile b/lang/ccl/Makefile index b441931ce25e..583e99467b6d 100644 --- a/lang/ccl/Makefile +++ b/lang/ccl/Makefile @@ -1,22 +1,24 @@ # $FreeBSD$ PORTNAME= ccl -PORTVERSION= 1.11 +PORTVERSION= 1.12 PORTREVISION= 1 CATEGORIES= lang lisp -MASTER_SITES= ftp://ftp.clozure.com/pub/release/${PORTVERSION}/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsdx86 + +USE_GITHUB= nodefault +GH_ACCOUNT= Clozure +GH_TAGNAME= v${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT freebsdx86.tar.gz:bootstrap +DIST_SUBDIR= ${PORTNAME}/v${PORTVERSION} +MASTER_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/:bootstrap +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Clozure CL is a free Common Lisp implementation LICENSE= LGPL21 -WRKSRC= ${WRKDIR}/ccl - -BROKEN_FreeBSD_12= SHF_MERGE section size must be a multiple of sh_entsize -BROKEN_FreeBSD_13= SHF_MERGE section size must be a multiple of sh_entsize -ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS= amd64 CCL_DIRECTORY= ${PREFIX}/lib/ccl CCL_PLIST= ${WRKDIR}/pkg-plist @@ -42,8 +44,12 @@ EXCLUDE+= fx86cl fx86cl.image SUB_LIST+= FX86CL="${FX86CL}" CCL_DIRECTORY="${CCL_DIRECTORY}" SUB_FILES= ccl.sh +post-extract: .EXEC + @cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/freebsdx86.tar.gz + post-patch: @${SED} -i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/tools/asdf.lisp + @${SED} -i '' -e 's|%%TAG%%|v${PORTVERSION}|' ${WRKSRC}/lisp-kernel/freebsdx86*/Makefile @${FIND} ${WRKSRC} -name .svn -or -name .cvsignore -or -name "*.orig" \ | ${XARGS} ${RM} -r diff --git a/lang/ccl/distinfo b/lang/ccl/distinfo index 357516b00e9e..d3478843dba0 100644 --- a/lang/ccl/distinfo +++ b/lang/ccl/distinfo @@ -1,2 +1,5 @@ -SHA256 (ccl-1.11-freebsdx86.tar.gz) = 9110e5f4b1b0940c42fcc812b5ceafe6b4b2ca7706db4e2698e5d4943646273f -SIZE (ccl-1.11-freebsdx86.tar.gz) = 44608881 +TIMESTAMP = 1587890495 +SHA256 (ccl/v1.12/ccl-1.12.tar.gz) = 774a06b4fb6dc4b51dfb26da8e1cc809c605e7706c12180805d1be6f2885bd52 +SIZE (ccl/v1.12/ccl-1.12.tar.gz) = 5014439 +SHA256 (ccl/v1.12/freebsdx86.tar.gz) = 43d4bec7af719462807c39d2bc16c8a5482ee62084861e0997b0596c525257e3 +SIZE (ccl/v1.12/freebsdx86.tar.gz) = 6526273 diff --git a/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile b/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile index c6cb3ddbd0ea..2e8251136031 100644 --- a/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile +++ b/lang/ccl/files/patch-lisp-kernel_freebsdx8632_Makefile @@ -1,11 +1,11 @@ ---- lisp-kernel/freebsdx8632/Makefile.orig 2015-11-06 20:10:03 UTC +--- lisp-kernel/freebsdx8632/Makefile.orig 2020-04-19 21:32:56 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, +@@ -13,7 +13,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-VC_REVISION != sh -c "git describe --dirty 2>/dev/null || echo unknown" ++VC_REVISION:= %%TAG%% + + VPATH = .. + RM = /bin/rm diff --git a/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile b/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile index 78bc530c0616..5511c80cc552 100644 --- a/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile +++ b/lang/ccl/files/patch-lisp-kernel_freebsdx8664_Makefile @@ -1,11 +1,11 @@ ---- lisp-kernel/freebsdx8664/Makefile.orig 2015-11-06 20:10:02 UTC +--- lisp-kernel/freebsdx8664/Makefile.orig 2020-04-19 21:32:56 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, +@@ -13,7 +13,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-VC_REVISION != sh -c "git describe --dirty 2>/dev/null || echo unknown" ++VC_REVISION:= %%TAG%% + + VPATH = .. + RM = /bin/rm diff --git a/lang/ccl/files/patch-lisp-kernel_memory.c b/lang/ccl/files/patch-lisp-kernel_memory.c deleted file mode 100644 index 23b7fad56b32..000000000000 --- a/lang/ccl/files/patch-lisp-kernel_memory.c +++ /dev/null @@ -1,29 +0,0 @@ ---- 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, - PROT_NONE, -- MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -+ MAP_PRIVATE | MAP_ANON, - -1, - 0); - if (start == MAP_FAILED) { -@@ -99,7 +99,7 @@ ReserveMemoryForHeap(LogicalAddress want - if (start != want) { - munmap(start, totalsize+heap_segment_size); - start = (void *)((((natural)start)+heap_segment_size-1) & ~(heap_segment_size-1)); -- if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE | MAP_ANON | MAP_FIXED | MAP_NORESERVE, -1, 0) != start) { -+ if(mmap(start, totalsize, PROT_NONE, MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0) != start) { - return NULL; - } - } -@@ -907,7 +907,7 @@ ReserveMemory(natural size) - PAGE_NOACCESS); - return p; - #else -- p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE|MAP_ANON|MAP_NORESERVE,-1,0); -+ p = mmap(NULL,size,PROT_NONE,MAP_PRIVATE|MAP_ANON,-1,0); - if (p == MAP_FAILED) { - return NULL; - } diff --git a/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8632.h b/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8632.h deleted file mode 100644 index bd767a29fe90..000000000000 --- a/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8632.h +++ /dev/null @@ -1,19 +0,0 @@ ---- lisp-kernel/platform-freebsdx8632.h.orig 2018-03-20 12:24:58.894882000 -0700 -+++ lisp-kernel/platform-freebsdx8632.h 2018-03-20 12:26:51.327100000 -0700 -@@ -42,6 +42,7 @@ typedef struct __ucontext ExceptionInfor - - #include - #include -+#include - #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext))) - #define xpGPR(x,gprno) (xpGPRvector(x)[gprno]) - #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new) -@@ -56,7 +57,7 @@ extern void freebsd_sigreturn(ExceptionI - #define IS_PAGE_FAULT(info,xp) (xp->uc_mcontext.mc_trapno == T_PAGEFLT) - #define SIGRETURN(context) freebsd_sigreturn(context) - --#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4) -+#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4) - #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[130])) - #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[131])) - diff --git a/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8664.h b/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8664.h deleted file mode 100644 index b4ca986eeba1..000000000000 --- a/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8664.h +++ /dev/null @@ -1,19 +0,0 @@ ---- lisp-kernel/platform-freebsdx8664.h.orig 2018-03-20 12:25:05.151015000 -0700 -+++ lisp-kernel/platform-freebsdx8664.h 2018-03-20 12:26:36.751044000 -0700 -@@ -47,6 +47,7 @@ typedef struct __ucontext ExceptionInfor - #define REG_RSP 23 - - #include -+#include - #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext))) - #define xpGPR(x,gprno) (xpGPRvector(x)[gprno]) - #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new) -@@ -67,7 +68,7 @@ extern void freebsd_sigreturn(ExceptionI - fbsd 9.1 headers; if we built on an older OS version, we still need - to know about this if we run on 9.1+ */ - --#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4) -+#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4) - #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[66])) - #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[67])) -