- Remove unnecessary port

- Add MOVED entry to point editors/joe2 users to editors/joe

PR:		230582
Submitted by:	kevin@your.org
Approved by:	maintainer

8 files changed, 1 insertions, 94 deletions

diff --git a/MOVED b/MOVED
index 68001f9222c0..ad6ba6fb24ac 100644
--- a/MOVED
+++ b/MOVED
@@ -10426,3 +10426,4 @@ lang/clang38|devel/llvm38|2018-08-08|METAPORT removed
 science/py-tensorflow||2018-08-08|Has expired: build broken
 devel/bazel-clang38|devel/bazel|2018-08-08|Slave port depends on obsolete LLVM version
 security/libbeid|security/beid|2018-08-12|No longer just a library
+editors/joe2|editors/joe|2018-08-12|Patches from editors/joe2 have been integrated into editors/joe
diff --git a/editors/Makefile b/editors/Makefile
index d6dc49a57015..4e19d69bb81e 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -66,7 +66,6 @@
     SUBDIR += jed
     SUBDIR += jedit
     SUBDIR += joe
-    SUBDIR += joe2
     SUBDIR += jove
     SUBDIR += jucipp
     SUBDIR += jupp
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
deleted file mode 100644
index 861340ce8a1a..000000000000
--- a/editors/joe2/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: torstenb@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	joe
-PORTVERSION=	2.9.8
-PORTREVISION=	1
-CATEGORIES+=	editors
-MASTER_SITES=	SF/joe-editor/JOE%20sources/joe-${PORTVERSION}
-PKGNAMESUFFIX=	2
-
-MAINTAINER?=	toasty@dragondata.com
-COMMENT?=	Joe's Own Editor
-
-OPTIONS_DEFINE=	DOCS ISPELL
-OPTIONS_DEFAULT=	ISPELL
-
-ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
-
-CONFLICTS=	joe-3*
-
-GNU_CONFIGURE=	yes
-USES=		iconv gmake
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
-
-ALL_TARGET=	${PORTNAME}
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.cvs ${WRKSRC}/ChangeLog\
-		 ${WRKSRC}/INFO ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LIST ${STAGEDIR}${DOCSDIR}/CommandList
-
-.include <bsd.port.mk>
diff --git a/editors/joe2/distinfo b/editors/joe2/distinfo
deleted file mode 100644
index 8bbe1931a63e..000000000000
--- a/editors/joe2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (joe-2.9.8.tar.gz) = af1093a21f54d3c63278af7ac4b2479cc78afbf75dec6862eda6c19eb8b198a1
-SIZE (joe-2.9.8.tar.gz) = 283596
diff --git a/editors/joe2/files/patch-configure b/editors/joe2/files/patch-configure
deleted file mode 100644
index 127fc1e52665..000000000000
--- a/editors/joe2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri May  6 18:53:19 2005
-+++ configure	Fri May  6 18:53:19 2005
-@@ -340,7 +340,7 @@
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
- datadir='${prefix}/share'
--sysconfdir='${prefix}/etc'
-+sysconfdir='${prefix}/etc/joe'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
- libdir='${exec_prefix}/lib'
diff --git a/editors/joe2/files/patch-tty.c b/editors/joe2/files/patch-tty.c
deleted file mode 100644
index 0291edb3fed0..000000000000
--- a/editors/joe2/files/patch-tty.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- tty.c.orig	Fri May  6 17:26:17 2005
-+++ tty.c	Fri May  6 17:28:19 2005
-@@ -934,9 +934,11 @@
- #endif
- 
- #ifndef SETPGRP_VOID
--			setpgrp(0, 0);
--#else
--			setpgrp();
-+			setpgrp(0, getpid());
-+/*
-+ * #else
-+ * setpgrp();
-+ */
- #endif
- 
- 			for (x = 0; x != 32; ++x)
diff --git a/editors/joe2/pkg-descr b/editors/joe2/pkg-descr
deleted file mode 100644
index 8f2b706bfc33..000000000000
--- a/editors/joe2/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-JOE is the professional freeware ASCII text screen editor for UNIX.
-It makes full use of the power and versatility of UNIX, but lacks the steep
-learning curve and basic nonsense you have to deal with in every other UNIX
-editor. JOE has the feel of most IBM PC text editors: The key-sequences are
-reminiscent of WordStar and Turbo-C.  JOE is much more powerful than those
-editors, however.  JOE has all of the features a UNIX user should expect:
-full use of termcap/terminfo, excellent screen update optimizations (JOE is
-fully useable at 2400 baud), simple installation, and all of the
-UNIX-integration features of VI.
-
-WWW: https://sourceforge.net/projects/joe-editor/
diff --git a/editors/joe2/pkg-plist b/editors/joe2/pkg-plist
deleted file mode 100644
index 833d35374c01..000000000000
--- a/editors/joe2/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/joe
-bin/jmacs
-bin/jstar
-bin/rjoe
-bin/jpico
-bin/termidx
-etc/joe/joerc
-etc/joe/jmacsrc
-etc/joe/jstarrc
-etc/joe/rjoerc
-etc/joe/jpicorc
-man/man1/joe.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/CommandList
-%%PORTDOCS%%%%DOCSDIR%%/INFO
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.cvs