diff options
author | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-12-11 21:23:42 +0000 |
---|---|---|
committer | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-12-11 21:23:42 +0000 |
commit | 8a3b442edbedbaa70e5f5a9f44a94144830c0155 (patch) | |
tree | 5d4b53f4bd0247c0c71aa050f9643d206a896dbf /lang/clisp | |
parent | Fix the creates bad mtree file when built as non-root that will ending up (diff) |
- Update to version 2.43.
- Remove regular expression to correct PORTVERSION for MASTER_SITES/WRKSRC.
- Define USE_GHOSTSCRIPT_BUILD instead of using BUILD_DEPENDS.
- Remove NOT_FOR_ARCHS=ia64 (should work now).
- Use HAS_CONFIGURE instead of GNU_CONFIGURE to avoid workarouds for removing
automatically added but unrecognized configure options.
- Add GDBM, GTK2 and SVM options (for new modules).
- Add pkg-message to note that Vim/Emacs syntax files install in DATADIR.
- Remove USE_GCC=3.4 since it now builds with GCC 4.x.
- Increase base BDB version (now supports 4.3-4.6, not 4.2 anymore).
- Remove BROKEN when PARI module was enabled, since it doesn't segfault now.
- Remove post-configure target because the main configure includes those steps.
Notes
Notes:
svn path=/head/; revision=203044
Diffstat (limited to 'lang/clisp')
-rw-r--r-- | lang/clisp/Makefile | 113 | ||||
-rw-r--r-- | lang/clisp/distinfo | 6 | ||||
-rw-r--r-- | lang/clisp/files/patch-modules__berkeley-db__configure | 10 | ||||
-rw-r--r-- | lang/clisp/files/patch-modules__fastcgi__fastcgi.lisp | 12 | ||||
-rw-r--r-- | lang/clisp/files/patch-modules__pari__cpari.c | 19 | ||||
-rw-r--r-- | lang/clisp/files/patch-src__makemake.in | 11 | ||||
-rw-r--r-- | lang/clisp/files/pkg-message.in | 14 | ||||
-rw-r--r-- | lang/clisp/pkg-plist | 29 |
8 files changed, 109 insertions, 105 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 705c914a3268..3af00ffc282c 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -6,66 +6,63 @@ # PORTNAME= clisp -PORTVERSION= 2.41a -PORTREVISION= 1 +PORTVERSION= 2.43 CATEGORIES= lang lisp -MASTER_SITES= GNU/${PORTNAME}/release/${PORTVERSION:C/[[:alpha:]]+$//} \ +MASTER_SITES= GNU/${PORTNAME}/release/${PORTVERSION} \ ftp://sunsite.unc.edu/pub/Linux/devel/lang/lisp/ MAINTAINER= alepulver@FreeBSD.org COMMENT= A Common Lisp implementation -BUILD_DEPENDS= ${LOCALBASE}/lib/libsigsegv.a:${PORTSDIR}/devel/libsigsegv \ - dvipdf:${PORTSDIR}/${GHOSTSCRIPT_PORT} +BUILD_DEPENDS= ${LOCALBASE}/lib/libsigsegv.a:${PORTSDIR}/devel/libsigsegv LIB_DEPENDS= readline.5:${PORTSDIR}/devel/readline -NOT_FOR_ARCHS= ia64 -NOT_FOR_ARCHS_REASON= does not currently support this architecture USE_BZIP2= yes USE_ICONV= yes USE_GETTEXT= yes -GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${DISTNAME:C/[[:alpha:]]+$//} -BUILD_WRKSRC= ${WRKSRC}/${CONFIGURE_TARGET} +USE_GHOSTSCRIPT_BUILD= yes +WANT_GNOME= yes +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \ + --elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \ + --docdir="${DOCSDIR}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL} +# Complaints if the environment changes between build stages. +MAKE_ENV= ${CONFIGURE_ENV} +BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${BUILD_WRKSRC} - CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -MAKE_ENV= ${CONFIGURE_ENV} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -MAKEMAKE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man \ - --srcdir=${WRKSRC}/src --with-dynamic-ffi OPTIONS= BDB "Build Berkeley Database module" off \ CLX_MIT "Build X11 module (original MIT version)" off \ CLX_NEW "Build X11 module (new faster version)" off \ FASTCGI "Build FastCGI module" off \ + GDBM "Build GNU Database manager module" off \ + GTK2 "Build Gtk+2 module" off \ ORACLE "Build Oracle database module" off \ - PARI "Build PARI (math and calculator lib) module" off \ + PARI "Build PARI (math and calc lib) module" off \ PCRE "Build PCRE (Perl Compatible Regexp) module" off \ PGSQL "Build PostgreSQL database module" off \ RAWSOCK "Build Raw Socket Access module" on \ + SVM "Enable Support Vector Machines module" off \ WILDCARD "Build wildcard matching module" on \ ZLIB "Build ZLib interface module " off MAN1= clisp.1 +SUB_FILES= pkg-message .include <bsd.port.pre.mk> -# Does not build with GCC 4.2. -.if ${OSVERSION} >= 700000 -USE_GCC= 3.4 -.endif - -MODULES= BDB CLX_MIT CLX_NEW FASTCGI ORACLE PARI PCRE PGSQL RAWSOCK \ - WILDCARD ZLIB - +# Semgentation fault in amd64 when using 'mmap(2)'. Also in Linux/ia64. .if ${ARCH} == "amd64" -CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--disable-mmap -MAKEMAKE_ARGS+= --disable-mmap .endif +MODULES= BDB CLX_MIT CLX_NEW FASTCGI GDBM GTK2 ORACLE PARI PCRE PGSQL \ + RAWSOCK SVM WILDCARD ZLIB + .for mod in ${MODULES} . if defined(WITH_${mod}) PLIST_SUB+= ${mod}="" @@ -75,8 +72,8 @@ PLIST_SUB+= ${mod}="@comment " .endfor .if defined(WITH_BDB) -USE_BDB= 42+ -MAKEMAKE_ARGS+= --with-module=berkeley-db +USE_BDB= 43+ +CONFIGURE_ARGS+=--with-module=berkeley-db CPPFLAGS+= -I${LOCALBASE}/include/db${BDB_VER} LDFLAGS+= -L${LOCALBASE}/lib/db${BDB_VER} .endif @@ -85,74 +82,86 @@ LDFLAGS+= -L${LOCALBASE}/lib/db${BDB_VER} IGNORE= selected different implementations of the same X11 module .endif .if defined(WITH_CLX_MIT) || defined(WITH_CLX_NEW) -# Avoid USE_XLIB because of the additional CONFIGURE_ARGS. -LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} +USE_XLIB= yes .endif .if defined(WITH_CLX_MIT) -MAKEMAKE_ARGS+= --with-module=clx/mit-clx +CONFIGURE_ARGS+=--with-module=clx/mit-clx .endif .if defined(WITH_CLX_NEW) -MAKEMAKE_ARGS+= --with-module=clx/new-clx +CONFIGURE_ARGS+=--with-module=clx/new-clx .endif .if defined(WITH_FASTCGI) LIB_DEPENDS+= fcgi.0:${PORTSDIR}/www/fcgi -MAKEMAKE_ARGS+= --with-module=fastcgi +CONFIGURE_ARGS+=--with-module=fastcgi +.endif + +.if defined(WITH_GDBM) +LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm +CONFIGURE_ARGS+=--with-module=gdbm +.endif + +.if defined(WITH_GTK2) +USE_GNOME= gtk20 libglade2 +CONFIGURE_ARGS+=--with-module=gtk2 .endif .if defined(WITH_ORACLE) BUILD_DEPENDS+= ${ORACLE_HOME}:${PORTSDIR}/databases/oracle8-client -MAKEMAKE_ARGS+= --with-module=oracle +CONFIGURE_ARGS+=--with-module=oracle CPPFLAGS+= -I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public LDFLAGS+= -L${ORACLE_HOME}/lib -ORACLE_HOME= ${LOCALBASE}/oracle8-client +ORACLE_HOME?= ${LOCALBASE}/oracle8-client .endif .if defined(WITH_PARI) LIB_DEPENDS+= pari.2:${PORTSDIR}/math/pari -MAKEMAKE_ARGS+= --with-module=pari -BROKEN= Lisp stack overflow when building PARI module +CONFIGURE_ARGS+=--with-module=pari .endif .if defined(WITH_PCRE) LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -MAKEMAKE_ARGS+=--with-module=pcre +CONFIGURE_ARGS+=--with-module=pcre .endif .if defined(WITH_PGSQL) USE_PGSQL= yes -MAKEMAKE_ARGS+= --with-module=postgresql +CONFIGURE_ARGS+=--with-module=postgresql .endif .if defined(WITH_RAWSOCK) -MAKEMAKE_ARGS+= --with-module=rawsock +CONFIGURE_ARGS+=--with-module=rawsock +.endif + +.if defined(WITH_SVM) +RUN_DEPENDS+= svm-predict:${PORTSDIR}/science/libsvm +CONFIGURE_ARGS+=--with-module=libsvm .endif .if defined(WITH_WILDCARD) -MAKEMAKE_ARGS+= --with-module=wildcard +CONFIGURE_ARGS+=--with-module=wildcard .endif .if defined(WITH_ZLIB) -MAKEMAKE_ARGS+= --with-module=zlib +CONFIGURE_ARGS+=--with-module=zlib .endif post-patch: .if ${ARCH} == "amd64" - @${REINPLACE_CMD} -Ee \ - "s|^(subdir_configure_args=')|\1--build=${CONFIGURE_TARGET}|; \ - s|^(module_configure_flags=')|\1--build=${CONFIGURE_TARGET}|" \ - ${WRKSRC}/configure ${WRKSRC}/src/makemake.in +# Override CONFIGURE_TARGET (amd64 -> x86_64) in configure scripts. + @${REINPLACE_CMD} -e \ + "s|^subdir_configure_args='|&--build=${CONFIGURE_TARGET}|;" \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + "s|^module_configure_flags='|&--build=${CONFIGURE_TARGET}|" \ + ${WRKSRC}/src/makemake.in .endif .if defined(WITH_ORACLE) @${REINPLACE_CMD} -e 's|-ldl||; s|-lpthread|-lcompat ${PTHREAD_LIBS}|' \ ${WRKSRC}/modules/oracle/link.sh .endif -post-configure: - cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ./makemake ${MAKEMAKE_ARGS} > Makefile && \ - ${MAKE} config.lisp - @${REINPLACE_CMD} -Ee 's|^(CFLAGS =)|\1 ${CPPFLAGS} ${CFLAGS}|' \ - ${BUILD_WRKSRC}/${MAKEFILE} +post-install: + @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .include <bsd.port.post.mk> diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo index a8fdd1f472d6..92928defde2c 100644 --- a/lang/clisp/distinfo +++ b/lang/clisp/distinfo @@ -1,3 +1,3 @@ -MD5 (clisp-2.41a.tar.bz2) = 3a7a00e82ebeeb72a75a032f84c36c6c -SHA256 (clisp-2.41a.tar.bz2) = 1e5f8d9b04024ae072536ae3271075c1a422c02d3997a729a6b00912ed2ae323 -SIZE (clisp-2.41a.tar.bz2) = 8319471 +MD5 (clisp-2.43.tar.bz2) = 45cf7ab628cab83e99ceaa75aa880b63 +SHA256 (clisp-2.43.tar.bz2) = b5213ccc59d65c190f47c0e4f04d568a1a66bcb28ae5ed59705e59c6b8b11e83 +SIZE (clisp-2.43.tar.bz2) = 8143871 diff --git a/lang/clisp/files/patch-modules__berkeley-db__configure b/lang/clisp/files/patch-modules__berkeley-db__configure deleted file mode 100644 index 7b76804d7029..000000000000 --- a/lang/clisp/files/patch-modules__berkeley-db__configure +++ /dev/null @@ -1,10 +0,0 @@ ---- ./modules/berkeley-db/configure.orig Sun Jan 22 23:10:23 2006 -+++ ./modules/berkeley-db/configure Mon Jun 26 17:32:36 2006 -@@ -3937,6 +3937,7 @@ - - fi - -+ac_cv_search_db_env_create="yes" - if test "$ac_cv_search_db_env_create" = "no"; then - { { echo "$as_me:$LINENO: error: cannot find Berkeley-DB library" >&5 - echo "$as_me: error: cannot find Berkeley-DB library" >&2;} diff --git a/lang/clisp/files/patch-modules__fastcgi__fastcgi.lisp b/lang/clisp/files/patch-modules__fastcgi__fastcgi.lisp deleted file mode 100644 index 86eb80c84002..000000000000 --- a/lang/clisp/files/patch-modules__fastcgi__fastcgi.lisp +++ /dev/null @@ -1,12 +0,0 @@ ---- ./modules/fastcgi/fastcgi.lisp.orig Fri Dec 8 08:42:55 2006 -+++ ./modules/fastcgi/fastcgi.lisp Fri Dec 8 08:45:45 2006 -@@ -146,7 +146,8 @@ - - - ; -------------- "C" functions --;(c-lines "#include \"fastcgi.h\"~%"); completely wrapped -+(eval-when (compile) -+ (setq ffi:*output-c-functions* t)) - - ; Our wrappers - (def-call-out fcgi_getenv (:arguments (var c-string)) (:return-type c-string)) diff --git a/lang/clisp/files/patch-modules__pari__cpari.c b/lang/clisp/files/patch-modules__pari__cpari.c deleted file mode 100644 index 836a5a4217e1..000000000000 --- a/lang/clisp/files/patch-modules__pari__cpari.c +++ /dev/null @@ -1,19 +0,0 @@ ---- ./modules/pari/cpari.c.orig Fri Aug 26 14:57:48 2005 -+++ ./modules/pari/cpari.c Mon Jun 26 18:07:48 2006 -@@ -62,9 +62,6 @@ - char *p; - GEN p1; - -- extern ulong init_opts; -- init_opts = 0; -- - pari_init(parisize,maxprime); - /*init_graph();*/ - -@@ -75,6 +72,5 @@ - void fini_for_clisp (int leaving) - { - /*free_graph();*/ -- freeall(); - killallfiles(leaving); - } diff --git a/lang/clisp/files/patch-src__makemake.in b/lang/clisp/files/patch-src__makemake.in new file mode 100644 index 000000000000..b69c06445c77 --- /dev/null +++ b/lang/clisp/files/patch-src__makemake.in @@ -0,0 +1,11 @@ +--- ./src/makemake.in.orig Mon Oct 15 15:16:52 2007 ++++ ./src/makemake.in Fri Dec 7 17:28:56 2007 +@@ -1944,7 +1944,7 @@ + echol "psdir = ${PSDIR}" + echol "pdfdir = ${PDFDIR}" + echol "libdir = ${LIBDIR}" +-echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)" ++echol "lisplibdir = \$(libdir)${NEXT_}clisp" + if [ -n "$USE_GETTEXT" ] ; then + echol "localedir = ${LOCALEDIR}" + fi diff --git a/lang/clisp/files/pkg-message.in b/lang/clisp/files/pkg-message.in new file mode 100644 index 000000000000..18ca19581e22 --- /dev/null +++ b/lang/clisp/files/pkg-message.in @@ -0,0 +1,14 @@ +============================================================================== + +Emacs and Vim editing facilities for CLISP were installed into: +%%DATADIR%% + +And you will have to symlink/copy the files to the corresponding directories. +For global installation: + +Emacs: %%PREFIX%%/share/emacs/site-lisp +Vim: $VIMRUNTIME/vimfiles/after/syntax + +Alternatively you may do per-user installations. + +============================================================================== diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist index 20ba2702c032..340b8e6571e8 100644 --- a/lang/clisp/pkg-plist +++ b/lang/clisp/pkg-plist @@ -3,11 +3,11 @@ lib/clisp/base/calls.o lib/clisp/base/gettext.o lib/clisp/base/libavcall.a lib/clisp/base/libcallback.a -lib/clisp/base/libcharset.a lib/clisp/base/libnoreadline.a lib/clisp/base/lisp.a lib/clisp/base/lisp.run lib/clisp/base/lispinit.mem +lib/clisp/base/localcharset.o lib/clisp/base/makevars lib/clisp/base/modules.h lib/clisp/base/modules.o @@ -15,6 +15,8 @@ lib/clisp/base/readline.o lib/clisp/base/regex.o lib/clisp/base/regexi.o lib/clisp/base/regexp.dvi +lib/clisp/base/uniname.o +lib/clisp/base/width.o lib/clisp/clisp-link lib/clisp/data/Symbol-Table.text lib/clisp/data/UnicodeDataFull.txt @@ -29,6 +31,7 @@ lib/clisp/full/calls.o %%CLX_MIT%%lib/clisp/full/clx.fas %%CLX_MIT%%lib/clisp/full/clx.lisp %%CLX_NEW%%lib/clisp/full/clx.o +%%PARI%%lib/clisp/full/cpari.o %%PCRE%%lib/clisp/full/cpcre.o %%CLX_MIT%%lib/clisp/full/depdefs.fas %%CLX_MIT%%lib/clisp/full/depdefs.lisp @@ -42,11 +45,14 @@ lib/clisp/full/calls.o %%FASTCGI%%lib/clisp/full/fastcgi_wrappers.o %%CLX_MIT%%lib/clisp/full/fonts.fas %%CLX_MIT%%lib/clisp/full/fonts.lisp +lib/clisp/full/fnmatch.o %%CLX_MIT%%lib/clisp/full/gcontext.fas %%CLX_MIT%%lib/clisp/full/gcontext.lisp +%%GDBM%%lib/clisp/full/gdbm.o lib/clisp/full/gettext.o %%CLX_MIT%%lib/clisp/full/graphics.fas %%CLX_MIT%%lib/clisp/full/graphics.lisp +%%GTK2%%lib/clisp/full/gtk.o %%CLX_MIT%%lib/clisp/full/image.fas %%CLX_MIT%%lib/clisp/full/image.lisp %%CLX_MIT%%lib/clisp/full/input.fas @@ -55,11 +61,11 @@ lib/clisp/full/gettext.o %%CLX_MIT%%lib/clisp/full/keysyms.lisp lib/clisp/full/libavcall.a lib/clisp/full/libcallback.a -lib/clisp/full/libcharset.a lib/clisp/full/libnoreadline.a lib/clisp/full/lisp.a lib/clisp/full/lisp.run lib/clisp/full/lispinit.mem +lib/clisp/full/localcharset.o %%CLX_MIT%%lib/clisp/full/macros.fas %%CLX_MIT%%lib/clisp/full/macros.lisp lib/clisp/full/makevars @@ -72,6 +78,7 @@ lib/clisp/full/modules.o %%ORACLE%%lib/clisp/full/orafns.o %%CLX_MIT%%lib/clisp/full/package.fas %%CLX_MIT%%lib/clisp/full/package.lisp +%%PARI%%lib/clisp/full/pari.o %%PGSQL%%lib/clisp/full/postgresql.o %%RAWSOCK%%lib/clisp/full/rawsock.o lib/clisp/full/readline.o @@ -90,8 +97,10 @@ lib/clisp/full/regexp.dvi %%CLX_MIT%%lib/clisp/full/trace.lisp %%CLX_MIT%%lib/clisp/full/translate.fas %%CLX_MIT%%lib/clisp/full/translate.lisp +lib/clisp/full/uniname.o %%WILDCARD%%lib/clisp/full/wildcard.dvi %%WILDCARD%%lib/clisp/full/wildcard.o +lib/clisp/full/width.o %%ZLIB%%lib/clisp/full/zlib.o lib/clisp/linkkit/clisp.h lib/clisp/linkkit/modprep.lisp @@ -121,6 +130,12 @@ lib/clisp/linkkit/modules.d %%DOCSDIR%%/doc/editors.txt %%DOCSDIR%%/doc/impnotes.css %%DOCSDIR%%/doc/impnotes.html +%%DATADIR%%/emacs/clhs.el +%%DATADIR%%/emacs/clisp-coding.el +%%DATADIR%%/emacs/clisp-ffi.el +%%DATADIR%%/emacs/clisp-indent.el +%%DATADIR%%/emacs/clisp-indent.lisp +%%DATADIR%%/vim/lisp.vim share/locale/da/LC_MESSAGES/clisp.mo share/locale/da/LC_MESSAGES/clisplow.mo share/locale/de/LC_MESSAGES/clisp.mo @@ -135,13 +150,9 @@ share/locale/nl/LC_MESSAGES/clisp.mo share/locale/nl/LC_MESSAGES/clisplow.mo share/locale/ru/LC_MESSAGES/clisp.mo share/locale/ru/LC_MESSAGES/clisplow.mo -share/emacs/site-lisp/clhs.el -share/emacs/site-lisp/clisp-coding.el -share/emacs/site-lisp/clisp-indent.el -share/emacs/site-lisp/clisp-indent.lisp -share/emacs/site-lisp/clisp-ffi.el -@dirrmtry share/emacs/site-lisp -@dirrmtry share/emacs +@dirrm %%DATADIR%%/vim +@dirrm %%DATADIR%%/emacs +@dirrm %%DATADIR%% @dirrm %%DOCSDIR%%/doc @dirrm %%DOCSDIR%% @dirrm lib/clisp/linkkit |