Apply patch from Matthew Swank <akopa@charter.net> to enable compilation on CLISP...
authorMatthew Kennedy <mkennedy@gentoo.org>
Thu, 27 Oct 2005 20:34:05 +0000 (20:34 +0000)
committerMatthew Kennedy <mkennedy@gentoo.org>
Thu, 27 Oct 2005 20:34:05 +0000 (20:34 +0000)
Package-Manager: portage-2.0.53_rc6

dev-lisp/cl-aserve/ChangeLog
dev-lisp/cl-aserve/Manifest
dev-lisp/cl-aserve/cl-aserve-1.2.42.20050805.ebuild
dev-lisp/cl-aserve/files/1.2.42.20050805-clisp-gentoo.patch [new file with mode: 0644]

index 1e111b1a120fe94719b4e160026585cfa2233aa7..d3ffda1cf7ff114e4a29118b9d37a803cfafa93f 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-aserve
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/ChangeLog,v 1.19 2005/08/14 22:33:29 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/ChangeLog,v 1.20 2005/10/27 20:34:05 mkennedy Exp $
+
+  27 Oct 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.2.42.20050805-clisp-gentoo.patch,
+  cl-aserve-1.2.42.20050805.ebuild:
+  Apply patch from Matthew Swank <akopa@charter.net> to enable compilation on
+  CLISP; Resolves Bug #104938.
 
 *cl-aserve-1.2.42.20050805 (14 Aug 2005)
 
index d340a9624cb62566c4f4239ba433776bbf98dcd1..de6402020b9ecfe503a57505b48eee0787f4e0e4 100644 (file)
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3e6fe602c8bb1354a095e9049f094316 ChangeLog 3191
-MD5 cf96ff1654929b2a0a7e0f8013bc522a cl-aserve-1.2.42.20050805.ebuild 1082
-MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
+MD5 e6b1ce0439210e608caf4d8dcdfae663 ChangeLog 3435
 MD5 f74f5fd5dc944071f900b4e5919b5f95 cl-aserve-1.2.42.20050220.ebuild 1072
-MD5 4647f20ceef5e201f48238231cc3810a files/digest-cl-aserve-1.2.42.20050805 97
+MD5 38bcc67bc19dfcd5f21b220c6769c322 cl-aserve-1.2.42.20050805.ebuild 1167
+MD5 661ef1af83c4b862f990e26e6e57cd78 files/1.2.42.20050805-clisp-gentoo.patch 1002
 MD5 da9c8b6af57dbf3f2e1db4347b533f71 files/digest-cl-aserve-1.2.42.20050220 92
+MD5 4647f20ceef5e201f48238231cc3810a files/digest-cl-aserve-1.2.42.20050805 97
+MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC/8bpyiNZaEAZA+ARAlE2AJsG7/dxeW72TRfHQqFVOXiezG31WwCfTNxo
-Fuy4vh/G6Q+M/7unt5N/hjY=
-=fZ++
+iD8DBQFDYTnUyiNZaEAZA+ARAki2AJ9pKIjrPZekdkk12cn8wwPZYnLrVwCdGq2C
+S5Ino44C67gNgOkKcJa/cyw=
+=xQkT
 -----END PGP SIGNATURE-----
index 2fc821688529ba017266b53cdd7c1e542a045de9..958ca8b6f1f8e36b6f56fa768f80ae62f74d1286 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/cl-aserve-1.2.42.20050805.ebuild,v 1.1 2005/08/14 22:33:29 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-aserve/cl-aserve-1.2.42.20050805.ebuild,v 1.2 2005/10/27 20:34:05 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -22,6 +22,11 @@ CLPACKAGE=aserve
 
 S=${WORKDIR}/cl-portable-aserve-${MY_PV}+cvs.${CVS_PV}.orig
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}; epatch ${FILESDIR}/${PV}-clisp-gentoo.patch
+}
+
 src_install() {
        common-lisp-install aserve/*.cl aserve/*.asd
        common-lisp-system-symlink
diff --git a/dev-lisp/cl-aserve/files/1.2.42.20050805-clisp-gentoo.patch b/dev-lisp/cl-aserve/files/1.2.42.20050805-clisp-gentoo.patch
new file mode 100644 (file)
index 0000000..f1d3117
--- /dev/null
@@ -0,0 +1,34 @@
+diff -ur aserve.orig/main.cl aserve/main.cl
+--- aserve.orig/main.cl        2005-08-26 02:47:49.000000000 -0500
++++ aserve/main.cl     2005-09-05 14:21:05.000000000 -0500
+@@ -215,7 +215,7 @@
+ )
+ 
+ #+(and clisp unix)
+-(defun getpid () (unix:getpid))
++(defun getpid () (sys::process-id))
+ 
+ #+ (and sbcl unix)
+ (progn
+@@ -1519,8 +1519,12 @@
+                 (if* error-obj
+                    then (brief-logmess 
+                          (format nil "While reading http request~:_ from ~a:~:_ ~a" 
++                                 #+clisp
++                                 (acl-compat.socket:ipaddr-to-dotted 
++                                   (acl-compat.socket::remote-host sock))
++                                   #-clisp
+                                  (socket:ipaddr-to-dotted 
+-                                  (socket::remote-host sock))
++                                   (socket::remote-host sock))
+                                  error-obj)))
+ 
+                 ; notify the client if it's still listening
+@@ -2777,6 +2781,7 @@
+   data         ; list of buffers
+   create ; create new object for the buffer
+   init         ; optional - used to init buffers taken off the free list
++  #-clisp
+   (lock  (acl-compat.mp:make-process-lock))
+   )
+