pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/elib
Module Name: pkgsrc
Committed By: mef
Date: Fri Sep 8 22:08:18 UTC 2023
Modified Files:
pkgsrc/devel/elib: Makefile buildlink3.mk distinfo
pkgsrc/devel/elib/patches: patch-aa
Added Files:
pkgsrc/devel/elib/patches: patch-avltree.el patch-bintree.el
patch-cookie.el patch-dll-debug.el patch-dll.el patch-elib-node.el
Log Message:
(devel/elib) Emacs 28 friendly, thanks msaitoh@ (Re: anthy)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/elib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/elib/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/elib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/elib/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/elib/patches/patch-avltree.el \
pkgsrc/devel/elib/patches/patch-bintree.el \
pkgsrc/devel/elib/patches/patch-cookie.el \
pkgsrc/devel/elib/patches/patch-dll-debug.el \
pkgsrc/devel/elib/patches/patch-dll.el \
pkgsrc/devel/elib/patches/patch-elib-node.el
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/elib/Makefile
diff -u pkgsrc/devel/elib/Makefile:1.21 pkgsrc/devel/elib/Makefile:1.22
--- pkgsrc/devel/elib/Makefile:1.21 Sat May 14 22:25:33 2022
+++ pkgsrc/devel/elib/Makefile Fri Sep 8 22:08:18 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/05/14 22:25:33 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2023/09/08 22:08:18 mef Exp $
#
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 8
+PKGREVISION= 9
CONFLICTS+= emacs20-elib-[0-9]*
Index: pkgsrc/devel/elib/buildlink3.mk
diff -u pkgsrc/devel/elib/buildlink3.mk:1.2 pkgsrc/devel/elib/buildlink3.mk:1.3
--- pkgsrc/devel/elib/buildlink3.mk:1.2 Fri Mar 20 19:24:12 2009
+++ pkgsrc/devel/elib/buildlink3.mk Fri Sep 8 22:08:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2023/09/08 22:08:18 mef Exp $
#
BUILDLINK_TREE+= elib
@@ -7,6 +7,7 @@ BUILDLINK_TREE+= elib
ELIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.elib+= ${EMACS_PKGNAME_PREFIX}elib>=1
+BUILDLINK_ABI_DEPENDS.elib?= elib>=1.0nb8
BUILDLINK_PKGSRCDIR.elib?= ../../devel/elib
BUILDLINK_CONTENTS_FILTER.elib= ${EGREP} '.*\.el$$|.*\.elc$$'
Index: pkgsrc/devel/elib/distinfo
diff -u pkgsrc/devel/elib/distinfo:1.8 pkgsrc/devel/elib/distinfo:1.9
--- pkgsrc/devel/elib/distinfo:1.8 Tue Oct 26 10:14:36 2021
+++ pkgsrc/devel/elib/distinfo Fri Sep 8 22:08:18 2023
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:14:36 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/09/08 22:08:18 mef Exp $
BLAKE2s (elib-1.0.tar.gz) = e89970ec564a5caaa16bffc478a965af913ae46de3448177646b4fcceb1db0c7
SHA512 (elib-1.0.tar.gz) = ca5d6e0861f3d8d049911a9e4455169263bd781992103baacadae560fce0fedddb734617338cb5fac51420fcb2035622042836fa7198fe7bec312a0015da266d
Size (elib-1.0.tar.gz) = 58335 bytes
-SHA1 (patch-aa) = d78586bf11e732fbbcf6512ad415fd4cf7b3f78a
+SHA1 (patch-aa) = 40e88d3b7a005cdf7e1b105acd25d3e5482120ef
SHA1 (patch-ab) = 3b96be6ac7b48166da5b9cd662aa1f481037d072
+SHA1 (patch-avltree.el) = cf9978dd48c2d9223c481a9452add3764711f24b
+SHA1 (patch-bintree.el) = 6fed2c3a33dcbce46fc7a80d932b3d10bff6a39f
+SHA1 (patch-cookie.el) = 0337b7a2b851025204602c04562cadcd4b4f92c5
+SHA1 (patch-dll-debug.el) = 3ecbbcc385d7dcabfc9c9c9332ae6dc6f27f01a7
+SHA1 (patch-dll.el) = be2d0241e25cf2562e7515db8c3b31fb94f8bd27
+SHA1 (patch-elib-node.el) = 0e21fb3d93cf87246b2f9e019abf42427dff6e79
Index: pkgsrc/devel/elib/patches/patch-aa
diff -u pkgsrc/devel/elib/patches/patch-aa:1.1 pkgsrc/devel/elib/patches/patch-aa:1.2
--- pkgsrc/devel/elib/patches/patch-aa:1.1 Mon Feb 18 15:14:09 2002
+++ pkgsrc/devel/elib/patches/patch-aa Fri Sep 8 22:08:18 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:09 seb Exp $
+$NetBSD: patch-aa,v 1.2 2023/09/08 22:08:18 mef Exp $
+
+remove makeinfo
--- Makefile.orig Mon Dec 11 01:50:56 1995
+++ Makefile
Added files:
Index: pkgsrc/devel/elib/patches/patch-avltree.el
diff -u /dev/null pkgsrc/devel/elib/patches/patch-avltree.el:1.1
--- /dev/null Fri Sep 8 22:08:18 2023
+++ pkgsrc/devel/elib/patches/patch-avltree.el Fri Sep 8 22:08:18 2023
@@ -0,0 +1,53 @@
+$NetBSD: patch-avltree.el,v 1.1 2023/09/08 22:08:18 mef Exp $
+
+for emacs28
+
+--- avltree.el.orig 1995-12-11 09:50:53.000000000 +0900
++++ avltree.el 2023-09-09 06:10:11.235237927 +0900
+@@ -69,19 +69,19 @@
+ (defmacro elib-avl-node-create (left right data balance)
+
+ ;; Create and return an avl-tree node.
+- (` (vector (, left) (, right) (, data) (, balance))))
++ ` (vector , left , right , data , balance) )
+
+
+ (defmacro elib-avl-node-balance (node)
+
+ ;; Return the balance field of a node.
+- (` (aref (, node) 3)))
++ ` (aref , node 3) )
+
+
+ (defmacro elib-avl-node-set-balance (node newbal)
+
+ ;; Set the balance field of a node.
+- (` (aset (, node) 3 (, newbal))))
++ ` (aset , node 3 , newbal ) )
+
+
+
+@@ -96,20 +96,20 @@
+ (defmacro elib-avl-root (tree)
+
+ ;; Return the root node for an avl-tree. INTERNAL USE ONLY.
+- (` (elib-node-left (car (cdr (, tree))))))
++ ` (elib-node-left (car (cdr , tree))) )
+
+
+ (defmacro elib-avl-dummyroot (tree)
+
+ ;; Return the dummy node of an avl-tree. INTERNAL USE ONLY.
+
+- (` (car (cdr (, tree)))))
++ ` (car (cdr , tree)) )
+
+
+ (defmacro elib-avl-cmpfun (tree)
+
+ ;; Return the compare function of AVL tree TREE. INTERNAL USE ONLY.
+- (` (cdr (cdr (, tree)))))
++ ` (cdr (cdr , tree)) )
+
+
+ ;; ----------------------------------------------------------------
Index: pkgsrc/devel/elib/patches/patch-bintree.el
diff -u /dev/null pkgsrc/devel/elib/patches/patch-bintree.el:1.1
--- /dev/null Fri Sep 8 22:08:18 2023
+++ pkgsrc/devel/elib/patches/patch-bintree.el Fri Sep 8 22:08:18 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-bintree.el,v 1.1 2023/09/08 22:08:18 mef Exp $
+
+For emacs28
+
+--- bintree.el.orig 1995-12-11 09:50:53.000000000 +0900
++++ bintree.el 2023-09-09 06:07:01.242411450 +0900
+@@ -64,19 +64,19 @@
+ (defmacro elib-bintree-root (tree)
+
+ ;; Return the root node for a binary tree. INTERNAL USE ONLY.
+- (` (elib-node-left (car (cdr (, tree))))))
++ ` (elib-node-left (car (cdr , tree))) )
+
+
+ (defmacro elib-bintree-dummyroot (tree)
+
+ ;; Return the dummy node of a binary tree. INTERNAL USE ONLY.
+- (` (car (cdr (, tree)))))
++ ` (car (cdr (, tree))) )
+
+
+ (defmacro elib-bintree-cmpfun (tree)
+
+ ;; Return the compare function of binary tree TREE. INTERNAL USE ONLY."
+- (` (cdr (cdr (, tree)))))
++ ` (cdr (cdr (, tree))) )
+
+
+
Index: pkgsrc/devel/elib/patches/patch-cookie.el
diff -u /dev/null pkgsrc/devel/elib/patches/patch-cookie.el:1.1
--- /dev/null Fri Sep 8 22:08:18 2023
+++ pkgsrc/devel/elib/patches/patch-cookie.el Fri Sep 8 22:08:18 2023
@@ -0,0 +1,66 @@
+$NetBSD: patch-cookie.el,v 1.1 2023/09/08 22:08:18 mef Exp $
+
+for emacs28
+
+--- cookie.el.orig 1995-12-11 09:50:54.000000000 +0900
++++ cookie.el 2023-09-09 06:14:56.369095803 +0900
+@@ -139,13 +139,13 @@
+
+ (let ((old-buffer (make-symbol "old-buffer"))
+ (hnd (make-symbol "collection")))
+- (` (let* (((, old-buffer) (current-buffer))
+- ((, hnd) (, collection))
+- (dll (elib-collection->dll (, hnd))))
+- (set-buffer (elib-collection->buffer (, hnd)))
++ ` (let* (( , old-buffer (current-buffer))
++ ( , hnd , collection )
++ (dll (elib-collection->dll , hnd ) )
++ (set-buffer (elib-collection->buffer , hnd ))
+ (unwind-protect
+- (progn (,@ forms))
+- (set-buffer (, old-buffer)))))))
++ (progn ,@ forms )
++ (set-buffer , old-buffer )))))
+
+
+ (put 'elib-set-buffer-bind-dll-let* 'lisp-indent-hook 2)
+@@ -160,14 +160,14 @@
+
+ (let ((old-buffer (make-symbol "old-buffer"))
+ (hnd (make-symbol "collection")))
+- (` (let* (((, old-buffer) (current-buffer))
+- ((, hnd) (, collection))
+- (dll (elib-collection->dll (, hnd)))
+- (,@ varlist))
+- (set-buffer (elib-collection->buffer (, hnd)))
++ ` (let* (( , old-buffer (current-buffer))
++ ( , hnd , collection )
++ (dll (elib-collection->dll , hnd ))
++ ,@ varlist )
++ (set-buffer (elib-collection->buffer , hnd ))
+ (unwind-protect
+- (progn (,@ forms))
+- (set-buffer (, old-buffer)))))))
++ (progn ,@ forms )
++ (set-buffer , old-buffer) )))))
+
+
+ (defmacro elib-filter-hf (collection tin)
+@@ -179,12 +179,12 @@
+
+ (let ((tempvar (make-symbol "tin"))
+ (tmpcoll (make-symbol "tmpcollection")))
+- (` (let (((, tempvar) (, tin))
+- ((, tmpcoll) (, collection)))
+- (if (or (eq (, tempvar) (elib-collection->header (, tmpcoll)))
+- (eq (, tempvar) (elib-collection->footer (, tmpcoll))))
++ ` (let (( , tempvar , tin)
++ ( , tmpcoll , collection) )
++ (if (or (eq , tempvar (elib-collection->header , tmpcoll ))
++ (eq , tempvar (elib-collection->footer , tmpcoll )))
+ nil
+- (, tempvar))))))
++ , tempvar))) )
+
+
+
Index: pkgsrc/devel/elib/patches/patch-dll-debug.el
diff -u /dev/null pkgsrc/devel/elib/patches/patch-dll-debug.el:1.1
--- /dev/null Fri Sep 8 22:08:18 2023
+++ pkgsrc/devel/elib/patches/patch-dll-debug.el Fri Sep 8 22:08:18 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-dll-debug.el,v 1.1 2023/09/08 22:08:18 mef Exp $
+
+for emacs28
+
+--- dll-debug.el 1995-12-11 09:50:54.000000000 +0900
++++ /tmp/dll-debug.el 2023-09-09 06:49:20.470715606 +0900
+@@ -74,9 +74,9 @@
+ (defmacro dll-insert-after (node element)
+ (let ((node-v (make-symbol "node"))
+ (element-v (make-symbol "element")))
+- (` (let (((, node-v) (, node))
+- ((, element-v) (, element)))
+- (setcdr (, node-v) (cons (, element-v) (cdr (, node-v))))))))
++ ` (let (( , node-v , node )
++ ( , element-v , element ))
++ (setcdr , node-v (cons , element-v (cdr , node-v ))))) )
+
+ ;;; ===================================================================
+ ;;; The public functions which operate on doubly linked lists.
+@@ -86,7 +86,7 @@
+ "Get the element of a NODE in a doubly linked list DLL.
+ Args: DLL NODE."
+
+- (` (car (, node))))
++ ` (car , node) )
+
+
+ (defun dll-create ()
Index: pkgsrc/devel/elib/patches/patch-dll.el
diff -u /dev/null pkgsrc/devel/elib/patches/patch-dll.el:1.1
--- /dev/null Fri Sep 8 22:08:18 2023
+++ pkgsrc/devel/elib/patches/patch-dll.el Fri Sep 8 22:08:18 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-dll.el,v 1.1 2023/09/08 22:08:18 mef Exp $
+
+for emacs28
+
+--- dll.el.orig 1995-12-11 09:50:54.000000000 +0900
++++ dll.el 2023-09-09 06:54:37.229080637 +0900
+@@ -89,7 +89,7 @@
+ "Get the element of a NODE in a doubly linked list DLL.
+ Args: DLL NODE."
+
+- (` (elib-node-data (, node))))
++ ` (elib-node-data , node ) )
+
+
+ (defun dll-create ()
Index: pkgsrc/devel/elib/patches/patch-elib-node.el
diff -u /dev/null pkgsrc/devel/elib/patches/patch-elib-node.el:1.1
--- /dev/null Fri Sep 8 22:08:18 2023
+++ pkgsrc/devel/elib/patches/patch-elib-node.el Fri Sep 8 22:08:18 2023
@@ -0,0 +1,73 @@
+$NetBSD: patch-elib-node.el,v 1.1 2023/09/08 22:08:18 mef Exp $
+
+for emacs28
+
+--- elib-node.el.orig 1995-12-11 09:50:53.000000000 +0900
++++ elib-node.el 2023-09-09 05:24:49.583969921 +0900
+@@ -49,42 +49,41 @@
+ (defmacro elib-node-create (left right data)
+
+ ;; Create a tree node from LEFT, RIGHT and DATA.
+- (` (vector (, left) (, right) (, data))))
++ `(vector , left , right , data) )
+
+
+ (defmacro elib-node-left (node)
+
+ ;; Return the left pointer of NODE.
+- (` (aref (, node) 0)))
++ `(aref , node 0) )
+
+
+ (defmacro elib-node-right (node)
+
+ ;; Return the right pointer of NODE.
+- (` (aref (, node) 1)))
+-
++ `(aref , node 1) )
+
+ (defmacro elib-node-data (node)
+
+ ;; Return the data of NODE.
+- (` (aref (, node) 2)))
++ `(aref , node 2) )
+
+
+ (defmacro elib-node-set-left (node newleft)
+
+ ;; Set the left pointer of NODE to NEWLEFT.
+- (` (aset (, node) 0 (, newleft))))
++ `(aset , node 0 , newleft) )
+
+
+ (defmacro elib-node-set-right (node newright)
+
+ ;; Set the right pointer of NODE to NEWRIGHT.
+- (` (aset (, node) 1 (, newright))))
++ `(aset , node 1 , newright) )
+
+
+ (defmacro elib-node-set-data (node newdata)
+ ;; Set the data of NODE to NEWDATA.
+- (` (aset (, node) 2 (, newdata))))
++ `(aset , node 2 , newdata) )
+
+
+
+@@ -94,7 +93,7 @@
+ ;;
+ ;; NODE is the node, and BRANCH is the branch.
+ ;; 0 for left pointer, 1 for right pointer and 2 for the data."
+- (` (aref (, node) (, branch))))
++ `(aref , node , branch) )
+
+
+ (defmacro elib-node-set-branch (node branch newval)
+@@ -104,6 +103,6 @@
+ ;; NODE is the node, and BRANCH is the branch.
+ ;; 0 for left pointer, 1 for the right pointer and 2 for the data.
+ ;; NEWVAL is new value of the branch."
+- (` (aset (, node) (, branch) (, newval))))
++ `(aset , node , branch , newval) )
+
+ ;;; elib-node.el ends here.
Home |
Main Index |
Thread Index |
Old Index