Update to 0.99.18

4 files changed, 43 insertions, 20 deletions

diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index e7153930d2d3..9fcd49304b59 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jed
-PORTVERSION=	0.99.16
-PORTREVISION=	1
+PORTVERSION=	0.99.18
 CATEGORIES=	editors
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \
 		ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v${PORTVERSION:R}/ \
@@ -18,14 +17,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A SLang-based text editor
 
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
-
 CONFLICTS=	jed-devel-[0-9]*
 
-OPTIONS=	X11 "Build xjed (depends of X11)" on
+OPTIONS=	X11 "Build xjed (depends of X11)" on \
+		SLANG2 "Build using libslang-2.x" off
 
+USE_BZIP2=	yes
 DIST_SUBDIR=	jed
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	JED_ROOT=${PREFIX}/lib/jed
 MAKE_ENV+=	DEST_DOC_DIR=${DOCSDIR}
@@ -43,6 +41,12 @@ MAN1=		jed.1 rgrep.1
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_SLANG2)
+LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
+.else
+LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
+.endif
+
 .if defined(WITHOUT_X11)
 PLIST_SUB+=	XJED="@comment "
 .else
@@ -52,18 +56,9 @@ PLIST_SUB+=	XJED=""
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,0777,07777,g' \
-		${WRKSRC}/src/file.c \
-		${WRKSRC}/src/unix.c
-	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
-		${WRKSRC}/src/jdmacros.h \
-		${WRKSRC}/src/ledit.c
-	@${REINPLACE_CMD} -e 's,__linux__,__FreeBSD__,g' \
-		${WRKSRC}/src/pty.c
 	@${REINPLACE_CMD} -e 's,(DEST_JED_ROOT)/doc,(DEST_DOC_DIR),g' \
 			  -e 's,\.\./info/\*,,' \
 			  -e 's,^\(JED_DOC_.*FILES\) =,\1 \?=,g' \
-			  -e 's,-lslang$$,-lslang -ltermcap,' \
 		${WRKSRC}/src/Makefile.in
 
 post-configure:
diff --git a/editors/jed/distinfo b/editors/jed/distinfo
index 068bbd812aff..49aa930097e2 100644
--- a/editors/jed/distinfo
+++ b/editors/jed/distinfo
@@ -1,3 +1,3 @@
-MD5 (jed/jed-0.99-16.tar.gz) = e50e95d8d626445cb778fadee3a2a47d
-SHA256 (jed/jed-0.99-16.tar.gz) = bc23b9724b5577bbaf76b2796b3931223d916c1bfb3ec4ea8dc7cc65f67f3982
-SIZE (jed/jed-0.99-16.tar.gz) = 845360
+MD5 (jed/jed-0.99-18.tar.bz2) = 5378c8e7805854018d9ec5c3cfadf637
+SHA256 (jed/jed-0.99-18.tar.bz2) = 71c394640cf07286ffc7abe45d91477a64310e2024f81a1d5a79729887d8d43e
+SIZE (jed/jed-0.99-18.tar.bz2) = 762826
diff --git a/editors/jed/files/patch-src_misc.c b/editors/jed/files/patch-src_misc.c
new file mode 100644
index 000000000000..3ae13f40bde9
--- /dev/null
+++ b/editors/jed/files/patch-src_misc.c
@@ -0,0 +1,17 @@
+--- src/misc.c.orig	Mon Apr  3 09:05:53 2006
++++ src/misc.c	Mon Apr  3 09:05:05 2006
+@@ -741,12 +741,14 @@
+ 
+ void jed_ungetkey_wchar (SLwchar_Type wc)
+ {
++#if JED_HAS_UTF8_SUPPORT
+    SLuchar_Type *b, buf[SLUTF8_MAX_MBLEN];
+ 
+    if (NULL == (b = jed_wchar_to_multibyte (wc, buf)))
+      return;
+    
+    ungetkey_string ((char *)buf, (int)(b-buf));
++#endif
+ }
+ 
+ 
diff --git a/editors/jed/pkg-plist b/editors/jed/pkg-plist
index 27a2ce2657fb..75e241f0dde9 100644
--- a/editors/jed/pkg-plist
+++ b/editors/jed/pkg-plist
@@ -1,7 +1,6 @@
 @comment $FreeBSD$
 bin/jed
 bin/jed-script
-bin/rgrep
 %%XJED%%bin/xjed
 lib/jed/bin/getmail
 lib/jed/lib/README
@@ -24,11 +23,15 @@ lib/jed/lib/chglog.sl
 lib/jed/lib/cmisc.sl
 lib/jed/lib/cmode.sl
 lib/jed/lib/colors/README
+lib/jed/lib/colors/Xjed/black4.sl
 lib/jed/lib/colors/Xjed/elegant.sl
+lib/jed/lib/colors/Xjed/modern.sl
+lib/jed/lib/colors/Xjed/night.sl
 lib/jed/lib/colors/Xjed/pastel0.sl
 lib/jed/lib/colors/black1.sl
 lib/jed/lib/colors/black2.sl
 lib/jed/lib/colors/black3.sl
+lib/jed/lib/colors/black4.sl
 lib/jed/lib/colors/blue1.sl
 lib/jed/lib/colors/blue2.sl
 lib/jed/lib/colors/blue3.sl
@@ -40,7 +43,9 @@ lib/jed/lib/compile.sl
 lib/jed/lib/compress.sl
 lib/jed/lib/cpright.hlp
 lib/jed/lib/ctags.sl
+lib/jed/lib/cua.hlp
 lib/jed/lib/cua.sl
+lib/jed/lib/cuamisc.sl
 lib/jed/lib/dabbrev.sl
 lib/jed/lib/dcl.sl
 lib/jed/lib/digraph.sl
@@ -60,6 +65,7 @@ lib/jed/lib/ff90.sl
 lib/jed/lib/filter.sl
 lib/jed/lib/folding.sl
 lib/jed/lib/fortran.sl
+lib/jed/lib/gpg.sl
 lib/jed/lib/generic.hlp
 lib/jed/lib/help.sl
 lib/jed/lib/history.sl
@@ -91,9 +97,12 @@ lib/jed/lib/linux.sl
 lib/jed/lib/lisp.sl
 lib/jed/lib/ltx-comp.dat
 lib/jed/lib/ltx-math.sl
+lib/jed/lib/lua.sl
 lib/jed/lib/macro.sl
 lib/jed/lib/mail.sl
 lib/jed/lib/mailalias.sl
+lib/jed/lib/mailedit.sl
+lib/jed/lib/mailutils.sl
 lib/jed/lib/man.sl
 lib/jed/lib/maple.sl
 lib/jed/lib/matlab.sl
@@ -113,6 +122,7 @@ lib/jed/lib/mutekeys.sl
 lib/jed/lib/nroff.sl
 lib/jed/lib/occur.sl
 lib/jed/lib/os.sl
+lib/jed/lib/paste.sl
 lib/jed/lib/perl.sl
 lib/jed/lib/php.sl
 lib/jed/lib/pipe.sl
@@ -142,6 +152,7 @@ lib/jed/lib/sort.sl
 lib/jed/lib/sortmisc.sl
 lib/jed/lib/spicemod.sl
 lib/jed/lib/srchmisc.sl
+lib/jed/lib/syncproc.sl
 lib/jed/lib/syntax.sl
 lib/jed/lib/tabs.sl
 lib/jed/lib/tclmode.sl
@@ -163,11 +174,11 @@ lib/jed/lib/wmark.sl
 lib/jed/lib/wmenu.sl
 lib/jed/lib/wordstar.hlp
 lib/jed/lib/wordstar.sl
+lib/jed/lib/xformreg.sl
 lib/jed/lib/yankpop.sl
 @dirrm lib/jed/bin
 @dirrm lib/jed/lib/colors/Xjed
 @dirrm lib/jed/lib/colors
-@dirrm lib/jed/lib/tm
 @dirrm lib/jed/lib
 @dirrm lib/jed/info
 @dirrm lib/jed