*** empty log message ***

3 files changed, 72 insertions, 25 deletions

diff --git a/dev-lisp/cl-phtml/files/phtml-20030325-gentoo.patch b/dev-lisp/cl-phtml/files/phtml-20030325-gentoo.patch
new file mode 100644
index 000000000000..120d76463a08
--- /dev/null
+++ b/dev-lisp/cl-phtml/files/phtml-20030325-gentoo.patch
@@ -0,0 +1,59 @@
+diff -u xmlutils.orig/phtml.cl xmlutils/phtml.cl
+--- xmlutils.orig/phtml.cl	2003-04-01 00:41:00.000000000 -0600
++++ xmlutils/phtml.cl	2003-10-16 09:40:42.226740320 -0500
+@@ -1,3 +1,4 @@
++#+allegro
+ (sys:defpatch "phtml" 1
+   "parse-html close tag closes consecutive identical open tags."
+   :type :system
+@@ -48,7 +49,7 @@
+ ;
+ 
+ (defpackage net.html.parser
+-  (:use :lisp :clos :excl)
++  (:use :common-lisp #+allegro :clos :acl-compat-mp :acl-compat.excl)
+   (:export
+    #:phtml-internal
+    #:parse-html))
+@@ -103,7 +104,7 @@
+ (defun get-collector ()
+   (declare (optimize (speed 3) (safety 1)))
+   (let (col)
+-    (mp::without-scheduling
++    (acl-compat.mp:without-scheduling
+       (do* ((cols *collectors* (cdr cols))
+ 	    (this (car cols) (car cols)))
+ 	  ((null cols))
+@@ -121,7 +122,7 @@
+ 
+ (defun put-back-collector (col)
+   (declare (optimize (speed 3) (safety 1)))
+-  (mp::without-scheduling 
++  (acl-compat.mp:without-scheduling 
+     (do ((cols *collectors* (cdr cols)))
+ 	((null cols)
+ 	 ; toss it away
+@@ -533,7 +534,7 @@
+ (defun get-tokenbuf ()
+   (declare (optimize (speed 3) (safety 1)))
+   (let (buf)
+-    (mp::without-scheduling
++    (acl-compat.mp:without-scheduling
+       (do* ((bufs *tokenbufs* (cdr bufs))
+ 	    (this (car bufs) (car bufs)))
+ 	  ((null bufs))
+@@ -552,7 +553,7 @@
+ 
+ (defun put-back-tokenbuf (buf)
+   (declare (optimize (speed 3) (safety 1)))
+-  (mp::without-scheduling 
++  (acl-compat.mp:without-scheduling 
+     (do ((bufs *tokenbufs* (cdr bufs)))
+ 	((null bufs)
+ 	 ; toss it away
+@@ -1390,4 +1391,4 @@
+ ;;;	  (parse-response
+ ;;;	   (simple-get host path)))))
+ 
+-(provide :phtml)
++#+allegro (provide :phtml)
diff --git a/dev-lisp/cl-phtml/files/phtml-gentoo.patch b/dev-lisp/cl-phtml/files/phtml-gentoo.patch
deleted file mode 100644
index c0052057c7d4..000000000000
--- a/dev-lisp/cl-phtml/files/phtml-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u xmlutils.orig/phtml.cl xmlutils/phtml.cl
---- xmlutils.orig/phtml.cl	2003-04-01 00:41:00.000000000 -0600
-+++ xmlutils/phtml.cl	2003-06-09 19:25:13.000000000 -0500
-@@ -1,8 +1,3 @@
--(sys:defpatch "phtml" 1
--  "parse-html close tag closes consecutive identical open tags."
--  :type :system
--  :post-loadable t)
--
- ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
- ;;
- ;; This code is free software; you can redistribute it and/or
-@@ -48,7 +43,7 @@
- ;
- 
- (defpackage net.html.parser
--  (:use :lisp :clos :excl)
-+  (:use :lisp :excl)
-   (:export
-    #:phtml-internal
-    #:parse-html))
-Only in xmlutils: phtml.cl~
diff --git a/dev-lisp/cl-phtml/files/phtml.asd b/dev-lisp/cl-phtml/files/phtml.asd
index b2147e33e925..0b7d49887db6 100644
--- a/dev-lisp/cl-phtml/files/phtml.asd
+++ b/dev-lisp/cl-phtml/files/phtml.asd
@@ -1,6 +1,16 @@
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp -*-
 
-(in-package "CL-USER")
+(defpackage #:phtml-system
+  (:use #:cl #:asdf))
+(in-package #:phtml-system)
 
-(asdf:defsystem phtml
+(in-package :phtml-system)
+
+(defclass acl-file (cl-source-file) ())
+
+(defmethod asdf::source-file-type ((c acl-file) (s module)) 
+  "cl")
+
+(defsystem phtml
     :depends-on (acl-compat)
-    :components ((:file "phtml")))
+    :components ((:acl-file "phtml")))