Update of /cvsroot/fink/experimental/lrosengreen/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14758
Modified Files:
openmcl.info openmcl.patch
Log Message:
upstream bug fix (problem with defclass :documentation)
Index: openmcl.info
===================================================================
RCS file: /cvsroot/fink/experimental/lrosengreen/finkinfo/openmcl.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- openmcl.info 11 Oct 2004 22:42:01 -0000 1.7
+++ openmcl.info 27 Oct 2004 05:02:24 -0000 1.8
@@ -1,15 +1,15 @@
Package: openmcl
-Version: 0.14.2.20040914
+Version: 0.14.2.20041026
Revision: 10
Description: ANSI Common Lisp implementation
License: LGPL
Maintainer: Lars Rosengreen <[EMAIL PROTECTED]>
-Source: http://www.margay.org/files/%n/%n-cvs-ccl-0.14-20040914.tar.bz2
+Source: http://www.margay.org/files/%n/%n-cvs-ccl-0.14-20041026.tar.bz2
Source2: ftp://clozure.com/pub/%n-darwinppc-bin-0.14.2-p1.tar.gz
Source3: ftp://clozure.com/pub/%n-darwin-interfaces-040505.tar.gz
-Source-MD5: 67dd02c8296a641d87a1a464239897b8
+Source-MD5: 2c1b430b84950c3106541fdda9016d84
Source2-MD5: a984baf2c55293baac14314d61c203b0
Source3-MD5: b66cda4edbf5e18baa54dae060e30f37
@@ -34,7 +34,9 @@
echo '#! /bin/sh' >> %i/bin/%n
echo 'CCL_DEFAULT_DIRECTORY=%p/lib/%n/ccl exec %p/lib/%n/ccl/dppccl $@' >> %i/bin/%n
chmod +x %i/bin/%n
-
+ mkdir -p %i/share/doc/%n
+ cp -Rp doc/html %i/share/doc/%n
+ rm -rf bindarwin binppc compiler doc headers level-* l1-* lisp-kernel
ppc-boot.image runtime.dfsl scripts xdump
install -m 755 -d %i/lib/%n/ccl
cp -Rp * %i/lib/%n/ccl
<<
@@ -64,12 +66,9 @@
* OpenMCL.app is not a normal application. It is part of OpenMCL's
support for Cocoa, and needs to go in %p/lib/%n/ccl.
- * The sed/awk stuff in PatchScript is kind of yucky -- its there to
+ * The sed/awk stuff in PatchScript is kind of yucky -- it is there to
get the date of the CVS snapshot into ccl:*openmcl-version*
- * Does not install asdf-install -- users who want this feature
- should install cl-asdf-openmcl instead.
-
* tools/asdf.lisp has been patched to provide an SBCL style REQUIRE
mechanism for ASDF systems, and to add
#P"%p/lib/common-lisp/openmcl/systems/" to asdf:*central-registry*
Index: openmcl.patch
===================================================================
RCS file: /cvsroot/fink/experimental/lrosengreen/finkinfo/openmcl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- openmcl.patch 11 Oct 2004 22:42:01 -0000 1.3
+++ openmcl.patch 27 Oct 2004 05:02:24 -0000 1.4
@@ -10,6 +10,51 @@
*openmcl-major-version*
*openmcl-minor-version*
(unless (zerop *openmcl-revision*)
+diff -x CVS -x .cvsignore -x '#*' -x '*~' -Naur ccl.orig/lib/macros.lisp
ccl/lib/macros.lisp
+--- ccl.orig/lib/macros.lisp 2004-05-04 01:23:45.000000000 -0700
++++ ccl/lib/macros.lisp 2004-10-26 19:07:34.000000000 -0700
+@@ -1587,7 +1587,12 @@
+ (unless (and (cadr option)
+ (typep (cadr option) 'symbol))
+ (illegal-option option))
+- `(:metaclass (find-class ',(cadr option))))
++ `(:metaclass ',(cadr option)))
++ (:documentation
++ (let* ((doc (cadr option)))
++ (if (and doc (not (typep doc 'string)))
++ (illegal-option option))
++ `(:documentation ',doc)))
+ (t
+ (list `',option-name `',(cdr option))))))
+ (canonicalize-slot-spec (slot)
+@@ -1656,7 +1661,7 @@
+ (if documentation-p
+ (duplicate-options slot)
+ (setq documentation-p t))
+- (setq documentation (require-type (cadr options) 'string)))
++ (setq documentation (cadr options)))
+ (t
+ (let* ((pair (or (assq (car options) other-options)
+ (car (push (list (car options))
other-options)))))
+@@ -1669,7 +1674,7 @@
+ ,@(when readers `(:readers ',readers))
+ ,@(when writers `(:writers ',writers))
+ ,@(when type-p `(:type ',type))
+- ,@(when documentation `(:documentation ,documentation))
++ ,@(when documentation-p `(:documentation ,documentation))
+ ,@(mapcan #'(lambda (opt)
+ `(',(car opt) ',(cdr opt))) other-options)))))
+ (let* ((direct-superclasses (or superclasses '(standard-object)))
+@@ -1727,9 +1732,6 @@
+ (cond ((and (not (eq keyword 'declare))
+ (memq keyword (prog1 option-keywords (push keyword
option-keywords))))
+ (signal-program-error "Duplicate option: ~s to ~s" keyword
'defgeneric))
+- ((eq keyword :method-name) ; used by generic-flet
+- (if function-name (bad-option o))
+- (setq function-name (cadr o)))
+ ((eq keyword :method-combination)
+ (unless (symbolp (cadr o))
+ (bad-option o))
diff -x CVS -x .cvsignore -x '#*' -x '*~' -Naur ccl.orig/tools/asdf.lisp
ccl/tools/asdf.lisp
--- ccl.orig/tools/asdf.lisp 2004-10-09 22:20:29.000000000 -0700
+++ ccl/tools/asdf.lisp 2004-10-09 23:36:32.000000000 -0700
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
