Did anyone look at this? No scm updates => no guile update. No guile update => no lilypond update. No lilypond update => doom of human culture.
On Fri, Jan 02, 2009 at 12:42:28AM +0100, Matthias Kilian wrote: > [Multiple espie@ timeouts, so I'm resending this to po...@] > > could you please have a look at the four attached diffs (devel/slib, > devel/slib-guile, lang/scm and math/jacal)? The update of devel/slib > seems to be a prerequisite for updating lang/guile in the long term, > and the other three ports depend on slib. And I need a recent guile > soon for an upcoming lilypond release. > > Ciao, > Kili > > ps: I've also updated HOMEPAGE, MASTER_SITES and license markers > where appripriate. Tests don't suck more than with the current > versions, and some rough manual tests with guile + slib + slib-guile > were fine. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/slib/Makefile,v > retrieving revision 1.11 > diff -u -p -r1.11 Makefile > --- Makefile 16 Sep 2007 02:53:14 -0000 1.11 > +++ Makefile 29 Nov 2008 19:46:01 -0000 > @@ -4,15 +4,12 @@ COMMENT= scheme r5 library > > CATEGORIES= devel > > -V=3a2 > -DISTNAME= slib$V > -PKGNAME= slib-$Vp1 > -EXTRACT_SUFX= .zip > +DISTNAME= slib-3b1 > > -HOMEPAGE= http://swissnet.ai.mit.edu/~jaffer/SCM.html > +HOMEPAGE= http://people.csail.mit.edu/jaffer/SLIB > > -MASTER_SITES= ftp://ftp.swiss.ai.mit.edu/pub/scm/ \ > - ftp://ftp.swiss.ai.mit.edu/pub/scm/OLD/ > +MASTER_SITES= http://groups.csail.mit.edu/mac/ftpdir/scm/ \ > + http://groups.csail.mit.edu/mac/ftpdir/scm/OLD/ > > MAINTAINER= Marc Espie <[email protected]> > > @@ -27,6 +24,10 @@ PERMIT_DISTFILES_FTP= Yes > NO_BUILD= Yes > NO_REGRESS= Yes > PKG_ARCH= * > + > +post-extract: > + perl -pi -e 's!/usr/lib/slib!${LOCALBASE}/share/slib!' \ > + ${WRKSRC}/guile.init > > do-install: > @${INSTALL_DATA_DIR} ${PREFIX}/share/slib > Index: distinfo > =================================================================== > RCS file: /cvs/ports/devel/slib/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- distinfo 5 Apr 2007 15:38:06 -0000 1.5 > +++ distinfo 29 Nov 2008 19:46:01 -0000 > @@ -1,5 +1,5 @@ > -MD5 (slib3a2.zip) = HjoRkDFBEQXEfALJzIRQ3A== > -RMD160 (slib3a2.zip) = QIDiqPV6KkGIvOJ9GTMQVIdtm9k= > -SHA1 (slib3a2.zip) = pmULcttwCn/e9iFEYoPRccqUBuo= > -SHA256 (slib3a2.zip) = b6GXrzOfg9VmJgI22z7j/tWwZ+WHgGQzKWnSx1QE5Dc= > -SIZE (slib3a2.zip) = 961683 > +MD5 (slib-3b1.tar.gz) = axQlSrqNWe3jv7Wlhu53GA== > +RMD160 (slib-3b1.tar.gz) = G87XAjEthHtBrL/B4CwM7MB+AAI= > +SHA1 (slib-3b1.tar.gz) = J/weIt9n9lYMrA/FWqm3svQkvVQ= > +SHA256 (slib-3b1.tar.gz) = 6r0QHKGjd6zHNg9CbB4MnnIy0WKuwnbPdxJRrhXQp8E= > +SIZE (slib-3b1.tar.gz) = 944819 > Index: patches/patch-guile_init > =================================================================== > RCS file: /cvs/ports/devel/slib/patches/patch-guile_init,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-guile_init > --- patches/patch-guile_init 5 Dec 2005 14:46:01 -0000 1.1 > +++ patches/patch-guile_init 29 Nov 2008 19:46:01 -0000 > @@ -1,12 +1,12 @@ > $OpenBSD: patch-guile_init,v 1.1 2005/12/05 14:46:01 espie Exp $ > ---- guile.init.orig Mon Dec 5 15:31:51 2005 > -+++ guile.init Mon Dec 5 15:32:07 2005 > -@@ -124,7 +124,8 @@ > - ((NOSVE) ".") > - ((MACOS THINKC) ":") > - ((MS-DOS WINDOWS ATARIST OS/2) "\\") > -- ((UNIX COHERENT PLAN9 AMIGA) "/")))) > -+ ((UNIX COHERENT PLAN9 AMIGA) "/") > +--- guile.init.orig Sat Nov 29 17:17:45 2008 > ++++ guile.init Sat Nov 29 17:17:45 2008 > +@@ -131,7 +131,8 @@ > + ((nosve) ".") > + ((macos thinkc) ":") > + ((ms-dos windows atarist os/2) "\\") > +- ((unix coherent plan9 amiga) "/")))) > ++ ((unix coherent plan9 amiga) "/") > + (else "/")))) > (lambda (vic name) > (string-append vic name *vicinity-suffix*)))))) > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/slib/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -r1.3 PLIST > --- pkg/PLIST 30 Oct 2005 09:27:09 -0000 1.3 > +++ pkg/PLIST 29 Nov 2008 19:46:01 -0000 > @@ -3,7 +3,6 @@ > share/slib/ > share/slib/ANNOUNCE > share/slib/Bev2slib.scm > -share/slib/DrScheme.init > share/slib/FAQ > share/slib/README > share/slib/RScheme.init > @@ -44,6 +43,7 @@ share/slib/dbutil.scm > share/slib/debug.scm > share/slib/defmacex.scm > share/slib/determ.scm > +share/slib/dft.scm > share/slib/differ.scm > share/slib/dirs.scm > share/slib/dwindtst.scm > @@ -52,7 +52,6 @@ share/slib/dynwind.scm > share/slib/elk.init > share/slib/eval.scm > share/slib/factor.scm > -share/slib/fft.scm > share/slib/fluidlet.scm > share/slib/format.scm > share/slib/formatst.scm > @@ -69,23 +68,30 @@ share/slib/html4each.scm > share/slib/htmlform.scm > share/slib/http-cgi.scm > share/slib/jscheme.init > +share/slib/kawa.init > +share/slib/limit.scm > share/slib/lineio.scm > +share/slib/linterp.scm > share/slib/logical.scm > share/slib/macrotst.scm > share/slib/macwork.scm > share/slib/manifest.scm > share/slib/matfile.scm > +share/slib/math-integer.scm > +share/slib/math-real.scm > share/slib/mbe.scm > share/slib/minimize.scm > share/slib/mitscheme.init > share/slib/mkclrnam.scm > share/slib/mklibcat.scm > +share/slib/mkpltcat.scm > share/slib/modular.scm > share/slib/mulapply.scm > share/slib/mularg.scm > share/slib/mwdenote.scm > share/slib/mwexpand.scm > share/slib/mwsynrul.scm > +share/slib/mzscheme.init > share/slib/ncbi-dna.scm > share/slib/null.scm > share/slib/obj2str.scm > @@ -93,7 +99,6 @@ share/slib/object.scm > share/slib/paramlst.scm > share/slib/peanosfc.scm > share/slib/phil-spc.scm > -share/slib/plottest.scm > share/slib/pnm.scm > share/slib/pp.scm > share/slib/ppfile.scm > @@ -133,11 +138,15 @@ share/slib/scsh.init > share/slib/selfset.scm > share/slib/sierpinski.scm > share/slib/simetrix.scm > +share/slib/sisc.init > share/slib/solid.scm > share/slib/sort.scm > share/slib/soundex.scm > share/slib/srfi-1.scm > +share/slib/srfi-11.scm > share/slib/srfi-2.scm > +share/slib/srfi-23.scm > +share/slib/srfi-61.scm > share/slib/srfi-8.scm > share/slib/srfi-9.scm > share/slib/srfi.scm > @@ -168,4 +177,5 @@ share/slib/vscm.init > share/slib/withfile.scm > share/slib/wttest.scm > share/slib/wttree.scm > +share/slib/xml-parse.scm > share/slib/yasyn.scm > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/slib-guile/Makefile,v > retrieving revision 1.2 > diff -u -p -r1.2 Makefile > --- Makefile 16 Sep 2007 02:53:14 -0000 1.2 > +++ Makefile 29 Nov 2008 19:05:15 -0000 > @@ -5,7 +5,7 @@ COMMENT= slib guile adapter > CATEGORIES= devel > > DISTFILES= > -DISTNAME= slib-guile-0.0 > +DISTNAME= slib-guile-1.0 > > > MAINTAINER= Marc Espie <[email protected]> > @@ -24,8 +24,9 @@ BUILD_DEPENDS= ::devel/slib \ > ::lang/guile > > do-install: > - ${INSTALL_DATA_DIR} ${PREFIX}/share/guile > + ${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site > # This will fail after generating the correct file... > - -DESTDIR=${WRKINST} ${LOCALBASE}/bin/guile -c "(use-modules (ice-9 > slib)) (require 'new-catalog)" > + -DESTDIR=${WRKINST} ${LOCALBASE}/bin/guile \ > + -c "(use-modules (ice-9 slib)) (require 'new-catalog)" > > .include <bsd.port.mk> > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/slib-guile/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 5 Dec 2005 16:36:31 -0000 1.1.1.1 > +++ pkg/PLIST 29 Nov 2008 19:05:15 -0000 > @@ -1,3 +1,4 @@ > @comment $OpenBSD: PLIST,v 1.1.1.1 2005/12/05 16:36:31 espie Exp $ > share/guile/ > -share/guile/slibcat > +share/guile/site/ > +share/guile/site/slibcat > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/scm/Makefile,v > retrieving revision 1.23 > diff -u -p -r1.23 Makefile > --- Makefile 4 Jan 2008 17:48:36 -0000 1.23 > +++ Makefile 29 Nov 2008 19:43:46 -0000 > @@ -11,19 +11,19 @@ COMMENT= scheme r5 interpreter > > CATEGORIES= lang > > -V=5e1 > -DISTNAME= scm$V > -PKGNAME= scm-$V > +V=5e5 > +DISTNAME= scm-$V > EXTRACT_SUFX= .zip > > -HOMEPAGE= http://swissnet.ai.mit.edu/~jaffer/SCM.html > +HOMEPAGE= http://people.csail.mit.edu/jaffer/SCM > > -MASTER_SITES= ftp://ftp.swiss.ai.mit.edu/pub/scm/ > +MASTER_SITES= http://groups.csail.mit.edu/mac/ftpdir/scm/ > > MAINTAINER= Marc Espie <[email protected]> > > WRKDIST= ${WRKDIR}/scm > > +# LGPLv3 > PERMIT_PACKAGE_CDROM= Yes > PERMIT_DISTFILES_CDROM= Yes > PERMIT_PACKAGE_FTP= Yes > @@ -33,7 +33,10 @@ WANTLIB= c curses termcap m readline > FLAVORS=no_x11 > > FLAVOR?= > -SCM_DATA= COPYING Idiffer.scm Iedline.scm Init5e1.scm Link.scm \ > + > +SUBST_VARS= V > + > +SCM_DATA= COPYING Idiffer.scm Iedline.scm Init${V}.scm Link.scm \ > Macexp.scm Macro.scm Transcen.scm Tscript.scm \ > build build.scm compile.scm hobbit.scm mkimpcat.scm \ > r4rstest.scm scmhob.scm \ > Index: distinfo > =================================================================== > RCS file: /cvs/ports/lang/scm/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- distinfo 5 Apr 2007 16:20:00 -0000 1.5 > +++ distinfo 29 Nov 2008 19:43:46 -0000 > @@ -1,5 +1,5 @@ > -MD5 (scm5e1.zip) = 0W47Y/lY4TEJ76V6cqsmLA== > -RMD160 (scm5e1.zip) = L0wtBQYdsvCSkFOwxWVjHHpIBuI= > -SHA1 (scm5e1.zip) = ILtRfxtiKWRKHzhz12B8rDVppfo= > -SHA256 (scm5e1.zip) = mWiX1XA4VGHvfuznaQyFLj65hDkkKeAdGCTylj6h36U= > -SIZE (scm5e1.zip) = 868500 > +MD5 (scm-5e5.zip) = UIBVR6Drfm6zJAy8voVZjw== > +RMD160 (scm-5e5.zip) = Lvj/KfCqT+CvtaCGE3oIi+dl/7Q= > +SHA1 (scm-5e5.zip) = Oxez7Ti8XZ49ijdHpegBjs9nFj8= > +SHA256 (scm-5e5.zip) = nfYtRJUYTZJB8xbGDhVIHokM1Qky1DwnR6/PVX2w9Tc= > +SIZE (scm-5e5.zip) = 910806 > Index: patches/patch-dynl_c > =================================================================== > RCS file: /cvs/ports/lang/scm/patches/patch-dynl_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-dynl_c > --- patches/patch-dynl_c 15 Sep 2004 19:13:34 -0000 1.1 > +++ patches/patch-dynl_c 29 Nov 2008 19:43:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-dynl_c,v 1.1 2004/09/15 19:13:34 espie Exp $ > ---- dynl.c.orig Sat Jan 25 16:41:11 2003 > -+++ dynl.c Sun Sep 5 11:41:31 2004 > -@@ -424,7 +424,23 @@ SCM l_dyn_call(symb, shl) > +--- dynl.c.orig Thu Jan 31 02:48:03 2008 > ++++ dynl.c Sat Nov 29 15:26:11 2008 > +@@ -400,7 +400,23 @@ SCM l_dyn_call(symb, shl) > ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_call); > ASRTER(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_call); > DEFER_INTS; > @@ -26,7 +26,7 @@ $OpenBSD: patch-dynl_c,v 1.1 2004/09/15 > if (!func) { > char *dlr = dlerror(); > ALLOW_INTS; > -@@ -453,7 +469,23 @@ SCM l_dyn_main_call(symb, shl, args) > +@@ -429,7 +445,23 @@ SCM l_dyn_main_call(symb, shl, args) > ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_main_call); > ASRTER(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_main_call); > DEFER_INTS; > Index: patches/patch-scm_c > =================================================================== > RCS file: /cvs/ports/lang/scm/patches/patch-scm_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-scm_c > --- patches/patch-scm_c 15 Sep 2004 19:13:34 -0000 1.1 > +++ patches/patch-scm_c 29 Nov 2008 19:43:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-scm_c,v 1.1 2004/09/15 19:13:34 espie Exp $ > ---- scm.c.orig Thu Oct 16 19:54:32 2003 > -+++ scm.c Sun Sep 5 11:41:32 2004 > -@@ -743,6 +743,13 @@ void final_scm(freeall) > +--- scm.c.orig Thu Jan 31 02:50:33 2008 > ++++ scm.c Sat Nov 29 15:26:11 2008 > +@@ -721,6 +721,13 @@ void final_scm(freeall) > # ifndef MSDOS /* DJGPP defines both */ > # define SYSTNAME "unix" > # endif > Index: patches/patch-scmfig_h > =================================================================== > RCS file: /cvs/ports/lang/scm/patches/patch-scmfig_h,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-scmfig_h > --- patches/patch-scmfig_h 15 Sep 2004 19:12:09 -0000 1.3 > +++ patches/patch-scmfig_h 29 Nov 2008 19:43:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-scmfig_h,v 1.3 2004/09/15 19:12:09 espie Exp $ > ---- scmfig.h.orig Mon Sep 22 01:42:46 2003 > -+++ scmfig.h Sun Sep 5 11:41:32 2004 > -@@ -144,7 +144,7 @@ rgx.c init_rgx(); regcomp and regexec. * > +--- scmfig.h.orig Thu Jan 31 02:50:56 2008 > ++++ scmfig.h Sat Nov 29 15:26:11 2008 > +@@ -118,7 +118,7 @@ rgx.c init_rgx(); regcomp and regexec. */ > /* Define CDR_DOUBLES if (sizeof(double)==sizeof(long)), i.e. > a `single' is really a double. */ > #ifdef FLOATS > @@ -10,7 +10,7 @@ $OpenBSD: patch-scmfig_h,v 1.3 2004/09/1 > # define CDR_DOUBLES > # endif > > -@@ -278,7 +278,7 @@ rgx.c init_rgx(); regcomp and regexec. * > +@@ -253,7 +253,7 @@ rgx.c init_rgx(); regcomp and regexec. */ > # endif > # endif > #endif > @@ -18,4 +18,4 @@ $OpenBSD: patch-scmfig_h,v 1.3 2004/09/1 > +#if defined(__LP64__) > # define SHORT_INT > #endif > - #ifdef __ia64 > + #ifdef __ia64__ > Index: patches/patch-time_c > =================================================================== > RCS file: /cvs/ports/lang/scm/patches/patch-time_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-time_c > --- patches/patch-time_c 15 Sep 2004 19:13:35 -0000 1.1 > +++ patches/patch-time_c 29 Nov 2008 19:43:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-time_c,v 1.1 2004/09/15 19:13:35 espie Exp $ > ---- time.c.orig Wed Dec 11 22:55:48 2002 > -+++ time.c Sun Sep 5 11:41:32 2004 > -@@ -44,6 +44,11 @@ > +--- time.c.orig Thu Jan 31 02:50:25 2008 > ++++ time.c Sat Nov 29 15:26:11 2008 > +@@ -20,6 +20,11 @@ > > #include "scm.h" > > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/lang/scm/pkg/PLIST,v > retrieving revision 1.6 > diff -u -p -r1.6 PLIST > --- pkg/PLIST 30 Oct 2005 09:27:09 -0000 1.6 > +++ pkg/PLIST 29 Nov 2008 19:43:46 -0000 > @@ -1,7 +1,7 @@ > @comment $OpenBSD: PLIST,v 1.6 2005/10/30 09:27:09 espie Exp $ > -bin/scm > -bin/scm-sicp > -bin/scmlit > +...@bin bin/scm > +...@bin bin/scm-sicp > +...@bin bin/scmlit > include/scm/ > include/scm/patchlvl.h > include/scm/scmfig.h > @@ -14,7 +14,7 @@ share/scm/ > share/scm/COPYING > share/scm/Idiffer.scm > share/scm/Iedline.scm > -share/scm/Init5e1.scm > +share/scm/Init${V}.scm > share/scm/Link.scm > share/scm/Macexp.scm > share/scm/Macro.scm > Index: Makefile > =================================================================== > RCS file: /cvs/ports/math/jacal/Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 Makefile > --- Makefile 4 Jan 2008 17:48:36 -0000 1.3 > +++ Makefile 29 Nov 2008 19:37:13 -0000 > @@ -4,16 +4,15 @@ COMMENT= symbolics math system > > CATEGORIES= math > > -V=1b5 > -DISTNAME= jacal$V > -PKGNAME= jacal-$V > +DISTNAME= jacal-1b9 > EXTRACT_SUFX= .zip > > -HOMEPAGE= http://swissnet.ai.mit.edu/~jaffer/SCM.html > +HOMEPAGE= http://people.csail.mit.edu/jaffer/JACAL > > -MASTER_SITES= ftp://ftp.swiss.ai.mit.edu/pub/scm/ > +MASTER_SITES= http://groups.csail.mit.edu/mac/ftpdir/scm/ \ > + http://groups.csail.mit.edu/mac/ftpdir/scm/OLD/ > > -# GPL > +# GPLv3 > PERMIT_PACKAGE_CDROM= Yes > PERMIT_DISTFILES_CDROM= Yes > PERMIT_PACKAGE_FTP= Yes > Index: distinfo > =================================================================== > RCS file: /cvs/ports/math/jacal/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 5 Apr 2007 16:20:05 -0000 1.2 > +++ distinfo 29 Nov 2008 19:37:13 -0000 > @@ -1,5 +1,5 @@ > -MD5 (jacal1b5.zip) = zWXQqxbKmhCgZc2vgXJLmw== > -RMD160 (jacal1b5.zip) = zWwnkZtIKyfXSGtdmeveNuVZAZI= > -SHA1 (jacal1b5.zip) = 2uUxtw6vA54FXaFmQB1+WPB9agc= > -SHA256 (jacal1b5.zip) = upkHy49U/JLqSNSWDS3/Xd5ao2nO+jMufCWXbhr6osc= > -SIZE (jacal1b5.zip) = 246930 > +MD5 (jacal-1b9.zip) = wFoZMxf2tHZbMP3Xtx7COg== > +RMD160 (jacal-1b9.zip) = Fm5l2peZov8FhNGSMJ8ppxSwBJE= > +SHA1 (jacal-1b9.zip) = 65m9YXO7SzkIxV/Njn+YArgb9Vc= > +SHA256 (jacal-1b9.zip) = a9tWDUsgMwXv54G1SO3qxlY8Ec0CDHmKH2xu6E2p1Zw= > +SIZE (jacal-1b9.zip) = 270544 > Index: patches/patch-Makefile > =================================================================== > RCS file: /cvs/ports/math/jacal/patches/patch-Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 patch-Makefile > --- patches/patch-Makefile 30 Oct 2005 11:13:25 -0000 1.1.1.1 > +++ patches/patch-Makefile 29 Nov 2008 19:37:13 -0000 > @@ -1,45 +1,14 @@ > $OpenBSD: patch-Makefile,v 1.1.1.1 2005/10/30 11:13:25 espie Exp $ > ---- Makefile.orig Sun Oct 30 11:39:54 2005 > -+++ Makefile Sun Oct 30 11:40:32 2005 > -@@ -71,25 +71,25 @@ $(infodir)jacal.info.gz: $(infodir)jacal > - gzip -f $(infodir)jacal.info > - > - pinstall: jacal.1 > -- test -d $(mandir) || mkdir $(mandir) > -- test -d $(man1dir) || mkdir $(man1dir) > -- -cp jacal.1 $(man1dir) > -- test -d $(libdir) || mkdir $(libdir) > -- test -d $(JACALLIB) || mkdir $(JACALLIB) > -- -cp $(sfiles) $(cfiles) $(gfiles) jacalcat Makefile COPYING HELP > $(JACALLIB) > -+ test -d $(DESTDIR)$(mandir) || mkdir $(DESTDIR)$(mandir) > -+ test -d $(DESTDIR)$(man1dir) || mkdir $(DESTDIR)$(man1dir) > -+ -cp jacal.1 $(DESTDIR)$(man1dir) > -+ test -d $(DESTDIR)$(libdir) || mkdir $(DESTDIR)$(libdir) > -+ test -d $(DESTDIR)$(JACALLIB) || mkdir $(DESTDIR)$(JACALLIB) > -+ -cp $(sfiles) $(cfiles) $(gfiles) jacalcat Makefile COPYING HELP > $(DESTDIR)$(JACALLIB) > - > - install: pinstall > -- echo "(use-modules (ice-9 slib))" > $(JACALLIB)guile.scm > -- echo "(slib:load \"$(JACALLIB)math\")" >> $(JACALLIB)guile.scm > -- echo "(math)" >> $(JACALLIB)guile.scm > -- echo "(slib:load \"$(JACALLIB)math\")" > $(JACALLIB)go.scm > -- echo "(math)" >> $(JACALLIB)go.scm > -+ echo "(use-modules (ice-9 slib))" > > $(DESTDIR)$(JACALLIB)guile.scm > -+ echo "(slib:load \"$(JACALLIB)math\")" >> > $(DESTDIR)$(JACALLIB)guile.scm > -+ echo "(math)" >> > $(DESTDIR)$(JACALLIB)guile.scm > -+ echo "(slib:load \"$(JACALLIB)math\")" > $(DESTDIR)$(JACALLIB)go.scm > -+ echo "(math)" >> $(DESTDIR)$(JACALLIB)go.scm > - test -d $(bindir) || mkdir $(bindir) > -- echo '#! /bin/sh' > $(bindir)jacal > -- echo JACALDIR=$(JACALLIB) >> $(bindir)jacal > -- echo VERSION=$(VERSION) >> $(bindir)jacal > -- cat jacal.sh >> $(bindir)jacal > -- chmod +x $(bindir)jacal > -+ echo '#! /bin/sh' > $(DESTDIR)$(bindir)jacal > -+ echo JACALDIR=$(JACALLIB) >> $(DESTDIR)$(bindir)jacal > -+ echo VERSION=$(VERSION) >> $(DESTDIR)$(bindir)jacal > -+ cat jacal.sh >> $(DESTDIR)$(bindir)jacal > -+ chmod +x $(DESTDIR)$(bindir)jacal > - > - uninstall: > - -rm $(bindir)jacal > +--- Makefile.orig Sun Feb 3 23:00:03 2008 > ++++ Makefile Sat Nov 29 19:19:28 2008 > +@@ -77,9 +77,7 @@ install: pinstall > + echo "(math)" >> > $(DESTDIR)$(jacallibdir)go.scm > + mkdir -p $(DESTDIR)$(bindir) > + echo '#! /bin/sh' > $(DESTDIR)$(bindir)jacal > +- grep -h ^SCHEME_LIBRARY_PATH= `which slib` >> $(DESTDIR)$(bindir)jacal > +- echo export SCHEME_LIBRARY_PATH >> $(DESTDIR)$(bindir)jacal > +- echo JACALDIR=$(DESTDIR)$(jacallibdir) >> $(DESTDIR)$(bindir)jacal > ++ echo JACALDIR=$(jacallibdir) >> $(DESTDIR)$(bindir)jacal > + echo VERSION=$(VERSION) >> $(DESTDIR)$(bindir)jacal > + cat jacal.sh >> $(DESTDIR)$(bindir)jacal > + chmod +x $(DESTDIR)$(bindir)jacal > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/math/jacal/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 30 Oct 2005 11:13:25 -0000 1.1.1.1 > +++ pkg/PLIST 29 Nov 2008 19:37:13 -0000 > @@ -16,7 +16,6 @@ lib/jacal/ff.scm > lib/jacal/func.scm > lib/jacal/go.scm > lib/jacal/grammar.scm > -lib/jacal/guile.scm > lib/jacal/hensel.scm > lib/jacal/hist.scm > lib/jacal/info.scm
