3 files changed, 83 insertions, 77 deletions

diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 2dffa8b6dbfa..51516b53409e 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	joe
-PORTVERSION=	3.5
-PORTREVISION=	1
+PORTVERSION=	3.7
 PORTEPOCH=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}-editor
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER?=	toasty@dragondata.com
+MAINTAINER?=	chinsan@FreeBSD.org
 COMMENT=	Joe's Own Editor
 
 BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
diff --git a/editors/joe/distinfo b/editors/joe/distinfo
index b51cbd52cbff..02981b094c2f 100644
--- a/editors/joe/distinfo
+++ b/editors/joe/distinfo
@@ -1,3 +1,3 @@
-MD5 (joe-3.5.tar.gz) = 9bdffecce7ef910feaa06452d48843de
-SHA256 (joe-3.5.tar.gz) = a295f1c5e0cb0f0ae0446c419a248517cb04ae1881f982964a7a7595cde9f2e6
-SIZE (joe-3.5.tar.gz) = 613815
+MD5 (joe-3.7.tar.gz) = 66de1b073e869ba12abbfcde3885c577
+SHA256 (joe-3.7.tar.gz) = cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f
+SIZE (joe-3.7.tar.gz) = 696036
diff --git a/editors/joe/pkg-plist b/editors/joe/pkg-plist
index f37a6c52c969..378b815be363 100644
--- a/editors/joe/pkg-plist
+++ b/editors/joe/pkg-plist
@@ -4,76 +4,83 @@ bin/jpico
 bin/jstar
 bin/rjoe
 bin/termidx
-etc/joe/charmaps/klingon
-etc/joe/doc/ChangeLog
-etc/joe/doc/HACKING
-etc/joe/doc/HINTS
-etc/joe/doc/LIST
-etc/joe/doc/NEWS
-etc/joe/doc/README
-etc/joe/ftyperc
-etc/joe/jicerc.ru
-@unexec if cmp -s %D/etc/joe/jmacsrc.dist %D/etc/joe/jmacsrc; then rm -f %D/etc/joe/jmacsrc; fi
-etc/joe/jmacsrc.dist
-@exec if [ ! -f %D/etc/joe/jmacsrc ]; then cp %D/etc/joe/%f %D/etc/joe/jmacsrc; fi
-@unexec if cmp -s %D/etc/joe/joerc.dist %D/etc/joe/joerc; then rm -f %D/etc/joe/joerc; fi
-etc/joe/joerc.dist
-@exec if [ ! -f %D/etc/joe/joerc ]; then cp %D/etc/joe/%f %D/etc/joe/joerc; fi
-@unexec if cmp -s %D/etc/joe/jpicorc.dist %D/etc/joe/jpicorc; then rm -f %D/etc/joe/jpicorc; fi
-etc/joe/jpicorc.dist
-@exec if [ ! -f %D/etc/joe/jpicorc ]; then cp %D/etc/joe/%f %D/etc/joe/jpicorc; fi
-@unexec if cmp -s %D/etc/joe/jstarrc.dist %D/etc/joe/jstarrc; then rm -f %D/etc/joe/jstarrc; fi
-etc/joe/jstarrc.dist
-@exec if [ ! -f %D/etc/joe/jstarrc ]; then cp %D/etc/joe/%f %D/etc/joe/jstarrc; fi
-@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/lang/de.po
-etc/joe/lang/fr.po
-etc/joe/lang/ru.po
-etc/joe/syntax/4gl.jsf
-etc/joe/syntax/ada.jsf
-etc/joe/syntax/asm.jsf
-etc/joe/syntax/awk.jsf
-etc/joe/syntax/c.jsf
-etc/joe/syntax/cobol.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/haskell.jsf
-etc/joe/syntax/html.jsf
-etc/joe/syntax/java.jsf
-etc/joe/syntax/joerc.jsf
-etc/joe/syntax/lisp.jsf
-etc/joe/syntax/lua.jsf
-etc/joe/syntax/m4.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/ps.jsf
-etc/joe/syntax/python.jsf
-etc/joe/syntax/rexx.jsf
-etc/joe/syntax/ruby.jsf
-etc/joe/syntax/sed.jsf
-etc/joe/syntax/sh.jsf
-etc/joe/syntax/skill.jsf
-etc/joe/syntax/sml.jsf
-etc/joe/syntax/sql.jsf
-etc/joe/syntax/tcl.jsf
-etc/joe/syntax/tex.jsf
-etc/joe/syntax/troff.jsf
-etc/joe/syntax/verilog.jsf
-etc/joe/syntax/vhdl.jsf
-etc/joe/syntax/xml.jsf
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/HINTS
+%%PORTDOCS%%%%DOCSDIR%%/LIST
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%ETCDIR%%/ftyperc
+%%ETCDIR%%/jicerc.ru
+@unexec if cmp -s %D/%%ETCDIR%%/jmacsrc.dist %D/%%ETCDIR%%/jmacsrc; then rm -f %D/%%ETCDIR%%/jmacsrc; fi
+%%ETCDIR%%/jmacsrc.dist
+@exec if [ ! -f %D/%%ETCDIR%%/jmacsrc ]; then cp %D/%%ETCDIR%%/%f %D/%%ETCDIR%%/jmacsrc; fi
+@unexec if cmp -s %D/%%ETCDIR%%/joerc.dist %D/%%ETCDIR%%/joerc; then rm -f %D/%%ETCDIR%%/joerc; fi
+%%ETCDIR%%/joerc.dist
+@exec if [ ! -f %D/%%ETCDIR%%/joerc ]; then cp %D/%%ETCDIR%%/%f %D/%%ETCDIR%%/joerc; fi
+@unexec if cmp -s %D/%%ETCDIR%%/jpicorc.dist %D/%%ETCDIR%%/jpicorc; then rm -f %D/%%ETCDIR%%/jpicorc; fi
+%%ETCDIR%%/jpicorc.dist
+@exec if [ ! -f %D/%%ETCDIR%%/jpicorc ]; then cp %D/%%ETCDIR%%/%f %D/%%ETCDIR%%/jpicorc; fi
+@unexec if cmp -s %D/%%ETCDIR%%/jstarrc.dist %D/%%ETCDIR%%/jstarrc; then rm -f %D/%%ETCDIR%%/jstarrc; fi
+%%ETCDIR%%/jstarrc.dist
+@exec if [ ! -f %D/%%ETCDIR%%/jstarrc ]; then cp %D/%%ETCDIR%%/%f %D/%%ETCDIR%%/jstarrc; fi
+@unexec if cmp -s %D/%%ETCDIR%%/rjoerc.dist %D/%%ETCDIR%%/rjoerc; then rm -f %D/%%ETCDIR%%/rjoerc; fi
+%%ETCDIR%%/rjoerc.dist
+@exec if [ ! -f %D/%%ETCDIR%%/rjoerc ]; then cp %D/%%ETCDIR%%/%f %D/%%ETCDIR%%/rjoerc; fi
+@dirrmtry %%ETCDIR%%
+%%DATADIR%%/charmaps/klingon
+%%DATADIR%%/lang/de.po
+%%DATADIR%%/lang/fr.po
+%%DATADIR%%/lang/ru.po
+%%DATADIR%%/lang/uk.po
+%%DATADIR%%/syntax/4gl.jsf
+%%DATADIR%%/syntax/ada.jsf
+%%DATADIR%%/syntax/asm.jsf
+%%DATADIR%%/syntax/awk.jsf
+%%DATADIR%%/syntax/c.jsf
+%%DATADIR%%/syntax/cobol.jsf
+%%DATADIR%%/syntax/conf.jsf
+%%DATADIR%%/syntax/csh.jsf
+%%DATADIR%%/syntax/css.jsf
+%%DATADIR%%/syntax/diff.jsf
+%%DATADIR%%/syntax/fortran.jsf
+%%DATADIR%%/syntax/haskell.jsf
+%%DATADIR%%/syntax/html.jsf
+%%DATADIR%%/syntax/java.jsf
+%%DATADIR%%/syntax/joerc.jsf
+%%DATADIR%%/syntax/jsf.jsf
+%%DATADIR%%/syntax/jsf_check.jsf
+%%DATADIR%%/syntax/lisp.jsf
+%%DATADIR%%/syntax/lua.jsf
+%%DATADIR%%/syntax/m4.jsf
+%%DATADIR%%/syntax/mail.jsf
+%%DATADIR%%/syntax/mason.jsf
+%%DATADIR%%/syntax/matlab.jsf
+%%DATADIR%%/syntax/ocaml.jsf
+%%DATADIR%%/syntax/pascal.jsf
+%%DATADIR%%/syntax/perl.jsf
+%%DATADIR%%/syntax/php.jsf
+%%DATADIR%%/syntax/ps.jsf
+%%DATADIR%%/syntax/python.jsf
+%%DATADIR%%/syntax/rexx.jsf
+%%DATADIR%%/syntax/ruby.jsf
+%%DATADIR%%/syntax/sed.jsf
+%%DATADIR%%/syntax/sh.jsf
+%%DATADIR%%/syntax/skill.jsf
+%%DATADIR%%/syntax/sml.jsf
+%%DATADIR%%/syntax/spec.jsf
+%%DATADIR%%/syntax/sql.jsf
+%%DATADIR%%/syntax/tcl.jsf
+%%DATADIR%%/syntax/tex.jsf
+%%DATADIR%%/syntax/troff.jsf
+%%DATADIR%%/syntax/verilog.jsf
+%%DATADIR%%/syntax/vhdl.jsf
+%%DATADIR%%/syntax/xml.jsf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry man/ru/man1
 @dirrmtry man/ru
-@dirrmtry etc/joe/charmaps
-@dirrmtry etc/joe/doc
-@dirrmtry etc/joe/lang
-@dirrmtry etc/joe/syntax
-@dirrmtry etc/joe
+@dirrmtry %%DATADIR%%/charmaps
+@dirrmtry %%DATADIR%%/doc
+@dirrmtry %%DATADIR%%/lang
+@dirrmtry %%DATADIR%%/syntax
+@dirrmtry %%DATADIR%%