diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 641405a62ca..40370f4130a 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.15 2000/08/10 02:38:50 brad Exp $ +# $OpenBSD: Makefile,v 1.16 2000/08/11 04:00:14 brad Exp $ -DISTNAME= guile-1.3 +DISTNAME= guile-1.4 CATEGORIES= lang NEED_VERSION= 1.310 MASTER_SITES= ${MASTER_SITE_GNU} @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --enable-static post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal - ${INSTALL_DATA} ${WRKSRC}/guile.m4 ${PREFIX}/share/aclocal + ${INSTALL_DATA} ${WRKSRC}/guile-config/guile.m4 ${PREFIX}/share/aclocal ${INSTALL_DATA} ${WRKSRC}/qthreads.m4 ${PREFIX}/share/aclocal .include diff --git a/lang/guile/files/md5 b/lang/guile/files/md5 index f0e6ea7b2ee..c3ac4361b9f 100644 --- a/lang/guile/files/md5 +++ b/lang/guile/files/md5 @@ -1,3 +1,3 @@ -MD5 (guile-1.3.tar.gz) = f5bb26483e76bd45eb6e445e1b660a6f -RMD160 (guile-1.3.tar.gz) = 7856506b176afd7c6e99c73ab309bcf053cf8139 -SHA1 (guile-1.3.tar.gz) = 85472d2898e03a7daa23d5062b3dd802ab9cbefd +MD5 (guile-1.4.tar.gz) = 60430592385b96319ea3eb4cba88062c +RMD160 (guile-1.4.tar.gz) = bf46055b0a48eaa76812f76560fcfc8b15880e1a +SHA1 (guile-1.4.tar.gz) = b143efaff0820f7c701eea0b25aa87af2693c4ac diff --git a/lang/guile/patches/patch-ltconfig b/lang/guile/patches/patch-ltconfig new file mode 100644 index 00000000000..f7b03178fa2 --- /dev/null +++ b/lang/guile/patches/patch-ltconfig @@ -0,0 +1,10 @@ +--- ltconfig.orig Wed Aug 9 17:50:28 2000 ++++ ltconfig Wed Aug 9 17:50:46 2000 +@@ -2028,6 +2028,7 @@ + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH ++ deplibs_check_method='pass_all' + ;; + + os2*) diff --git a/lang/guile/patches/patch-ltmain.sh b/lang/guile/patches/patch-ltmain.sh index b0adbb7b362..a4c43a6c499 100644 --- a/lang/guile/patches/patch-ltmain.sh +++ b/lang/guile/patches/patch-ltmain.sh @@ -1,19 +1,28 @@ ---- ltmain.sh.orig Mon Mar 22 00:28:21 1999 -+++ ltmain.sh Mon Mar 22 00:29:43 1999 -@@ -2023,37 +2023,6 @@ - done - fi +--- ltmain.sh.orig Wed Aug 9 17:51:00 2000 ++++ ltmain.sh Wed Aug 9 17:51:13 2000 +@@ -2623,7 +2623,7 @@ + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. +- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) ++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; +@@ -3567,40 +3567,6 @@ + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 -- echo "------------------------------------------------------------------------------" +- echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo -- echo "To link against installed libraries in a given directory, LIBDIR," -- echo "you must use the \`-LLIBDIR' flag during linking." -- echo -- echo " You will also need to do one of the following:" +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" @@ -28,13 +37,16 @@ - - echo " - use the \`$flag' linker flag" - fi +- if test -n "$admincmds"; then +- echo " - have your system administrator run these commands:$admincmds" +- fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "------------------------------------------------------------------------------" +- echo "----------------------------------------------------------------------" exit 0 ;; diff --git a/lang/guile/pkg/COMMENT b/lang/guile/pkg/COMMENT index b5ed8c2960c..85e9b0f902e 100644 --- a/lang/guile/pkg/COMMENT +++ b/lang/guile/pkg/COMMENT @@ -1 +1 @@ -GNU extension language, scheme as an embeddable library +GNU's Ubiquitous Intelligent Language for Extension diff --git a/lang/guile/pkg/DESCR b/lang/guile/pkg/DESCR index cb5428b909c..a11a3dad2d2 100644 --- a/lang/guile/pkg/DESCR +++ b/lang/guile/pkg/DESCR @@ -1,5 +1,8 @@ -Guile is a portable, embeddable Scheme implementation written in C. Guile -provides a machine independent execution platform that can be linked in as -a library when building extensible programs. +GUILE, GNU's Ubiquitous Intelligent Language for Extension, +is a library that implements the Scheme language plus various +convenient facilities. It's designed so that you can link it +into an application or utility to make it extensible. Our +plan is to link this library into all GNU programs that call for +extensibility. WWW: ${HOMEPAGE} diff --git a/lang/guile/pkg/PFRAG.shared b/lang/guile/pkg/PFRAG.shared index d10ca3184f0..c4746920ad3 100644 --- a/lang/guile/pkg/PFRAG.shared +++ b/lang/guile/pkg/PFRAG.shared @@ -1,3 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1 2000/08/09 21:41:19 brad Exp $ -lib/libguile.so.4.0 +@comment $OpenBSD: PFRAG.shared,v 1.2 2000/08/11 04:00:16 brad Exp $ +lib/libguile.so.9.0 +lib/libguilereadline.so.0.0 DYNLIBDIR(%B) diff --git a/lang/guile/pkg/PLIST b/lang/guile/pkg/PLIST index 848433aa517..0d0a9672e78 100644 --- a/lang/guile/pkg/PLIST +++ b/lang/guile/pkg/PLIST @@ -1,8 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.4 2000/08/09 21:41:19 brad Exp $ +@comment $OpenBSD: PLIST,v 1.5 2000/08/11 04:00:16 brad Exp $ bin/guile bin/guile-config +bin/guile-doc-snarf +bin/guile-func-name-check bin/guile-snarf +bin/guile-snarf.awk include/guile/gh.h +include/guile-readline/readline.h include/libguile.h include/libguile/__scm.h include/libguile/alist.h @@ -13,12 +17,14 @@ include/libguile/boolean.h include/libguile/chars.h include/libguile/continuations.h include/libguile/coop-defs.h +include/libguile/debug-malloc.h include/libguile/debug.h include/libguile/dynl.h include/libguile/dynwind.h include/libguile/eq.h include/libguile/error.h include/libguile/eval.h +include/libguile/evalext.h include/libguile/feature.h include/libguile/filesys.h include/libguile/fluids.h @@ -26,18 +32,21 @@ include/libguile/fports.h include/libguile/gc.h include/libguile/gdb_interface.h include/libguile/gdbint.h -include/libguile/genio.h include/libguile/gsubr.h +include/libguile/guardians.h include/libguile/hash.h include/libguile/hashtab.h +include/libguile/hooks.h include/libguile/init.h include/libguile/ioext.h include/libguile/iselect.h -include/libguile/kw.h +include/libguile/keywords.h +include/libguile/lang.h include/libguile/list.h include/libguile/load.h +include/libguile/macros.h include/libguile/mallocs.h -include/libguile/markers.h +include/libguile/modules.h include/libguile/net_db.h include/libguile/numbers.h include/libguile/objects.h @@ -50,8 +59,8 @@ include/libguile/print.h include/libguile/procprop.h include/libguile/procs.h include/libguile/ramap.h +include/libguile/random.h include/libguile/read.h -include/libguile/readline.h include/libguile/regex-posix.h include/libguile/root.h include/libguile/scmconfig.h @@ -61,6 +70,7 @@ include/libguile/simpos.h include/libguile/smob.h include/libguile/snarf.h include/libguile/socket.h +include/libguile/sort.h include/libguile/srcprop.h include/libguile/stackchk.h include/libguile/stacks.h @@ -76,6 +86,7 @@ include/libguile/tags.h include/libguile/threads.h include/libguile/throw.h include/libguile/unif.h +include/libguile/validate.h include/libguile/variable.h include/libguile/vectors.h include/libguile/version.h @@ -86,37 +97,50 @@ info/data-rep.info @exec install-info %D/info/data-rep.info %D/info/dir lib/libguile.a lib/libguile.la +lib/libguilereadline.a +lib/libguilereadline.la %%SHARED%% share/aclocal/guile.m4 share/aclocal/qthreads.m4 -share/guile/1.3/ice-9/boot-9.scm -share/guile/1.3/ice-9/calling.scm -share/guile/1.3/ice-9/common-list.scm -share/guile/1.3/ice-9/debug.scm -share/guile/1.3/ice-9/emacs.scm -share/guile/1.3/ice-9/expect.scm -share/guile/1.3/ice-9/getopt-gnu-style.scm -share/guile/1.3/ice-9/hcons.scm -share/guile/1.3/ice-9/lineio.scm -share/guile/1.3/ice-9/ls.scm -share/guile/1.3/ice-9/mapping.scm -share/guile/1.3/ice-9/poe.scm -share/guile/1.3/ice-9/psyntax.pp -share/guile/1.3/ice-9/psyntax.ss -share/guile/1.3/ice-9/q.scm -share/guile/1.3/ice-9/r4rs.scm -share/guile/1.3/ice-9/readline.scm -share/guile/1.3/ice-9/regex.scm -share/guile/1.3/ice-9/runq.scm -share/guile/1.3/ice-9/session.scm -share/guile/1.3/ice-9/slib.scm -share/guile/1.3/ice-9/string-fun.scm -share/guile/1.3/ice-9/syncase.scm -share/guile/1.3/ice-9/tags.scm -share/guile/1.3/ice-9/threads.scm -share/guile/1.3/ice-9/version.scm +share/guile/guile-procedures.txt +share/guile/1.4/ice-9/and-let*.scm +share/guile/1.4/ice-9/arrays.scm +share/guile/1.4/ice-9/boot-9.scm +share/guile/1.4/ice-9/calling.scm +share/guile/1.4/ice-9/common-list.scm +share/guile/1.4/ice-9/debug.scm +share/guile/1.4/ice-9/debugger.scm +share/guile/1.4/ice-9/documentation.scm +share/guile/1.4/ice-9/emacs.scm +share/guile/1.4/ice-9/expect.scm +share/guile/1.4/ice-9/format.scm +share/guile/1.4/ice-9/getopt-long.scm +share/guile/1.4/ice-9/hcons.scm +share/guile/1.4/ice-9/lineio.scm +share/guile/1.4/ice-9/ls.scm +share/guile/1.4/ice-9/mapping.scm +share/guile/1.4/ice-9/networking.scm +share/guile/1.4/ice-9/optargs.scm +share/guile/1.4/ice-9/poe.scm +share/guile/1.4/ice-9/popen.scm +share/guile/1.4/ice-9/posix.scm +share/guile/1.4/ice-9/psyntax.pp +share/guile/1.4/ice-9/psyntax.ss +share/guile/1.4/ice-9/q.scm +share/guile/1.4/ice-9/r4rs.scm +share/guile/1.4/ice-9/readline.scm +share/guile/1.4/ice-9/regex.scm +share/guile/1.4/ice-9/runq.scm +share/guile/1.4/ice-9/session.scm +share/guile/1.4/ice-9/slib.scm +share/guile/1.4/ice-9/streams.scm +share/guile/1.4/ice-9/string-fun.scm +share/guile/1.4/ice-9/syncase.scm +share/guile/1.4/ice-9/tags.scm +share/guile/1.4/ice-9/threads.scm @dirrm include/guile +@dirrm include/guile-readline @dirrm include/libguile -@dirrm share/guile/1.3/ice-9 -@dirrm share/guile/1.3 +@dirrm share/guile/1.4/ice-9 +@dirrm share/guile/1.4 @dirrm share/guile