ports/121981: [patch] sysutils/ledit update to 2.00

[Hirohisa Yamaguchi]

>Number:         121981
>Category:       ports
>Synopsis:       [patch] sysutils/ledit update to 2.00
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 23 00:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #15: Fri Jan 18 14:38:27 JST 2008 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	There is a newer version of sysutils/ledit 2.00.
	http://cristal.inria.fr/~ddr/ledit/

	This requires Camlp5 which is not yet in the ports tree
	(and submitted as ports/121963).
 
>How-To-Repeat:
	N/A
>Fix:

	The patch follows:
	 files/patch-pa_local.ml dropped.

diff -Npru ports.orig/sysutils/ledit/Makefile ports/sysutils/ledit/Makefile
--- ports.orig/sysutils/ledit/Makefile	2007-06-26 02:14:41.000000000 +0900
+++ ports/sysutils/ledit/Makefile	2008-03-23 09:07:18.000000000 +0900
@@ -7,15 +7,18 @@
 #
 
 PORTNAME=	ledit
-PORTVERSION=	1.11
-PORTREVISION=	1
+PORTVERSION=	2.00
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/cristal/Daniel.de_Rauglaudre/Tools/ \
-		http://home.leo.org/~barner/freebsd/distfiles/
+MASTER_SITES=	http://cristal.inria.fr/~ddr/ledit/distrib/src/ \
+		http://pauillac.inria.fr/~ddr/ledit/distrib/src/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	barner at FreeBSD.org
 COMMENT=	Line editor to be used with interactive commands
 
+BUILD_DEPENDS=	camlp5r:${PORTSDIR}/devel/ocaml-camlp5
+
+USE_GMAKE=	yes
 USE_OCAML=	yes
 
 ALL_TARGET=	all ledit.opt
@@ -23,9 +26,22 @@ ALL_TARGET=	all ledit.opt
 PLIST_FILES=	bin/ledit
 
 MAN1=		ledit.1
+PORTDOCS=	CHANGES LICENSE README
+
+.include <bsd.port.pre.mk>
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ledit.out ${PREFIX}/bin/ledit
-	${INSTALL_MAN} ${WRKSRC}/ledit.l ${MANPREFIX}/man/man1/ledit.1
+do-configure:
+	${REINPLACE_CMD} -e '/^BINDIR=/s;/usr/local;${PREFIX};' \
+			-e '/^LIBDIR=/s;/usr/local;${PREFIX};' \
+			-e '/^MANDIR=/s;/usr/local;${PREFIX};' \
+			${WRKSRC}/Makefile
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+. for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+. endfor
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Npru ports.orig/sysutils/ledit/distinfo ports/sysutils/ledit/distinfo
--- ports.orig/sysutils/ledit/distinfo	2007-06-25 23:35:12.000000000 +0900
+++ ports/sysutils/ledit/distinfo	2008-03-23 00:03:40.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (ledit-1.11.tar.gz) = a2d38ba641682509c1e964ad699a9dd2
-SHA256 (ledit-1.11.tar.gz) = d5f3775e200f0bfcd2f255866b284572cb431b1befd61eab34112c10369c4d59
-SIZE (ledit-1.11.tar.gz) = 14027
+MD5 (ledit-2.00.tgz) = d5c21dc734e20ce13aa7b995621b1c9a
+SHA256 (ledit-2.00.tgz) = e6432682b8aa17d93c7c3be2316937e3ba48c9b6ca0789c47f864ee34d10a2fc
+SIZE (ledit-2.00.tgz) = 22598
diff -Npru ports.orig/sysutils/ledit/files/patch-pa_local.ml ports/sysutils/ledit/files/patch-pa_local.ml
--- ports.orig/sysutils/ledit/files/patch-pa_local.ml	2007-06-25 23:35:13.000000000 +0900
+++ ports/sysutils/ledit/files/patch-pa_local.ml	1970-01-01 09:00:00.000000000 +0900
@@ -1,15 +0,0 @@
---- pa_local.ml.orig	Mon Jun 25 11:20:33 2007
-+++ pa_local.ml	Mon Jun 25 11:21:06 2007
-@@ -14,10 +14,10 @@
- open Pcaml;
- 
- value expr_of_patt p =
--  let loc = MLast.loc_of_patt p in
-+  let _loc = MLast.loc_of_patt p in
-   match p with
-   [ <:patt< $lid:x$ >> -> <:expr< $lid:x$ >>
--  | _ -> Stdpp.raise_with_loc loc (Stream.Error "identifier expected") ]
-+  | _ -> Stdpp.raise_with_loc _loc (Stream.Error "identifier expected") ]
- ;
- 
- EXTEND
diff -Npru ports.orig/sysutils/ledit/pkg-descr ports/sysutils/ledit/pkg-descr
--- ports.orig/sysutils/ledit/pkg-descr	2007-06-25 23:35:12.000000000 +0900
+++ ports/sysutils/ledit/pkg-descr	2008-03-23 09:08:58.000000000 +0900
@@ -1,3 +1,5 @@
 Ledit is a line editor, allowing to use control commands like in emacs
 or in shells (bash, tcsh). To be used with interactive commands. It is
-written in Ocaml and Camlp4 and uses the library unix.cma.
+written in Ocaml and Camlp5 and uses the library unix.cma.
+
+WWW: http://cristal.inria.fr/~ddr/ledit/
>Release-Note:
>Audit-Trail:
>Unformatted: