diff options
29 files changed, 97 insertions, 258 deletions
diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile index b4428c0feb18..c61cbeaa6b09 100644 --- a/converters/cl-babel-sbcl/Makefile +++ b/converters/cl-babel-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= babel PORTVERSION= 2010.01.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= converters lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/buildapp/Makefile b/devel/buildapp/Makefile index 31b0bdc4774d..e460527307e6 100644 --- a/devel/buildapp/Makefile +++ b/devel/buildapp/Makefile @@ -7,7 +7,7 @@ PORTNAME= buildapp PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lisp MASTER_SITES= http://www.xach.com/lisp/ DISTNAME= ${PORTNAME} diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile index aa7291b1990c..a5bc81d6cca3 100644 --- a/devel/cl-alexandria-sbcl/Makefile +++ b/devel/cl-alexandria-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= alexandria PORTVERSION= 2010.01.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-cffi-sbcl/Makefile b/devel/cl-cffi-sbcl/Makefile index f5a60560531b..50df410cfe0d 100644 --- a/devel/cl-cffi-sbcl/Makefile +++ b/devel/cl-cffi-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= cffi PORTVERSION= 0.10.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile index 22a37ea5e223..6f430a629db5 100644 --- a/devel/cl-infix-sbcl/Makefile +++ b/devel/cl-infix-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= infix PORTVERSION= 19960628 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile index 722d24e09682..2ffe7bab3745 100644 --- a/devel/cl-port-sbcl/Makefile +++ b/devel/cl-port-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= port PORTVERSION= 2002.10.02.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile index 50ae5afa0f32..5ea077aac328 100644 --- a/devel/cl-split-sequence-sbcl/Makefile +++ b/devel/cl-split-sequence-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= split-sequence PORTVERSION= 20011114.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile index d8e2bae02063..d4cf4f0b3c05 100644 --- a/devel/cl-trivial-features-sbcl/Makefile +++ b/devel/cl-trivial-features-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= trivial-features PORTVERSION= 2010.01.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile index 9c06ffb604bc..bf0431cbd287 100644 --- a/devel/cl-trivial-gray-streams-sbcl/Makefile +++ b/devel/cl-trivial-gray-streams-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= trivial-gray-streams PORTVERSION= 2008.11.02 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-uffi-sbcl/Makefile b/devel/cl-uffi-sbcl/Makefile index 0a72ef7f91b0..ae278a153bee 100644 --- a/devel/cl-uffi-sbcl/Makefile +++ b/devel/cl-uffi-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= uffi PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index c2e59551a0af..6dd528d6b2a3 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -9,53 +9,27 @@ # PORTNAME= sbcl -PORTVERSION= 1.0.55.0 +PORTVERSION= 1.0.56 PORTEPOCH= 1 CATEGORIES= lang lisp -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} \ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries -DISTNAME= ${PORTNAME}-${PORTVERSION:R}-source${SBCLPATCHLEVEL} +DISTFILES= \ + ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} +.if !defined(NOPORTDOCS) || make(makesum) +DISTFILES+= \ + ${PORTNAME}-${PORTVERSION}-documentation-html${EXTRACT_SUFX} +.endif MAINTAINER= bf@FreeBSD.org COMMENT= A Common Lisp development system derived from the CMU CL system -# More platforms are supported, but on Linux. -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= is a native code compiler, and has not been ported to this architecture yet - -BROKEN= does not build - USE_BZIP2= yes USE_GMAKE= yes -CFLAGS+= -DSBCL_HOME=\\\"${SBCL_HOME}\\\" -CPPFLAGS+= -I. -SBCL_HOME= ${PREFIX}/lib/sbcl/ OPTIONS= SBCL "Use installed SBCL binary if available" off \ - THREADS "Enable experimental threading support" off \ - PDF "Build PDF documentation" on \ - PS "Build PostScript documentation" off - -MAN1= sbcl.1 -INFODIR= ${PREFIX}/${INFO_PATH} -.if !defined(NOPORTDOCS) -INFO= ${MANUALS_SRC} sbcl-internals -MANUALS_SRC= asdf sbcl -TEXTDOCS= BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO -MANUALS= ${MANUALS_SRC:S,$,.html,g} -MODULESDOCS= asdf/README asdf/README.SBCL \ - asdf-install/README \ - sb-aclrepl/README \ - sb-bsd-sockets/FAQ sb-bsd-sockets/NEWS \ - sb-md5/README \ - sb-posix/README \ - sb-rotate-byte/README \ - sb-simple-streams/README -.endif + THREADS "Enable experimental threading support" off -OSVER_MAJOR= ${OSREL:R} -NEWBOOTNAME= ${PORTNAME}-${PORTVERSION:R}-${ARCH}-freebsd${OSVER_MAJOR} -DOC_TARGETS= info html CONTRIB_MODULES= asdf \ asdf-install \ sb-aclrepl \ @@ -73,146 +47,129 @@ CONTRIB_MODULES= asdf \ sb-rt \ sb-simple-streams \ sb-sprof +MAN1= sbcl.1 +NEWBOOTNAME= ${PORTNAME}-${PORTVERSION}-${ARCH}-freebsd${OSREL:R} +ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS_REASON= is a native code compiler, and has not been ported to\ +this architecture yet +SBCL_HOME= ${PREFIX}/lib/sbcl -.if ${PORTVERSION:E} == 0 -SBCLPATCHLEVEL= #empty -.else -SBCLPATCHLEVEL= -r${PORTVERSION:E} +.if !defined(NOPORTDOCS) +MANUALS= asdf.html sbcl.html +MODULESDOCS= asdf/README asdf/README.SBCL \ + asdf-install/README \ + sb-aclrepl/README \ + sb-bsd-sockets/FAQ sb-bsd-sockets/NEWS \ + sb-md5/README \ + sb-posix/README \ + sb-rotate-byte/README \ + sb-simple-streams/README +TEXTDOCS= BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO .endif -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} - .include <bsd.port.pre.mk> -MAKE_SH_ARGS?= --with-sb-core-compression -.if defined(WITH_THREADS) -MAKE_SH_ARGS+= --with-sb-thread -.else -MAKE_SH_ARGS+= --without-sb-thread -.endif - -.if !defined(NOPORTDOCS) && (defined(WITH_PDF) || defined(WITH_PS)) -BUILD_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz -.endif - -.if !defined(NOPORTDOCS) && defined(WITH_PDF) -BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX-base \ - texi2dvi:${PORTSDIR}/print/texinfo -DOC_TARGETS+= pdf -PLIST_SUB+= PDF="" -MANUALS+= ${MANUALS_SRC:S,$,.pdf,g} -.else -PLIST_SUB+= PDF="@comment " -.endif - -.if !defined(NOPORTDOCS) && defined(WITH_PS) -BUILD_DEPENDS+= dvips:${PORTSDIR}/print/dvips -DOC_TARGETS+= ps -PLIST_SUB+= PS="" -MANUALS+= ${MANUALS_SRC:S,$,.ps,g} -.else -PLIST_SUB+= PS="@comment " -.endif +CFLAGS+= -fno-omit-frame-pointer +CPPFLAGS+= -I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\" .if ${ARCH} == "i386" +DYNAMIC_SPACE_SIZE?= 512 PLIST_SUB+= I386_ONLY="" AMD64_ONLY="@comment " SBCLCONFIG= Config.x86-freebsd -DYNAMIC_SPACE_SIZE?= 512 .else +DYNAMIC_SPACE_SIZE?= 1024 PLIST_SUB+= I386_ONLY="@comment " AMD64_ONLY="" SBCLCONFIG= Config.x86-64-freebsd -DYNAMIC_SPACE_SIZE?= 1024 .endif +MAKE_SH_ARGS?= --prefix=${PREFIX} --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \ +--with-sb-core-compression +NM?= /usr/bin/nm +NMFLAGS?= -gp + # If WITH_SBCL is defined, try to use existing "sbcl" first. -.if defined(WITH_SBCL) && exists(${LOCALBASE}/bin/sbcl) && !make(makesum) -LISP_CMD= "" -.else +.if !defined(WITH_SBCL) || !exists(${LOCALBASE}/bin/sbcl) || make(makesum) BOOT_VERSION= 1.0.31 . if make(makesum) BOOT_ARCH_OS_LIST= amd64-freebsd8 amd64-freebsd7 i386-freebsd8 \ i386-freebsd7 . else -. if ${OSVER_MAJOR} > 8 # We'll use 8.x bootstrap for now +. if ${OSREL:R} > 8 # We'll use 8.x bootstrap for now BOOT_ARCH_OS_LIST= ${ARCH}-freebsd8 . else -BOOT_ARCH_OS_LIST= ${ARCH}-freebsd${OSVER_MAJOR} +BOOT_ARCH_OS_LIST= ${ARCH}-freebsd${OSREL:R} . endif . endif -. ifdef(DYNAMIC_SPACE_SIZE) -LISP_EXTRA_ARG= --dynamic-space-size ${DYNAMIC_SPACE_SIZE} -. endif - -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} . for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST} BOOT_DISTNAME= ${PORTNAME}-${BOOT_VERSION}-${BOOT_ARCH_OS} DISTFILES:= ${DISTFILES} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:binaries . endfor -LISP_CMD= "${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core ${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core ${LISP_EXTRA_ARG} --disable-debugger --userinit /dev/null --sysinit /dev/null" + +XC_HOST?= ${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core \ +${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core \ +--dynamic-space-size ${DYNAMIC_SPACE_SIZE} \ +--disable-debugger --userinit /dev/null --sysinit /dev/null +MAKE_SH_ARGS+= --xc-host='${XC_HOST}' .endif # defined(WITH_SBCL) +.if defined(WITH_THREADS) +MAKE_SH_ARGS+= --with-sb-thread +.else +MAKE_SH_ARGS+= --without-sb-thread +.endif + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "---------------------------------------------------------" - @${ECHO_MSG} "You might need to increase memory limits in order to" + @${ECHO_MSG} "You might need to adjust memory limits in order to" @${ECHO_MSG} "build SBCL." @${ECHO_MSG} - @${ECHO_MSG} "You can use the DYNAMIC_SPACE_SIZE knob to tweak the size" - @${ECHO_MSG} "of SBCL dynamically allocated memory." + @${ECHO_MSG} "You can use the DYNAMIC_SPACE_SIZE knob to change the size" + @${ECHO_MSG} "of SBCL dynamically-allocated memory." @${ECHO_MSG} "---------------------------------------------------------" @${ECHO_MSG} post-patch: @${ECHO_CMD} "CC=${CC}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${ECHO_CMD} "CFLAGS=${CFLAGS} -fno-omit-frame-pointer" >> \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} + @${ECHO_CMD} "CFLAGS=${CFLAGS}" >> \ + ${WRKSRC}/src/runtime/${SBCLCONFIG} @${ECHO_CMD} "CPPFLAGS=${CPPFLAGS}" >> \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} + ${WRKSRC}/src/runtime/${SBCLCONFIG} @${ECHO_CMD} "GREP=${GREP}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG} @${ECHO_CMD} "LD=${LD}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG} @${ECHO_CMD} "LINKFLAGS=${LDFLAGS} -dynamic -rdynamic" >> \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} + ${WRKSRC}/src/runtime/${SBCLCONFIG} + @${ECHO_CMD} "NM=${NM} ${NMFLAGS}" >> \ + ${WRKSRC}/src/runtime/${SBCLCONFIG} @${REINPLACE_CMD} -E -e 's,-lthr,-pthread,g' \ -e 's,-lpthread,-pthread,g' ${WRKSRC}/src/runtime/${SBCLCONFIG} -.ifdef(NM) - @${ECHO_CMD} "NM=${NM} -gp" >> ${WRKSRC}/src/runtime/${SBCLCONFIG} -.endif @${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -e 's|\.core|_core|g' @${REINPLACE_CMD} \ - -e 's|/etc/sbclrc|${PREFIX}&|g' \ -e 's|/usr/local|${PREFIX}|g' \ - ${WRKSRC}/doc/sbcl.1 \ - ${WRKSRC}/doc/manual/*.texinfo \ - ${WRKSRC}/src/code/toplevel.lisp - @${REINPLACE_CMD} -e '\|CC=|s|gcc|${CC}|' ${WRKSRC}/contrib/asdf-module.mk - @${REINPLACE_CMD} -e 's|"cc"|"${CC}"|' \ - -e 's|"-O3"|"${CFLAGS}"|' \ - ${WRKSRC}/tests/swap-lispobjs.impure.lisp - @${REINPLACE_CMD} -e 's|cc -c|${CC} -c|' \ - -e 's|ld \$$SO_FLAGS|${LD} \$$SO_FLAGS|' \ - ${WRKSRC}/tests/foreign.test.sh - @${REINPLACE_CMD} -E -e 's,makeinfo,makeinfo --no-split,g' \ - ${WRKSRC}/doc/internals/Makefile + ${WRKSRC}/doc/sbcl.1 + @${REINPLACE_CMD} -e '\|CC?=|s|gcc|${CC}|' \ + ${WRKSRC}/contrib/asdf-module.mk + @${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \ + -e 's!\$$(TEST_FILESTEM|1)_core!$${\1}_core!g' \ + ${WRKSRC}/tests/core.test.sh \ + ${WRKSRC}/tests/foreign.test.sh + @${REINPLACE_CMD} -E -e 's!"-O3"!!' \ + -e 's!("-sbcl-(pic|shared)"[[:blank:]]*)+!& ${CFLAGS:C/.*/"&"/}!' \ + ${WRKSRC}/tests/foreign-stack-alignment.impure.lisp \ + ${WRKSRC}/tests/kill-non-lisp-thread.impure.lisp \ + ${WRKSRC}/tests/swap-lispobjs.impure.lisp \ + ${WRKSRC}/tests/threads.impure.lisp + @${REINPLACE_CMD} -e 's|( cd ./doc ; sh ./clean.sh )|#&|' \ + ${WRKSRC}/clean.sh do-build: @${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete - @(cd ${WRKSRC} && ${SETENV} CC="${CC}" INSTALL_ROOT=${PREFIX} \ - LISP_EXTRA_ARG="${LISP_EXTRA_ARG}" \ - ${SH} make.sh ${LISP_CMD} ${MAKE_SH_ARGS}) + @(cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS}) @${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output -.if !defined(NOPORTDOCS) - @(cd ${WRKSRC}/doc/manual && ${SETENV} \ - LISP_EXTRA_ARG="${LISP_EXTRA_ARG}" \ - ${GMAKE} MAKEINFO='makeinfo --no-split' ${DOC_TARGETS}) - @(cd ${WRKSRC}/doc/internals && ${GMAKE} sbcl-internals.info) -.if defined(WITH_PDF) - @(cd ${WRKSRC}/doc/internals && ${GMAKE} sbcl-internals.pdf) -.endif -.endif @${REINPLACE_CMD} -E -e \ 's|\$$Date\$$|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`|g" \ ${WRKSRC}/doc/sbcl.1 @@ -230,14 +187,6 @@ do-install: .endfor .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/ - ${INSTALL_DATA} ${MANUALS_SRC:S,^,${WRKSRC}/doc/manual/,g:S,$,.info,g} \ - ${INFODIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/internals/sbcl-internals.info \ - ${INFODIR}/ -.if defined(WITH_PDF) - ${INSTALL_DATA} ${WRKSRC}/doc/internals/sbcl-internals.pdf \ - ${DOCSDIR}/ -.endif ${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} ${DOCSDIR}/ ${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${DOCSDIR}/ ${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${DOCSDIR}/,g} @@ -250,8 +199,7 @@ do-install: @${TOUCH} ${SBCL_HOME}/site-systems/.keep_me check regression-test test: build - (cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" \ - LISP_EXTRA_ARG="${LISP_EXTRA_ARG}" ${SH} run-tests.sh) + (cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh) bootstrap: ${CP} -r ${WRKSRC} ${WRKDIR}/${NEWBOOTNAME} diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo index bb408faac631..b0298475090a 100644 --- a/lang/sbcl/distinfo +++ b/lang/sbcl/distinfo @@ -1,5 +1,7 @@ -SHA256 (sbcl-1.0.55-source.tar.bz2) = e3216a7b9c302b6c1431d0f1ae444008de8ac465eb44f4ae841300d052d207ad -SIZE (sbcl-1.0.55-source.tar.bz2) = 3611026 +SHA256 (sbcl-1.0.56-source.tar.bz2) = 3c50bfa3381f46b87175ab6ecb75bf9c37974ff3f21b1f3c50dbdab1bf870533 +SIZE (sbcl-1.0.56-source.tar.bz2) = 3615389 +SHA256 (sbcl-1.0.56-documentation-html.tar.bz2) = 5a46a42a82e0ff665d3b862588e93ac1668b6d2a41ed305d927d0eecc9896b50 +SIZE (sbcl-1.0.56-documentation-html.tar.bz2) = 165974 SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764 SHA256 (sbcl-1.0.31-amd64-freebsd7-binary.tar.bz2) = fcbd5ed1948312a7b6eff7e6daf736e41be945a2c57bcee4b64f172ddde518b8 diff --git a/lang/sbcl/files/patch-contrib_asdf-module.mk b/lang/sbcl/files/patch-contrib_asdf-module.mk deleted file mode 100644 index 1e9c654b0d1f..000000000000 --- a/lang/sbcl/files/patch-contrib_asdf-module.mk +++ /dev/null @@ -1,8 +0,0 @@ ---- contrib/asdf-module.mk.orig 2011-09-21 17:44:49.000000000 -0700 -+++ contrib/asdf-module.mk 2011-09-21 17:45:24.000000000 -0700 -@@ -1,4 +1,4 @@ --CC=cc -+CC?=cc - - # We need to extend flags to the C compiler and the linker - # here. sb-posix, sb-grovel, and sb-bsd-sockets depends upon these diff --git a/lang/sbcl/files/patch-doc_internals_make-top.sh b/lang/sbcl/files/patch-doc_internals_make-top.sh deleted file mode 100644 index 19df7702e0a6..000000000000 --- a/lang/sbcl/files/patch-doc_internals_make-top.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/internals/make-top.sh.orig 2010-10-18 11:50:18.000000000 -0700 -+++ doc/internals/make-top.sh 2010-10-18 11:50:53.000000000 -0700 -@@ -31,7 +31,7 @@ - for texinfo in *.texinfo - do - if ! [ $texinfo = sbcl-internals.texinfo ]; then -- grep @node $texinfo | head -n 1 | perl -p -e "s/\@node\ (.*)/* \$1::/" >> top-menu.include -+ sed '/@node/ { s/@node \(.*\)/* \1::/; q; }' $texinfo >> top-menu.include - echo "@include $texinfo" >> top-include.include - fi - done diff --git a/lang/sbcl/files/patch-doc_internals_sbcl-internals.texinfo b/lang/sbcl/files/patch-doc_internals_sbcl-internals.texinfo deleted file mode 100644 index 5acb73f64bd6..000000000000 --- a/lang/sbcl/files/patch-doc_internals_sbcl-internals.texinfo +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/internals/sbcl-internals.texinfo~ -+++ doc/internals/sbcl-internals.texinfo -@@ -9,7 +9,7 @@ - @c for install-info - @dircategory Software development - @direntry --* sbcl-internals: (sbcl internals). SBCL internal documentation -+* sbcl internals: (sbcl-internals). SBCL internal documentation - @end direntry - - @copying diff --git a/lang/sbcl/files/patch-doc_manual_make-tempfiles.sh b/lang/sbcl/files/patch-doc_manual_make-tempfiles.sh deleted file mode 100644 index 07e32c8da07a..000000000000 --- a/lang/sbcl/files/patch-doc_manual_make-tempfiles.sh +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- doc/manual/make-tempfiles.sh.orig -+++ doc/manual/make-tempfiles.sh -@@ -33,7 +33,7 @@ - SBCLRUNTIME="$1" - fi - --SBCL="$SBCLRUNTIME --noinform --no-sysinit --no-userinit --noprint --disable-debugger" -+SBCL="$SBCLRUNTIME ${LISP_EXTRA_ARG} --noinform --no-sysinit --no-userinit --noprint --disable-debugger" - - # extract version and date - VERSION=`$SBCL --eval '(write-line (lisp-implementation-version))' --eval '(sb-ext:quit)'` diff --git a/lang/sbcl/files/patch-make-target-2.sh b/lang/sbcl/files/patch-make-target-2.sh deleted file mode 100644 index f4d5539a87da..000000000000 --- a/lang/sbcl/files/patch-make-target-2.sh +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- make-target-2.sh.orig -+++ make-target-2.sh -@@ -31,11 +31,13 @@ - # for much longer than that, don't worry, it's likely to be normal. - echo //doing warm init - compilation phase - ./src/runtime/sbcl \ -+${LISP_EXTRA_ARG} \ - --core output/cold-sbcl.core \ - --lose-on-corruption \ - --no-sysinit --no-userinit < make-target-2.lisp - echo //doing warm init - load and dump phase - ./src/runtime/sbcl \ -+${LISP_EXTRA_ARG} \ - --core output/cold-sbcl.core \ - --lose-on-corruption \ - --no-sysinit --no-userinit < make-target-2-load.lisp diff --git a/lang/sbcl/files/patch-make-target-contrib.sh b/lang/sbcl/files/patch-make-target-contrib.sh deleted file mode 100644 index 249aa068a919..000000000000 --- a/lang/sbcl/files/patch-make-target-contrib.sh +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- make-target-contrib.sh.orig -+++ make-target-contrib.sh -@@ -32,7 +32,7 @@ - SBCL_PWD=`echo $SBCL_PWD | sed s/\ /\\\\\\\\\ /g` - fi - --SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core \ -+SBCL="$SBCL_PWD/src/runtime/sbcl ${LISP_EXTRA_ARG} --noinform --core $SBCL_PWD/output/sbcl.core \ - --lose-on-corruption --disable-debugger --no-sysinit --no-userinit" - SBCL_BUILDING_CONTRIB=1 - export SBCL SBCL_BUILDING_CONTRIB diff --git a/lang/sbcl/files/patch-src_runtime_gencgc-internal.h b/lang/sbcl/files/patch-src_runtime_gencgc-internal.h deleted file mode 100644 index 25429a69d2a6..000000000000 --- a/lang/sbcl/files/patch-src_runtime_gencgc-internal.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/runtime/gencgc-internal.h.orig 2011-09-21 17:45:32.000000000 -0700 -+++ src/runtime/gencgc-internal.h 2011-09-21 17:46:00.000000000 -0700 -@@ -25,8 +25,8 @@ - #include "genesis/code.h" - - void gc_free_heap(void); --inline page_index_t find_page_index(void *); --inline void *page_address(page_index_t); -+extern page_index_t find_page_index(void *); -+extern void *page_address(page_index_t); - int gencgc_handle_wp_violation(void *); - - diff --git a/lang/sbcl/files/patch-tests_subr.sh b/lang/sbcl/files/patch-tests_subr.sh deleted file mode 100644 index fa296efaa960..000000000000 --- a/lang/sbcl/files/patch-tests_subr.sh +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- tests/subr.sh.orig -+++ tests/subr.sh -@@ -29,7 +29,7 @@ - SBCL_HOME="$SBCL_PWD/../contrib" - SBCL_CORE="$SBCL_PWD/../output/sbcl.core" - SBCL_RUNTIME="$SBCL_PWD/../src/runtime/sbcl" --SBCL_ARGS="--noinform --no-sysinit --no-userinit --noprint --disable-debugger" -+SBCL_ARGS="${LISP_EXTRA_ARG} --noinform --no-sysinit --no-userinit --noprint --disable-debugger" - - # Scripts that use these variables should quote them. - TEST_BASENAME="$(basename $0)" diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist index 9a9b15e09286..dbaee09bd645 100644 --- a/lang/sbcl/pkg-plist +++ b/lang/sbcl/pkg-plist @@ -188,8 +188,6 @@ lib/sbcl/site-systems/.keep_me %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/asdf-install/README %%PORTDOCS%%%%DOCSDIR%%/asdf.html -%%PDF%%%%PORTDOCS%%%%DOCSDIR%%/asdf.pdf -%%PS%%%%PORTDOCS%%%%DOCSDIR%%/asdf.ps %%PORTDOCS%%%%DOCSDIR%%/asdf/README %%PORTDOCS%%%%DOCSDIR%%/asdf/README.SBCL %%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README @@ -199,10 +197,7 @@ lib/sbcl/site-systems/.keep_me %%PORTDOCS%%%%DOCSDIR%%/sb-posix/README %%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README %%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README -%%PDF%%%%PORTDOCS%%%%DOCSDIR%%/sbcl-internals.pdf %%PORTDOCS%%%%DOCSDIR%%/sbcl.html -%%PDF%%%%PORTDOCS%%%%DOCSDIR%%/sbcl.pdf -%%PS%%%%PORTDOCS%%%%DOCSDIR%%/sbcl.ps %%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-simple-streams %%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-rotate-byte %%PORTDOCS%%@dirrm %%DOCSDIR%%/sb-posix diff --git a/math/fricas/Makefile b/math/fricas/Makefile index f13ea508f2be..02396a3f2fae 100644 --- a/math/fricas/Makefile +++ b/math/fricas/Makefile @@ -7,6 +7,7 @@ PORTNAME= fricas PORTVERSION= 1.1.6 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF DISTVERSIONSUFFIX= -full diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile index 7974e0764981..ad811623e25e 100644 --- a/math/open-axiom/Makefile +++ b/math/open-axiom/Makefile @@ -7,7 +7,7 @@ PORTNAME= open-axiom PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} diff --git a/security/cl-md5-sbcl/Makefile b/security/cl-md5-sbcl/Makefile index 8125b89c4887..8fc7b6c4f822 100644 --- a/security/cl-md5-sbcl/Makefile +++ b/security/cl-md5-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= md5 PORTVERSION= 1.8.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/textproc/cl-meta-sbcl/Makefile b/textproc/cl-meta-sbcl/Makefile index 334a33b5cc8f..8ad80fea62f0 100644 --- a/textproc/cl-meta-sbcl/Makefile +++ b/textproc/cl-meta-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= meta PORTVERSION= 0.1 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= textproc lisp PKGNAMEPREFIX= cl- diff --git a/textproc/cl-ppcre-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile index ffc0c0781720..2db6caca06b5 100644 --- a/textproc/cl-ppcre-sbcl/Makefile +++ b/textproc/cl-ppcre-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= cl-ppcre PORTVERSION= 2.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc lisp DISTFILES= # none diff --git a/www/cl-lml-sbcl/Makefile b/www/cl-lml-sbcl/Makefile index c63c8fdf486f..b845ad95c172 100644 --- a/www/cl-lml-sbcl/Makefile +++ b/www/cl-lml-sbcl/Makefile @@ -6,7 +6,7 @@ PORTNAME= lml PORTVERSION= 2.5.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www textproc PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile index 44be642ea9d9..abe0b2dda52e 100644 --- a/x11-wm/stumpwm/Makefile +++ b/x11-wm/stumpwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= stumpwm PORTVERSION= 0.9.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm lisp MASTER_SITES= SAVANNAH DISTFILES= ${DISTNAME}.tgz diff --git a/x11/cl-clx-sbcl/Makefile b/x11/cl-clx-sbcl/Makefile index 951fa32a81af..a5a3e8fc29e4 100644 --- a/x11/cl-clx-sbcl/Makefile +++ b/x11/cl-clx-sbcl/Makefile @@ -12,9 +12,6 @@ MASTERDIR= ${.CURDIR}/../../x11/cl-clx BUILD_DEPENDS= ${LOCALBASE}/${CL_LIBDIR_REL}/clx/clx.asd:${PORTSDIR}/x11/cl-clx RUN_DEPENDS= ${LOCALBASE}/${CL_LIBDIR_REL}/clx/clx.asd:${PORTSDIR}/x11/cl-clx -DEPRECATED= BROKEN for more than 6 month -EXPIRATION_DATE= 2012-05-10 - USE_ASDF_FASL= yes FASL_BUILD= yes FASL_TARGET= sbcl |