6 files changed, 78 insertions, 37 deletions

diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index 59da314df948..a6702c25cf2a 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -6,49 +6,38 @@
 #
 
 PORTNAME=	joe
-PORTVERSION=	3.1
+PORTVERSION=	3.2
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	joe-editor
+MASTER_SITE_SUBDIR=	${PORTNAME}-editor
 PKGNAMESUFFIX=	-devel
-DISTNAME=	joe-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	petef@FreeBSD.org
-COMMENT=	Development version of Joe's own editor
+COMMENT=	Development version of Joe's Own Editor
 
 CONFLICTS=	joe-2.*
 LATEST_LINK=	joe-devel
 
+RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
+
+USE_GMAKE=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
 
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_REINPLACE=	yes
-
-ALL_TARGET=	joe
-MAN1=		joe.1
+ALL_TARGET=	${PORTNAME}
+MAN1=		${PORTNAME}.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-post-patch:
-	@${REINPLACE_CMD} -e 's/towupper/__toupper/g' ${WRKSRC}/regex.c
-	@${REINPLACE_CMD} -e 's/iswalnum(c)/__istype(c, _CTYPE_A|_CTYPE_D)/' ${WRKSRC}/utils.c
-.endif
-
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/INFO ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LIST ${DOCSDIR}/CommandList
-.endif
 .for file in jmacsrc jpicorc jstarrc rjoerc joerc
-.if !exists(${PREFIX}/etc/joe/${file})
-	@${CP} ${PREFIX}/etc/joe/${file} ${PREFIX}/etc/joe/${file}.dist
+.if !exists(${PREFIX}/etc/${PORTNAME}/${file})
+	@${CP} ${PREFIX}/etc/${PORTNAME}/${file} ${PREFIX}/etc/${PORTNAME}/${file}.dist
 .endif
 .endfor
 
diff --git a/editors/joe-devel/distinfo b/editors/joe-devel/distinfo
index 7c4b02feebb8..efaad3ef3643 100644
--- a/editors/joe-devel/distinfo
+++ b/editors/joe-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (joe-3.1.tar.gz) = 2a6ef018870fca9b7df85401994fb0e0
-SIZE (joe-3.1.tar.gz) = 381201
+MD5 (joe-3.2.tar.gz) = 07e8077ee4562256bb6a2bf03e3071c2
+SIZE (joe-3.2.tar.gz) = 431843
diff --git a/editors/joe-devel/files/patch-syntax-diff.jsf.in b/editors/joe-devel/files/patch-syntax-diff.jsf.in
new file mode 100644
index 000000000000..8457da04f7fa
--- /dev/null
+++ b/editors/joe-devel/files/patch-syntax-diff.jsf.in
@@ -0,0 +1,42 @@
+--- syntax/diff.jsf.in.orig	Fri May  6 18:14:53 2005
++++ syntax/diff.jsf.in	Fri May  6 18:19:28 2005
+@@ -6,6 +6,7 @@
+ 
+ # Color definitions
+ =Idle
++=Options	blue
+ =FileNew	bold green
+ =FileOld	bold red
+ =DiffStuff	magenta
+@@ -15,6 +16,7 @@
+ 
+ :reset Idle
+ 	*		goo
++	"d"		goo
+ 	"-"		preudiff	buffer
+ 	"*"		precdiff	buffer
+ 	"0-9"		ndiff		recolor=-1
+@@ -33,8 +35,14 @@
+ done
+ 	"*"		precdiff
+ 
++:options Options
++	*		options
++	"\n"		reset
++
+ :goo Idle
+-	*		goo
++	*		goo		strings
++	"diff"		options		recolor=-4
++done
+ 	"\n"		reset
+ 
+ :udiff Idle
+@@ -58,6 +66,7 @@
+ 
+ :udiffhunk Idle
+ 	*		reset
++	"d"		goo		buffer
+ 	"-"		udiffoldordel	recolor=-1
+ 	"+"		udiffadd	recolor=-1
+ 	" "		udiffctx	recolor=-1
diff --git a/editors/joe-devel/files/patch-tty.c b/editors/joe-devel/files/patch-tty.c
index c472e795be31..e6023dd2f4fb 100644
--- a/editors/joe-devel/files/patch-tty.c
+++ b/editors/joe-devel/files/patch-tty.c
@@ -1,7 +1,7 @@
---- tty.c.orig	Fri Dec  7 19:19:54 2001
-+++ tty.c	Fri Dec  7 19:20:13 2001
-@@ -1006,8 +1006,10 @@
- 
+--- tty.c.orig	Fri Mar 18 10:40:11 2005
++++ tty.c	Fri May  6 16:58:38 2005
+@@ -1074,8 +1074,10 @@
+ 			setsid();	/* I think you do setprgp(0,0) on systems with no setsid() */
  #ifndef SETPGRP_VOID
  			setpgrp(0, 0);
 +/*
@@ -10,4 +10,4 @@
 +*/
  #endif
  
- 			for (x = 0; x != 32; ++x)
+ #endif
diff --git a/editors/joe-devel/pkg-descr b/editors/joe-devel/pkg-descr
index 53ed0cdb6cac..af48f6854df1 100644
--- a/editors/joe-devel/pkg-descr
+++ b/editors/joe-devel/pkg-descr
@@ -9,6 +9,8 @@ termcap/terminfo, excellent screen update optimizations (JOE is
 fully usable at 2400 baud), simple installation, and all of the
 UNIX-integration features of VI.
 
+JOE(-devel) now has UTF-8 support and Syntax Highlighting.
+
 WWW: http://sourceforge.net/projects/joe-editor/
 
 -Pete
diff --git a/editors/joe-devel/pkg-plist b/editors/joe-devel/pkg-plist
index 9daa661d8ca1..a92a7541db9a 100644
--- a/editors/joe-devel/pkg-plist
+++ b/editors/joe-devel/pkg-plist
@@ -20,10 +20,12 @@ etc/joe/jstarrc.dist
 @unexec if cmp -s %D/etc/joe/rjoerc.dist %D/etc/joe/rjoerc; then rm -f %D/etc/joe/rjoerc; fi
 etc/joe/rjoerc.dist
 @exec if [ ! -f %D/etc/joe/rjoerc ]; then cp %D/etc/joe/%f %D/etc/joe/rjoerc; fi
+etc/joe/syntax/4gl.jsf
 etc/joe/syntax/asm.jsf
 etc/joe/syntax/c.jsf
 etc/joe/syntax/conf.jsf
 etc/joe/syntax/csh.jsf
+etc/joe/syntax/css.jsf
 etc/joe/syntax/diff.jsf
 etc/joe/syntax/fortran.jsf
 etc/joe/syntax/html.jsf
@@ -31,19 +33,25 @@ etc/joe/syntax/java.jsf
 etc/joe/syntax/lisp.jsf
 etc/joe/syntax/mail.jsf
 etc/joe/syntax/mason.jsf
+etc/joe/syntax/ocaml.jsf
 etc/joe/syntax/pascal.jsf
 etc/joe/syntax/perl.jsf
 etc/joe/syntax/php.jsf
 etc/joe/syntax/python.jsf
 etc/joe/syntax/sh.jsf
+etc/joe/syntax/sml.jsf
 etc/joe/syntax/tcl.jsf
+etc/joe/syntax/tex.jsf
 etc/joe/syntax/verilog.jsf
 etc/joe/syntax/vhdl.jsf
 etc/joe/syntax/xml.jsf
-%%PORTDOCS%%%%DOCSDIR%%/CommandList
-%%PORTDOCS%%%%DOCSDIR%%/INFO
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/joe/charmaps
-@dirrm etc/joe/syntax
-@dirrm etc/joe
+etc/joe/doc/ChangeLog
+etc/joe/doc/LIST
+etc/joe/doc/HACKING
+etc/joe/doc/HINTS
+etc/joe/doc/NEWS
+etc/joe/doc/README
+@unexec rmdir %D/etc/joe/doc 2>/dev/null || true
+@unexec rmdir %D/etc/joe/charmaps 2>/dev/null || true
+@unexec rmdir %D/etc/joe/syntax 2>/dev/null || true
+@unexec rmdir %D/etc/joe 2>/dev/null || true