pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/elk Update lang/elk to 3.99.6
details: https://anonhg.NetBSD.org/pkgsrc/rev/57cb79777ab8
branches: trunk
changeset: 501006:57cb79777ab8
user: tonio <tonio%pkgsrc.org@localhost>
date: Sat Oct 15 23:07:21 2005 +0000
description:
Update lang/elk to 3.99.6
Update HOMEPAGE and MASTER_SITES
3.99.* use autoconf/automake and libtool. It should work on alpha and other 64
platforms
Convert to use the option framework. Options xaw and motif enable xaw and motif
widget support. Both imply x11 support.
The update should fix PR 31750
diffstat:
lang/elk/Makefile | 68 +-------
lang/elk/PLIST | 160 +++++++++++++++++++
lang/elk/PLIST.Motif | 29 ---
lang/elk/PLIST.X11 | 30 ---
lang/elk/PLIST.base | 75 ---------
lang/elk/buildlink3.mk | 4 +-
lang/elk/distinfo | 34 +---
lang/elk/files/stab-elf.c | 97 -----------
lang/elk/options.mk | 36 ++++
lang/elk/patches/patch-ab | 97 +----------
lang/elk/patches/patch-ac | 84 ----------
lang/elk/patches/patch-ad | 375 ---------------------------------------------
lang/elk/patches/patch-ae | 375 ---------------------------------------------
lang/elk/patches/patch-af | 379 ----------------------------------------------
lang/elk/patches/patch-ag | 15 -
lang/elk/patches/patch-ah | 34 ----
lang/elk/patches/patch-ai | 28 ---
lang/elk/patches/patch-aj | 16 -
lang/elk/patches/patch-ak | 23 --
lang/elk/patches/patch-al | 22 --
lang/elk/patches/patch-am | 23 --
lang/elk/patches/patch-an | 16 -
lang/elk/patches/patch-ao | 31 ---
lang/elk/patches/patch-ap | 32 ---
lang/elk/patches/patch-aq | 27 ---
lang/elk/patches/patch-ar | 13 -
lang/elk/patches/patch-as | 15 -
lang/elk/patches/patch-at | 13 -
lang/elk/patches/patch-au | 42 -----
lang/elk/patches/patch-av | 46 -----
lang/elk/patches/patch-aw | 33 ----
lang/elk/patches/patch-ax | 33 ----
32 files changed, 224 insertions(+), 2081 deletions(-)
diffs (truncated from 2456 to 300 lines):
diff -r e7de7d04d8ed -r 57cb79777ab8 lang/elk/Makefile
--- a/lang/elk/Makefile Sat Oct 15 23:01:10 2005 +0000
+++ b/lang/elk/Makefile Sat Oct 15 23:07:21 2005 +0000
@@ -1,72 +1,18 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:58 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/10/15 23:07:21 tonio Exp $
-DISTNAME= elk-3.0
-PKGNAME= elk-3.0.3
-PKGREVISION= 1
+DISTNAME= elk-3.99.6
CATEGORIES= lang
-MASTER_SITES= http://www-rn.informatik.uni-bremen.de/software/elk/dist/
+MASTER_SITES= http://sam.zoy.org/elk/
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://sam.zoy.org/elk/
COMMENT= Embeddable Scheme interpreter
-# ELF loading problems, LP64
-NOT_FOR_PLATFORM= *-*-alpha *-*-mips* *-*-sparc64
-
-BUILD_TARGET= default
-
-.include "../../mk/bsd.prefs.mk"
-
-ELK_GUI?= none
-BUILD_DEFS+= ELK_GUI
+GNU_CONFIGURE=yes
+USE_LIBTOOL= yes
-# We must strip the "-Wl," from the linker flags because they are saved
-# by elk to be used to invoke the real "ld", which won't understand them.
-#
-.if ${ELK_GUI} != "none"
-MAKE_ENV+= X11_LDFLAGS="${X11_LDFLAGS:S/-Wl,//}"
-. if !empty(ELK_GUI:Mxaw)
-. include "../../mk/xaw.buildlink3.mk"
-LIBXAW:= ${LIBXAW:S/-Wl,//}
-ELK_SUBDIRS+= lib/xlib lib/xt lib/xaw
-PLIST_SRC+= ${PKGDIR}/PLIST.X11
-BUILD_DEFS+= XAW_TYPE
-. endif
-. if !empty(ELK_GUI:Mmotif)
-. include "../../mk/motif.buildlink3.mk"
-MOTIFLIB:= ${MOTIFLIB:S/-Wl,//}
-ELK_SUBDIRS+= lib/xm lib/xm/xt
-PLIST_SRC+= ${PKGDIR}/PLIST.Motif
-. endif
-.endif
-
-PLIST_SRC+= ${PKGDIR}/PLIST.base
-MAKE_ENV+= ELK_SUBDIRS="${ELK_SUBDIRS}"
+CONFIGURE_ENV= WITH_XAW="${ELK_AWK}"
-.include "../../mk/x11.buildlink3.mk"
-
-do-configure:
- ${MV} ${WRKSRC}/src/stab-elf.c ${WRKSRC}/src/stab-elf.c-dist
- ${CP} ${FILESDIR}/stab-elf.c ${WRKSRC}/src
- @case ${OBJECT_FMT} in \
- a.out) exetype=aout ;; \
- ELF) exetype=elf ;; \
- *) ${ECHO} "Unsupported object format: ${OBJECT_FMT}"; \
- exit 1 ;; \
- esac; \
- ${ECHO} "Setting up links for $$exetype on ${LOWER_OPSYS}"; \
- ${RM} -f ${WRKSRC}/config/untested/elf-solaris-cc; \
- ${LN} -s ${WRKSRC}/config/sun-sunos5-gcc \
- ${WRKSRC}/config/untested/elf-solaris-cc; \
- ${RM} -f ${WRKSRC}/config/system ${WRKSRC}/config/site; \
- ${LN} -s ${WRKSRC}/config/untested/$$exetype-${LOWER_OPSYS}-cc \
- ${WRKSRC}/config/system; \
- for f in aout-netbsd elf-netbsd elf-solaris; do \
- ${RM} -f ${WRKSRC}/config/sites/$$f; \
- ${LN} -s ${WRKSRC}/config/sites/pkgsrc \
- ${WRKSRC}/config/sites/$$f; \
- done; \
- ${LN} -s ${WRKSRC}/config/sites/$$exetype-${LOWER_OPSYS} \
- ${WRKSRC}/config/site
+.include "options.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e7de7d04d8ed -r 57cb79777ab8 lang/elk/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/elk/PLIST Sat Oct 15 23:07:21 2005 +0000
@@ -0,0 +1,160 @@
+@comment $NetBSD: PLIST,v 1.3 2005/10/15 23:07:21 tonio Exp $
+bin/elk
+bin/scheme-elk
+include/elk/compat.h
+include/elk/cstring.h
+include/elk/exception.h
+include/elk/extensions/unix.h
+include/elk/extensions/xlib.h
+include/elk/extensions/xt.h
+include/elk/extern.h
+include/elk/funcproto.h
+include/elk/gc.h
+include/elk/intern.h
+include/elk/kernel.h
+include/elk/misc.h
+include/elk/object.h
+include/elk/param.h
+include/elk/scheme.h
+include/elk/site.h
+include/elk/stkmem.h
+include/elk/type.h
+lib/elk/bitstring.la
+lib/elk/debug.la
+lib/elk/elk-eval.la
+lib/elk/hack.la
+lib/elk/newhandler.la
+lib/elk/record.la
+lib/elk/regexp.la
+lib/elk/struct.la
+lib/elk/unix.la
+${WITHMOTIF}lib/elk/motif.la
+${WITHXAW}lib/elk/xaw.la
+${WITHX11}lib/elk/xlib.la
+lib/libelk.la
+${WITHX11}lib/libelk-xlib.la
+${WITHX11}lib/libelk-xt.la
+man/man1/elk.1
+man/man1/scheme-elk.1
+share/doc/elk/examples/c++/class.cpp
+share/doc/elk/examples/c++/constructor.cpp
+share/doc/elk/examples/motif/drawing-area.scm
+share/doc/elk/examples/motif/list.scm
+share/doc/elk/examples/motif/main-window.scm
+share/doc/elk/examples/motif/menu-stuff.scm
+share/doc/elk/examples/motif/message-dialog.scm
+share/doc/elk/examples/motif/option-menu.scm
+share/doc/elk/examples/motif/popup-menu.scm
+share/doc/elk/examples/motif/pulldown-menu.scm
+share/doc/elk/examples/motif/radio-stuff.scm
+share/doc/elk/examples/motif/radio.scm
+share/doc/elk/examples/motif/scroll-bar.scm
+share/doc/elk/examples/motif/selection-box.scm
+share/doc/elk/examples/motif/vcr.scm
+share/doc/elk/examples/regexp/match.scm
+share/doc/elk/examples/scheme/Y.scm
+share/doc/elk/examples/scheme/acker.scm
+share/doc/elk/examples/scheme/billiard.scm
+share/doc/elk/examples/scheme/cc.scm
+share/doc/elk/examples/scheme/cell.scm
+share/doc/elk/examples/scheme/co.scm
+share/doc/elk/examples/scheme/compile.scm
+share/doc/elk/examples/scheme/cps.scm
+share/doc/elk/examples/scheme/dynamic.scm
+share/doc/elk/examples/scheme/fib.scm
+share/doc/elk/examples/scheme/fix.scm
+share/doc/elk/examples/scheme/flame.scm
+share/doc/elk/examples/scheme/hanoi.scm
+share/doc/elk/examples/scheme/kons.scm
+share/doc/elk/examples/scheme/meissel.scm
+share/doc/elk/examples/scheme/mondo.scm
+share/doc/elk/examples/scheme/perm.scm
+share/doc/elk/examples/scheme/prim.scm
+share/doc/elk/examples/scheme/ramanujan.scm
+share/doc/elk/examples/scheme/rungekutta.scm
+share/doc/elk/examples/scheme/sqrt.scm
+share/doc/elk/examples/scheme/unify.scm
+share/doc/elk/examples/scheme/work.scm
+share/doc/elk/examples/tests/README
+share/doc/elk/examples/tests/r4rstest.scm
+share/doc/elk/examples/unix/calc.scm
+share/doc/elk/examples/unix/copy.scm
+share/doc/elk/examples/unix/lock.scm
+share/doc/elk/examples/unix/ls.scm
+share/doc/elk/examples/unix/pipsiz.scm
+share/doc/elk/examples/unix/timeout.scm
+share/doc/elk/examples/xaw/accel.scm
+share/doc/elk/examples/xaw/clickcount.scm
+share/doc/elk/examples/xaw/dialog.scm
+share/doc/elk/examples/xaw/grip.scm
+share/doc/elk/examples/xaw/list.scm
+share/doc/elk/examples/xaw/paned.scm
+share/doc/elk/examples/xaw/panner.scm
+share/doc/elk/examples/xaw/popup.scm
+share/doc/elk/examples/xaw/porthole.scm
+share/doc/elk/examples/xaw/pulldown.scm
+share/doc/elk/examples/xaw/scrollbar.scm
+share/doc/elk/examples/xaw/scrollbox.scm
+share/doc/elk/examples/xaw/stripchart.scm
+share/doc/elk/examples/xaw/text.scm
+share/doc/elk/examples/xaw/tree.scm
+share/doc/elk/examples/xaw/viewport.scm
+share/doc/elk/examples/xlib/hello.scm
+share/doc/elk/examples/xlib/lines.scm
+share/doc/elk/examples/xlib/map-all.scm
+share/doc/elk/examples/xlib/picture.scm
+share/doc/elk/examples/xlib/poly.scm
+share/doc/elk/examples/xlib/properties.scm
+share/doc/elk/examples/xlib/track.scm
+share/doc/elk/examples/xlib/useful.scm
+share/doc/elk/examples/xlib/wm-delete.scm
+share/doc/elk/ps/bitstring.ps
+share/doc/elk/ps/cprog.ps
+share/doc/elk/ps/elk.ps
+share/doc/elk/ps/kernel.ps
+share/doc/elk/ps/oops.ps
+share/doc/elk/ps/record.ps
+share/doc/elk/ps/regexp.ps
+share/doc/elk/ps/unix.ps
+share/doc/elk/ps/usenix.ps
+share/doc/elk/ps/xlib.ps
+share/doc/elk/ps/xt.ps
+share/elk/apropos.scm
+share/elk/bitstring.scm
+share/elk/cscheme.scm
+share/elk/debug.scm
+share/elk/describe.scm
+share/elk/initscheme.scm
+share/elk/oops.scm
+share/elk/parse.scm
+share/elk/pp.scm
+share/elk/qsort.scm
+share/elk/record.scm
+share/elk/recordutil.scm
+share/elk/regexp.scm
+share/elk/safe-env.scm
+share/elk/setf.scm
+share/elk/slib.scm
+share/elk/struct.scm
+share/elk/toplevel.scm
+share/elk/trace.scm
+share/elk/unix.scm
+${WITHXAW}share/elk/xaw.scm
+${WITHX11}share/elk/xlib.scm
+${WITHX11}share/elk/xwidgets.scm
+${WITHMOTIF}share/elk/motif.scm
+@dirrm share/elk
+@dirrm share/doc/elk/ps
+@dirrm share/doc/elk/examples/xlib
+@dirrm share/doc/elk/examples/xaw
+@dirrm share/doc/elk/examples/unix
+@dirrm share/doc/elk/examples/tests
+@dirrm share/doc/elk/examples/scheme
+@dirrm share/doc/elk/examples/regexp
+@dirrm share/doc/elk/examples/motif
+@dirrm share/doc/elk/examples/c++
+@dirrm share/doc/elk/examples
+@dirrm share/doc/elk
+@dirrm lib/elk
+@dirrm include/elk/extensions
+@dirrm include/elk
diff -r e7de7d04d8ed -r 57cb79777ab8 lang/elk/PLIST.Motif
--- a/lang/elk/PLIST.Motif Sat Oct 15 23:01:10 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST.Motif,v 1.1 2002/01/09 23:04:53 seb Exp $
-lib/elk/runtime/obj/xm/ALIASES
-lib/elk/runtime/obj/xm/arrow-button.o
-lib/elk/runtime/obj/xm/bulletin-brd.o
-lib/elk/runtime/obj/xm/cascade-btn.o
-lib/elk/runtime/obj/xm/command.o
-lib/elk/runtime/obj/xm/drawing-area.o
-lib/elk/runtime/obj/xm/drawn-button.o
-lib/elk/runtime/obj/xm/file-selectn.o
-lib/elk/runtime/obj/xm/form.o
-lib/elk/runtime/obj/xm/frame.o
-lib/elk/runtime/obj/xm/label.o
-lib/elk/runtime/obj/xm/list.o
-lib/elk/runtime/obj/xm/main-window.o
-lib/elk/runtime/obj/xm/message-box.o
-lib/elk/runtime/obj/xm/paned-window.o
-lib/elk/runtime/obj/xm/push-button.o
-lib/elk/runtime/obj/xm/row-column.o
-lib/elk/runtime/obj/xm/scale.o
-lib/elk/runtime/obj/xm/scroll-bar.o
-lib/elk/runtime/obj/xm/scrolled-win.o
-lib/elk/runtime/obj/xm/selectn-box.o
-lib/elk/runtime/obj/xm/separator.o
-lib/elk/runtime/obj/xm/shell.o
-lib/elk/runtime/obj/xm/support.o
-lib/elk/runtime/obj/xm/text.o
-lib/elk/runtime/obj/xm/toggle-btn.o
-lib/elk/runtime/obj/xt-motif.o
-@dirrm lib/elk/runtime/obj/xm
diff -r e7de7d04d8ed -r 57cb79777ab8 lang/elk/PLIST.X11
--- a/lang/elk/PLIST.X11 Sat Oct 15 23:01:10 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-@comment $NetBSD: PLIST.X11,v 1.1 2002/01/09 23:04:54 seb Exp $
-include/elk/extensions/xlib.h
-include/elk/extensions/xt.h
-lib/elk/runtime/obj/xaw/ALIASES
-lib/elk/runtime/obj/xaw/ascii.o
-lib/elk/runtime/obj/xaw/box.o
-lib/elk/runtime/obj/xaw/command.o
-lib/elk/runtime/obj/xaw/dialog.o
-lib/elk/runtime/obj/xaw/form.o
-lib/elk/runtime/obj/xaw/grip.o
-lib/elk/runtime/obj/xaw/label.o
-lib/elk/runtime/obj/xaw/list.o
-lib/elk/runtime/obj/xaw/menubutton.o
-lib/elk/runtime/obj/xaw/paned.o
-lib/elk/runtime/obj/xaw/panner.o
-lib/elk/runtime/obj/xaw/porthole.o
Home |
Main Index |
Thread Index |
Old Index