diff options
| -rw-r--r-- | lang/guile/Makefile | 13 | ||||
| -rw-r--r-- | lang/guile/distinfo | 2 | ||||
| -rw-r--r-- | lang/guile/files/patch-configure | 10 | ||||
| -rw-r--r-- | lang/guile/files/patch-guile-readline_configure | 10 | ||||
| -rw-r--r-- | lang/guile/files/patch-libguile_load.c | 23 | ||||
| -rw-r--r-- | lang/guile/files/patch-libguile_numbers.c | 22 | ||||
| -rw-r--r-- | lang/guile/files/patch-qt_md_axp.s | 20 | ||||
| -rw-r--r-- | lang/guile/pkg-plist | 141 |
8 files changed, 152 insertions, 89 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 7642a834bd8f..25f505d4bd74 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -6,8 +6,7 @@ # PORTNAME= guile -PORTVERSION= 1.4.1 -PORTREVISION= 4 +PORTVERSION= 1.6.4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= guile @@ -18,14 +17,16 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension LIB_DEPENDS= ltdl.1:${PORTSDIR}/devel/libtool USE_REINPLACE= yes -USE_LIBTOOL= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -LIBTOOLFILES= configure guile-readline/configure +USE_GNOME= gnometarget CONFIGURE_ARGS= --with-threads CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -PLIST_SUB= GUILE_VER=${PORTVERSION} +GUILE_VER= 1.6 +PLIST_SUB= GUILE_VER=${GUILE_VER} REINPLACE_FILES= libguile/gc.c libguile/mallocs.c \ libguile/ports.c libguile/smob.c @@ -34,7 +35,7 @@ post-extract: cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES} post-patch: - cd ${WRKSRC} ; \ + @cd ${WRKSRC} ; \ ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES} @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ s|%%LOCALBASE|${LOCALBASE}|g' ${WRKSRC}/libguile/load.c diff --git a/lang/guile/distinfo b/lang/guile/distinfo index 065c94c9e5be..0186e9207a57 100644 --- a/lang/guile/distinfo +++ b/lang/guile/distinfo @@ -1 +1 @@ -MD5 (guile-1.4.1.tar.gz) = 605c1c721dea908131c77a708b471e23 +MD5 (guile-1.6.4.tar.gz) = a4aceb5f185878c1de4e8aa7c38b6d1d diff --git a/lang/guile/files/patch-configure b/lang/guile/files/patch-configure deleted file mode 100644 index 81d7a1afe898..000000000000 --- a/lang/guile/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed Jun 19 13:40:51 2002 -+++ configure Wed Jun 19 13:41:14 2002 -@@ -8469,6 +8469,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/lang/guile/files/patch-guile-readline_configure b/lang/guile/files/patch-guile-readline_configure deleted file mode 100644 index fc197681536b..000000000000 --- a/lang/guile/files/patch-guile-readline_configure +++ /dev/null @@ -1,10 +0,0 @@ ---- guile-readline/configure.orig Wed Jun 19 13:58:18 2002 -+++ guile-readline/configure Wed Jun 19 13:58:31 2002 -@@ -7316,6 +7316,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/lang/guile/files/patch-libguile_load.c b/lang/guile/files/patch-libguile_load.c index 6cc5eb43b0b6..8d6b0ade5c9a 100644 --- a/lang/guile/files/patch-libguile_load.c +++ b/lang/guile/files/patch-libguile_load.c @@ -1,11 +1,16 @@ ---- libguile/load.c.orig Tue Feb 4 21:05:24 2003 -+++ libguile/load.c Tue Feb 4 21:19:39 2003 -@@ -239,6 +239,8 @@ - path = scm_listify (scm_makfrom0str (SCM_SITE_DIR), - scm_makfrom0str (SCM_LIBRARY_DIR), - scm_makfrom0str (SCM_PKGDATA_DIR), -+ scm_makfrom0str ("%%X11BASE%%/share/guile"), -+ scm_makfrom0str ("%%LOCALBASE%%/share/guile"), - SCM_UNDEFINED); +--- libguile/load.c.orig Sat Dec 7 17:41:32 2002 ++++ libguile/load.c Wed Apr 30 22:55:23 2003 +@@ -247,9 +247,11 @@ + SCM path = SCM_EOL; + + #ifdef SCM_LIBRARY_DIR +- path = scm_list_3 (scm_makfrom0str (SCM_SITE_DIR), ++ path = scm_list_5 (scm_makfrom0str (SCM_SITE_DIR), + scm_makfrom0str (SCM_LIBRARY_DIR), +- scm_makfrom0str (SCM_PKGDATA_DIR)); ++ scm_makfrom0str (SCM_PKGDATA_DIR), ++ scm_makfrom0str ("/usr/X11R6/share/guile"), ++ scm_makfrom0str ("/usr/local%%/share/guile")); #endif /* SCM_LIBRARY_DIR */ + path = scm_internal_parse_path (getenv ("GUILE_LOAD_PATH"), path); diff --git a/lang/guile/files/patch-libguile_numbers.c b/lang/guile/files/patch-libguile_numbers.c deleted file mode 100644 index 2ba35040ab81..000000000000 --- a/lang/guile/files/patch-libguile_numbers.c +++ /dev/null @@ -1,22 +0,0 @@ ---- libguile/numbers.c.orig Thu Apr 3 23:52:25 2003 -+++ libguile/numbers.c Thu Apr 3 23:52:41 2003 -@@ -89,8 +89,8 @@ - /* Return true if X is not infinite and is not a NaN - Dirk:FIXME:: Since IS_INF is broken, this test does not work if x == 0 - */ --#ifndef isfinite --#define isfinite(x) (!IS_INF (x) && (x) == (x)) -+#ifndef xxx_isfinite -+#define xxx_isfinite(x) (!IS_INF (x) && (x) == (x)) - #endif - - -@@ -4071,7 +4071,7 @@ - if (SCM_FIXABLE (lu)) { - return SCM_MAKINUM (lu); - #ifdef SCM_BIGDIG -- } else if (isfinite (u)) { -+ } else if (xxx_isfinite (u)) { - return scm_dbl2big (u); - #endif - } else { diff --git a/lang/guile/files/patch-qt_md_axp.s b/lang/guile/files/patch-qt_md_axp.s deleted file mode 100644 index 3bdc817eb859..000000000000 --- a/lang/guile/files/patch-qt_md_axp.s +++ /dev/null @@ -1,20 +0,0 @@ ---- qt/md/axp.s.orig Thu Sep 26 22:19:15 2002 -+++ qt/md/axp.s Thu Sep 26 22:30:31 2002 -@@ -15,7 +15,7 @@ - - .text - .align 4 -- .file 2 "axp.s" -+ .file "axp.s" - - .globl qt_block - .globl qt_blocki -@@ -117,7 +117,7 @@ - jsr $26,($27),0 # Call `cleanup'. - - jsr $26,qt_error # Cleanup erroniously returned. -- .end qt_start -+ .end qt_vstart - - - # diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist index fd8cefe35cad..9e2f7d0f90a0 100644 --- a/lang/guile/pkg-plist +++ b/lang/guile/pkg-plist @@ -1,8 +1,12 @@ bin/guile bin/guile-config bin/guile-snarf +bin/guile-tools include/guile-readline/readline.h include/guile/gh.h +include/guile/srfi/srfi-13.h +include/guile/srfi/srfi-14.h +include/guile/srfi/srfi-4.h include/libguile.h include/libguile/__scm.h include/libguile/alist.h @@ -15,12 +19,15 @@ include/libguile/continuations.h include/libguile/coop-defs.h include/libguile/debug-malloc.h include/libguile/debug.h +include/libguile/deprecation.h include/libguile/dynl.h include/libguile/dynwind.h +include/libguile/environments.h include/libguile/eq.h include/libguile/error.h include/libguile/eval.h include/libguile/evalext.h +include/libguile/extensions.h include/libguile/feature.h include/libguile/filesys.h include/libguile/fluids.h @@ -28,6 +35,7 @@ include/libguile/fports.h include/libguile/gc.h include/libguile/gdb_interface.h include/libguile/gdbint.h +include/libguile/goops.h include/libguile/gsubr.h include/libguile/guardians.h include/libguile/hash.h @@ -54,11 +62,14 @@ include/libguile/posix.h include/libguile/print.h include/libguile/procprop.h include/libguile/procs.h +include/libguile/properties.h include/libguile/ramap.h include/libguile/random.h +include/libguile/rdelim.h include/libguile/read.h include/libguile/regex-posix.h include/libguile/root.h +include/libguile/rw.h include/libguile/scmconfig.h include/libguile/scmsigs.h include/libguile/script.h @@ -77,37 +88,93 @@ include/libguile/strorder.h include/libguile/strports.h include/libguile/struct.h include/libguile/symbols.h -include/libguile/tag.h include/libguile/tags.h include/libguile/threads.h include/libguile/throw.h include/libguile/unif.h include/libguile/validate.h +include/libguile/values.h include/libguile/variable.h include/libguile/vectors.h include/libguile/version.h include/libguile/vports.h include/libguile/weaks.h +@unexec install-info --delete %D/info/goops.info %D/info/dir +info/goops.info +info/goops.info-1 +info/goops.info-2 +info/goops.info-3 +@exec install-info %D/info/goops.info %D/info/dir +@unexec install-info --delete %D/info/guile-tut.info %D/info/dir +info/guile-tut.info +@exec install-info %D/info/guile-tut.info %D/info/dir @unexec install-info --delete %D/info/guile.info %D/info/dir info/guile.info info/guile.info-1 +info/guile.info-10 +info/guile.info-11 +info/guile.info-12 +info/guile.info-13 +info/guile.info-14 +info/guile.info-15 +info/guile.info-16 +info/guile.info-17 +info/guile.info-18 +info/guile.info-19 info/guile.info-2 +info/guile.info-20 +info/guile.info-21 +info/guile.info-22 +info/guile.info-23 +info/guile.info-3 +info/guile.info-4 +info/guile.info-5 +info/guile.info-6 +info/guile.info-7 +info/guile.info-8 +info/guile.info-9 @exec install-info %D/info/guile.info %D/info/dir +@unexec install-info --delete %D/info/r5rs.info %D/info/dir +info/r5rs.info +info/r5rs.info-1 +info/r5rs.info-2 +info/r5rs.info-3 +info/r5rs.info-4 +info/r5rs.info-5 +@exec install-info %D/info/r5rs.info %D/info/dir +lib/libguile-ltdl.a +lib/libguile-ltdl.la +lib/libguile-ltdl.so +lib/libguile-ltdl.so.1 +lib/libguile-srfi-srfi-13-14-v-1.a +lib/libguile-srfi-srfi-13-14-v-1.la +lib/libguile-srfi-srfi-13-14-v-1.so +lib/libguile-srfi-srfi-13-14-v-1.so.1 +lib/libguile-srfi-srfi-4-v-1.a +lib/libguile-srfi-srfi-4-v-1.la +lib/libguile-srfi-srfi-4-v-1.so +lib/libguile-srfi-srfi-4-v-1.so.1 lib/libguile.a +lib/libguile.la lib/libguile.so -lib/libguile.so.10 -lib/libguilereadline.a -lib/libguilereadline.so -lib/libguilereadline.so.0 +lib/libguile.so.15 +lib/libguilereadline-v-12.a +lib/libguilereadline-v-12.la +lib/libguilereadline-v-12.so +lib/libguilereadline-v-12.so.15 lib/libqthreads.a +lib/libqthreads.la lib/libqthreads.so -lib/libqthreads.so.0 +lib/libqthreads.so.15 share/aclocal/guile.m4 +share/guile/%%GUILE_VER%%/guile-procedures.txt share/guile/%%GUILE_VER%%/ice-9/and-let*.scm share/guile/%%GUILE_VER%%/ice-9/and-let-star.scm share/guile/%%GUILE_VER%%/ice-9/arrays.scm share/guile/%%GUILE_VER%%/ice-9/boot-9.scm +share/guile/%%GUILE_VER%%/ice-9/buffered-input.scm share/guile/%%GUILE_VER%%/ice-9/calling.scm +share/guile/%%GUILE_VER%%/ice-9/channel.scm share/guile/%%GUILE_VER%%/ice-9/common-list.scm share/guile/%%GUILE_VER%%/ice-9/debug.scm share/guile/%%GUILE_VER%%/ice-9/debugger.scm @@ -115,34 +182,86 @@ share/guile/%%GUILE_VER%%/ice-9/documentation.scm share/guile/%%GUILE_VER%%/ice-9/emacs.scm share/guile/%%GUILE_VER%%/ice-9/expect.scm share/guile/%%GUILE_VER%%/ice-9/format.scm +share/guile/%%GUILE_VER%%/ice-9/ftw.scm share/guile/%%GUILE_VER%%/ice-9/getopt-long.scm share/guile/%%GUILE_VER%%/ice-9/hcons.scm +share/guile/%%GUILE_VER%%/ice-9/history.scm share/guile/%%GUILE_VER%%/ice-9/lineio.scm share/guile/%%GUILE_VER%%/ice-9/ls.scm share/guile/%%GUILE_VER%%/ice-9/mapping.scm +share/guile/%%GUILE_VER%%/ice-9/match.scm share/guile/%%GUILE_VER%%/ice-9/networking.scm +share/guile/%%GUILE_VER%%/ice-9/null.scm share/guile/%%GUILE_VER%%/ice-9/optargs.scm share/guile/%%GUILE_VER%%/ice-9/poe.scm share/guile/%%GUILE_VER%%/ice-9/popen.scm share/guile/%%GUILE_VER%%/ice-9/posix.scm +share/guile/%%GUILE_VER%%/ice-9/pretty-print.scm share/guile/%%GUILE_VER%%/ice-9/psyntax.pp share/guile/%%GUILE_VER%%/ice-9/psyntax.ss share/guile/%%GUILE_VER%%/ice-9/q.scm share/guile/%%GUILE_VER%%/ice-9/r4rs.scm +share/guile/%%GUILE_VER%%/ice-9/r5rs.scm +share/guile/%%GUILE_VER%%/ice-9/rdelim.scm share/guile/%%GUILE_VER%%/ice-9/readline.scm +share/guile/%%GUILE_VER%%/ice-9/receive.scm share/guile/%%GUILE_VER%%/ice-9/regex.scm share/guile/%%GUILE_VER%%/ice-9/runq.scm +share/guile/%%GUILE_VER%%/ice-9/rw.scm +share/guile/%%GUILE_VER%%/ice-9/safe-r5rs.scm +share/guile/%%GUILE_VER%%/ice-9/safe.scm share/guile/%%GUILE_VER%%/ice-9/session.scm share/guile/%%GUILE_VER%%/ice-9/slib.scm +share/guile/%%GUILE_VER%%/ice-9/stack-catch.scm share/guile/%%GUILE_VER%%/ice-9/streams.scm share/guile/%%GUILE_VER%%/ice-9/string-fun.scm share/guile/%%GUILE_VER%%/ice-9/syncase.scm -share/guile/%%GUILE_VER%%/ice-9/tags.scm share/guile/%%GUILE_VER%%/ice-9/threads.scm -share/guile/guile-procedures.txt -@dirrm include/guile -@dirrm include/guile-readline -@dirrm include/libguile +share/guile/%%GUILE_VER%%/ice-9/time.scm +share/guile/%%GUILE_VER%%/oop/goops.scm +share/guile/%%GUILE_VER%%/oop/goops/active-slot.scm +share/guile/%%GUILE_VER%%/oop/goops/compile.scm +share/guile/%%GUILE_VER%%/oop/goops/composite-slot.scm +share/guile/%%GUILE_VER%%/oop/goops/describe.scm +share/guile/%%GUILE_VER%%/oop/goops/dispatch.scm +share/guile/%%GUILE_VER%%/oop/goops/internal.scm +share/guile/%%GUILE_VER%%/oop/goops/old-define-method.scm +share/guile/%%GUILE_VER%%/oop/goops/save.scm +share/guile/%%GUILE_VER%%/oop/goops/stklos.scm +share/guile/%%GUILE_VER%%/oop/goops/util.scm +share/guile/%%GUILE_VER%%/scripts/PROGRAM +share/guile/%%GUILE_VER%%/scripts/autofrisk +share/guile/%%GUILE_VER%%/scripts/display-commentary +share/guile/%%GUILE_VER%%/scripts/doc-snarf +share/guile/%%GUILE_VER%%/scripts/frisk +share/guile/%%GUILE_VER%%/scripts/generate-autoload +share/guile/%%GUILE_VER%%/scripts/lint +share/guile/%%GUILE_VER%%/scripts/punify +share/guile/%%GUILE_VER%%/scripts/read-scheme-source +share/guile/%%GUILE_VER%%/scripts/snarf-check-and-output-texi +share/guile/%%GUILE_VER%%/scripts/snarf-guile-m4-docs +share/guile/%%GUILE_VER%%/scripts/use2dot +share/guile/%%GUILE_VER%%/srfi/srfi-1.scm +share/guile/%%GUILE_VER%%/srfi/srfi-10.scm +share/guile/%%GUILE_VER%%/srfi/srfi-11.scm +share/guile/%%GUILE_VER%%/srfi/srfi-13.scm +share/guile/%%GUILE_VER%%/srfi/srfi-14.scm +share/guile/%%GUILE_VER%%/srfi/srfi-16.scm +share/guile/%%GUILE_VER%%/srfi/srfi-17.scm +share/guile/%%GUILE_VER%%/srfi/srfi-19.scm +share/guile/%%GUILE_VER%%/srfi/srfi-2.scm +share/guile/%%GUILE_VER%%/srfi/srfi-4.scm +share/guile/%%GUILE_VER%%/srfi/srfi-6.scm +share/guile/%%GUILE_VER%%/srfi/srfi-8.scm +share/guile/%%GUILE_VER%%/srfi/srfi-9.scm +@dirrm share/guile/%%GUILE_VER%%/srfi +@dirrm share/guile/%%GUILE_VER%%/scripts +@dirrm share/guile/%%GUILE_VER%%/oop/goops +@dirrm share/guile/%%GUILE_VER%%/oop @dirrm share/guile/%%GUILE_VER%%/ice-9 @dirrm share/guile/%%GUILE_VER%% @dirrm share/guile +@dirrm include/libguile +@dirrm include/guile/srfi +@dirrm include/guile-readline +@dirrm include/guile |