diff options
| -rw-r--r-- | lang/tuareg-mode.el/Makefile | 25 | ||||
| -rw-r--r-- | lang/tuareg-mode.el/distinfo | 4 | ||||
| -rw-r--r-- | lang/tuareg-mode.el/files/patch-tuareg.el | 39 | ||||
| -rw-r--r-- | lang/tuareg-mode.el/pkg-descr | 6 | ||||
| -rw-r--r-- | lang/tuareg-mode.el/scripts/batch-compile.el | 10 |
5 files changed, 13 insertions, 71 deletions
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile index 74563d488fa7..761b6432be87 100644 --- a/lang/tuareg-mode.el/Makefile +++ b/lang/tuareg-mode.el/Makefile @@ -1,26 +1,22 @@ -# New ports collection makefile for: tuareg-mode -# Date created: 28 October 2004 -# Whom: dd -# +# Created by: dd # $FreeBSD$ -# PORTNAME= tuareg-mode -PORTVERSION= 1.45.6 -PORTREVISION= 13 +PORTVERSION= 2.0.6 PORTEPOCH= 1 CATEGORIES= lang elisp -MASTER_SITES= http://www-rocq.inria.fr/~acohen/tuareg/mode/ +MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/882/ MAINTAINER= michael.grunewald@laposte.net COMMENT= Emacs major mode for editing Caml code USE_EMACS= yes -USE_BZIP2= yes -DOC_FILES= README HISTORY append-tuareg.el custom-tuareg.el +WRKSRC= ${WRKDIR}/tuareg-${PORTVERSION} + +DOC_FILES= README DOC_DIR= share/doc/tuareg-mode -ELISP_FILES= camldebug.el tuareg.el +ELISP_FILES= ocamldebug.el tuareg.el PLIST_FILES= ${ELISP_FILES:S/^/${EMACS_SITE_LISPDIR}\//} \ ${ELISP_FILES:S/^/${EMACS_SITE_LISPDIR}\//S/$/c/} \ @@ -34,14 +30,9 @@ PLIST_DIRS= ${DOC_DIR} # Operations # -# We do provide our own build and install procedures, instead of using -# mainstream author's one. - do-build: -.for tuareg_mode_f in ${ELISP_FILES} cd ${WRKSRC} &&\ - ${EMACS_CMD} -batch -q -l ${SCRIPTDIR}/batch-compile.el ${tuareg_mode_f} -.endfor + ${EMACS_CMD} -batch -q -f batch-byte-compile ${ELISP_FILES} do-install: .for tuareg_mode_f in ${ELISP_FILES} diff --git a/lang/tuareg-mode.el/distinfo b/lang/tuareg-mode.el/distinfo index 0603f951b0b1..79f0f8452ebd 100644 --- a/lang/tuareg-mode.el/distinfo +++ b/lang/tuareg-mode.el/distinfo @@ -1,2 +1,2 @@ -SHA256 (tuareg-mode-1.45.6.tar.bz2) = 2f22834259a6b0c065a6528a519eda3d0164a9bf2de8a5f7c041d6a91777261b -SIZE (tuareg-mode-1.45.6.tar.bz2) = 46822 +SHA256 (tuareg-mode-2.0.6.tar.gz) = ea79ac24623b82ab8047345f8504abca557a537e639d16ce1ac3e5b27f5b1189 +SIZE (tuareg-mode-2.0.6.tar.gz) = 54916 diff --git a/lang/tuareg-mode.el/files/patch-tuareg.el b/lang/tuareg-mode.el/files/patch-tuareg.el deleted file mode 100644 index 1bcb3156baaf..000000000000 --- a/lang/tuareg-mode.el/files/patch-tuareg.el +++ /dev/null @@ -1,39 +0,0 @@ - -$FreeBSD$ - ---- tuareg.el.orig -+++ tuareg.el -@@ -1245,8 +1245,7 @@ - possible." - (if (eq major-mode 'tuareg-mode) - (let ((beg nil) (end nil)) -- (save-excursion -- (set-buffer compilation-last-buffer) -+ (with-current-buffer compilation-last-buffer - (save-excursion - (goto-char (window-point (get-buffer-window (current-buffer) t))) - (if (looking-at tuareg-error-chars-regexp) -@@ -1438,11 +1437,11 @@ - (defun tuareg-find-match () - (tuareg-find-kwop tuareg-find-kwop-regexp)) - --(defconst tuareg-find-,-match-regexp -+(defconst tuareg-find-comma-match-regexp - (tuareg-make-find-kwop-regexp - "\\<\\(and\\|match\\|begin\\|else\\|exception\\|then\\|try\\|with\\|or\\|fun\\|function\\|let\\|do\\)\\>\\|->\\|[[{(]")) --(defun tuareg-find-,-match () -- (tuareg-find-kwop tuareg-find-,-match-regexp)) -+(defun tuareg-find-comma-match () -+ (tuareg-find-kwop tuareg-find-comma-match-regexp)) - - (defconst tuareg-find-with-match-regexp - (tuareg-make-find-kwop-regexp -@@ -1922,7 +1921,7 @@ - ((string= kwop ",") - (if (looking-at ",[ \t]*\\((\\*\\|$\\)") - (progn -- (setq kwop (tuareg-find-,-match)) -+ (setq kwop (tuareg-find-comma-match)) - (if (or (looking-at "[[{(]\\|\\.<") - (and (looking-at "[<|]") - (char-equal ?\[ (preceding-char)) diff --git a/lang/tuareg-mode.el/pkg-descr b/lang/tuareg-mode.el/pkg-descr index 39066462f13d..70b595e46aa2 100644 --- a/lang/tuareg-mode.el/pkg-descr +++ b/lang/tuareg-mode.el/pkg-descr @@ -1,12 +1,12 @@ From the web site: Tuareg is a Caml mode for GNU Emacs and XEmacs. It handles automatic - indentation of Objective Caml and Camllight codes. Key parts of the + indentation of OCaml and Camllight codes. Key parts of the code are hilighted using Font-Lock. Support to run an interactive Caml toplevel and debbuger is provided. This mode attempts to give better results than the one provided in - the standard distribution OCaml 3.x. Indentation rules are slightly + the standard distribution of OCaml. Indentation rules are slightly different but closer to classical functional languages. There is no relation with the Tuareg People, except their reputation @@ -14,4 +14,4 @@ From the web site: Documentation is installed into share/doc/tuareg-mode -WWW: http://www-rocq.inria.fr/~acohen/tuareg/ +WWW: http://tuareg.forge.ocamlcore.org/ diff --git a/lang/tuareg-mode.el/scripts/batch-compile.el b/lang/tuareg-mode.el/scripts/batch-compile.el deleted file mode 100644 index 33ca1ba3b620..000000000000 --- a/lang/tuareg-mode.el/scripts/batch-compile.el +++ /dev/null @@ -1,10 +0,0 @@ -(setq load-path (cons "." load-path)) -(batch-byte-compile) -END-of-tuareg-mode.el/scripts/batch-compile.el -echo x - tuareg-mode.el/distinfo -sed 's/^X//' >tuareg-mode.el/distinfo << 'END-of-tuareg-mode.el/distinfo' -SHA256 (tuareg-mode-1.45.6.tar.bz2) =3D 2f22834259a6b0c065a6528a519eda3d01= -64a9bf2de8a5f7c041d6a91777261b -SIZE (tuareg-mode-1.45.6.tar.bz2) =3D 46822 -END-of-tuareg-mode.el/distinfo -exit |