diff options
author | Volker Stolz <vs@FreeBSD.org> | 2006-05-17 12:25:27 +0000 |
---|---|---|
committer | Volker Stolz <vs@FreeBSD.org> | 2006-05-17 12:25:27 +0000 |
commit | 2f697676d797d78f01c7e6fb8bb33e6021f2f8ad (patch) | |
tree | 332d8c70b8c266487fb296afce203f50f12b3a87 /java/jde | |
parent | Remove ia64 from supported ARCH as we have no linuxulator support for it. (diff) |
JDE's stable code does not properly detect the version of newer versions of CEDET,
and will fail to load. Add patch from CVS.
PR: ports/95609
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=162648
Diffstat (limited to 'java/jde')
-rw-r--r-- | java/jde/Makefile | 1 | ||||
-rw-r--r-- | java/jde/files/patch-jde-version-check-fix | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/java/jde/Makefile b/java/jde/Makefile index cadd174d01a8..d9c791284ed3 100644 --- a/java/jde/Makefile +++ b/java/jde/Makefile @@ -7,6 +7,7 @@ PORTNAME= jde PORTVERSION= 2.3.5 +PORTREVISION= 1 CATEGORIES= java elisp MASTER_SITES= http://jdee.sunsite.dk/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/java/jde/files/patch-jde-version-check-fix b/java/jde/files/patch-jde-version-check-fix new file mode 100644 index 000000000000..9bb5baee5af0 --- /dev/null +++ b/java/jde/files/patch-jde-version-check-fix @@ -0,0 +1,48 @@ +diff -ru ../old/jde-2.3.5/lisp/jde-util.el ./lisp/jde-util.el +--- ../old/jde-2.3.5/lisp/jde-util.el Fri Dec 17 04:29:37 2004 ++++ ./lisp/jde-util.el Tue Apr 11 03:27:47 2006 +@@ -90,6 +90,13 @@ + (aset newstr i tochar))) + newstr))) + ++(if (not (fboundp 'replace-in-string)) ++ (defun replace-in-string (string regexp newtext &optional literal) ++ "Replace REGEXP with NEWTEXT in STRIng." ++ (if (string-match regexp string) ++ (replace-match newtext nil nil string) ++ string))) ++ + (defun jde-get-line-at-point (&optional pos) + "Get the number of the line at point." + (let* ((point (or pos (point))) +diff -ru ../old/jde-2.3.5/lisp/jde.el ./lisp/jde.el +--- ../old/jde-2.3.5/lisp/jde.el Fri Dec 17 04:29:35 2004 ++++ ./lisp/jde.el Tue Apr 11 03:27:04 2006 +@@ -998,17 +998,16 @@ + + (defun jde-earlier-versionp (ver1 ver2) + "Return non-nil if VER1 is earlier than VER2" +- (let ((ver1-betap (string-match "beta" ver1)) +- (ver2-betap (string-match "beta" ver2))) +- (if (or (and ver1-betap ver2-betap) +- (and (not ver1-betap) (not ver2-betap))) +- (string< ver1 ver2) +- (if ver1-betap +- (progn +- (or (string= ver2 (substring ver1 0 ver1-betap)) +- (string< (substring ver1 0 ver1-betap) ver2))) +- (progn +- (string< ver1 (substring ver2 0 ver2-betap))))))) ++ (let ((ver1n (replace-in-string ver1 "beta" "zb")) ++ (ver2n (replace-in-string ver2 "beta" "zb"))) ++ (setq ver1n (replace-in-string ver1n "pre" "zp")) ++ (setq ver2n (replace-in-string ver2n "pre" "zp")) ++ (if (string-match "z" ver1n) ++ (unless (string-match "z" ver2n) ++ (setq ver2n (concat ver2n "zz"))) ++ (if (string-match "z" ver2n) ++ (setq ver1n (concat ver1n "zz")))) ++ (string< ver1n ver2n))) + + (defcustom jde-log-max 500 + "*Maximum number of lines to keep in the JDE log buffer. |