4 files changed, 19 insertions, 21 deletions
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index cdee0980fcf..47f8904dea6 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2006/02/05 23:08:56 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/07/07 18:22:00 adam Exp $
 
-DISTNAME=	joe-3.3
-PKGREVISION=	1
+DISTNAME=	joe-3.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
diff --git a/editors/joe/PLIST b/editors/joe/PLIST
index e60a57919df..d499fbafee9 100644
--- a/editors/joe/PLIST
+++ b/editors/joe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/07/19 08:29:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/07/07 18:22:00 adam Exp $
 bin/jmacs
 bin/joe
 bin/jpico
@@ -6,6 +6,7 @@ bin/jstar
 bin/rjoe
 bin/termidx
 man/man1/joe.1
+man/ru/man1/joe.1
 share/examples/joe/charmaps/klingon
 share/examples/joe/doc/ChangeLog
 share/examples/joe/doc/HACKING
@@ -13,10 +14,14 @@ share/examples/joe/doc/HINTS
 share/examples/joe/doc/LIST
 share/examples/joe/doc/NEWS
 share/examples/joe/doc/README
+share/examples/joe/ftyperc
+share/examples/joe/jicerc.ru
 share/examples/joe/jmacsrc
 share/examples/joe/joerc
 share/examples/joe/jpicorc
 share/examples/joe/jstarrc
+share/examples/joe/lang/de.po
+share/examples/joe/lang/ru.po
 share/examples/joe/rjoerc
 share/examples/joe/syntax/4gl.jsf
 share/examples/joe/syntax/ada.jsf
@@ -29,9 +34,11 @@ share/examples/joe/syntax/csh.jsf
 share/examples/joe/syntax/css.jsf
 share/examples/joe/syntax/diff.jsf
 share/examples/joe/syntax/fortran.jsf
+share/examples/joe/syntax/haskell.jsf
 share/examples/joe/syntax/html.jsf
 share/examples/joe/syntax/java.jsf
 share/examples/joe/syntax/lisp.jsf
+share/examples/joe/syntax/lua.jsf
 share/examples/joe/syntax/mail.jsf
 share/examples/joe/syntax/mason.jsf
 share/examples/joe/syntax/ocaml.jsf
@@ -40,16 +47,21 @@ share/examples/joe/syntax/perl.jsf
 share/examples/joe/syntax/php.jsf
 share/examples/joe/syntax/ps.jsf
 share/examples/joe/syntax/python.jsf
+share/examples/joe/syntax/rexx.jsf
+share/examples/joe/syntax/ruby.jsf
 share/examples/joe/syntax/sed.jsf
 share/examples/joe/syntax/sh.jsf
+share/examples/joe/syntax/skill.jsf
 share/examples/joe/syntax/sml.jsf
 share/examples/joe/syntax/sql.jsf
 share/examples/joe/syntax/tcl.jsf
 share/examples/joe/syntax/tex.jsf
+share/examples/joe/syntax/troff.jsf
 share/examples/joe/syntax/verilog.jsf
 share/examples/joe/syntax/vhdl.jsf
 share/examples/joe/syntax/xml.jsf
 @dirrm share/examples/joe/syntax
+@dirrm share/examples/joe/lang
 @dirrm share/examples/joe/doc
 @dirrm share/examples/joe/charmaps
 @dirrm share/examples/joe
diff --git a/editors/joe/distinfo b/editors/joe/distinfo
index 45dd1e70681..6bf3a31391f 100644
--- a/editors/joe/distinfo
+++ b/editors/joe/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2005/12/09 15:04:19 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/07/07 18:22:00 adam Exp $
 
-SHA1 (joe-3.3.tar.gz) = f961fe68fa7c11a8d2334b15028661fb46a2d773
-RMD160 (joe-3.3.tar.gz) = f85ff66c0e00cbb85c0063601f3b41459bf2b336
-Size (joe-3.3.tar.gz) = 478218 bytes
-SHA1 (patch-aa) = 4a67d0c4ff03ae5a1e44698dd24a7b8bc2c26ea8
+SHA1 (joe-3.4.tar.gz) = 8c044130b48dce0768880605ee2b5dac102ebbd1
+RMD160 (joe-3.4.tar.gz) = 0849f34ae239be8281a098532ec6b82d85f61607
+Size (joe-3.4.tar.gz) = 590679 bytes
diff --git a/editors/joe/patches/patch-aa b/editors/joe/patches/patch-aa
deleted file mode 100644
index 4374f713390..00000000000
--- a/editors/joe/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2005/12/09 15:04:19 joerg Exp $
-
---- b.c.orig	2005-12-09 14:54:06.000000000 +0000
-+++ b.c
-@@ -47,7 +47,6 @@ static int selinux_enabled = -1;
- 
- unsigned char stdbuf[stdsiz];
- 
--extern int errno;
- int guesscrlf = 0;
- int guessindent = 0;
-