aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chinese/joe/Makefile2
-rw-r--r--chinese/joe2/Makefile2
-rw-r--r--editors/Makefile1
-rw-r--r--editors/joe2/Makefile3
4 files changed, 6 insertions, 2 deletions
diff --git a/chinese/joe/Makefile b/chinese/joe/Makefile
index e673db114430..aad6c6bad067 100644
--- a/chinese/joe/Makefile
+++ b/chinese/joe/Makefile
@@ -13,7 +13,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
-MASTERDIR= ${.CURDIR}/../../editors/joe
+MASTERDIR= ${.CURDIR}/../../editors/joe2
MD5_FILE= ${.CURDIR}/distinfo
.include "${MASTERDIR}/Makefile"
diff --git a/chinese/joe2/Makefile b/chinese/joe2/Makefile
index e673db114430..aad6c6bad067 100644
--- a/chinese/joe2/Makefile
+++ b/chinese/joe2/Makefile
@@ -13,7 +13,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
-MASTERDIR= ${.CURDIR}/../../editors/joe
+MASTERDIR= ${.CURDIR}/../../editors/joe2
MD5_FILE= ${.CURDIR}/distinfo
.include "${MASTERDIR}/Makefile"
diff --git a/editors/Makefile b/editors/Makefile
index 3c428d6a2905..e534eaf81a9d 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -86,6 +86,7 @@
SUBDIR += jedit-devel
SUBDIR += jext
SUBDIR += joe
+ SUBDIR += joe2
SUBDIR += joe-devel
SUBDIR += jove
SUBDIR += kate-plugins
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index 459473985296..7f53cf8d7651 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -17,6 +17,9 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER?= toasty@dragondata.com
COMMENT?= Joe's own editor
+LATEST_LINK= joe2
+CONFLICTS= joe-3*
+
WRKSRC= ${WRKDIR}/joe
ALL_TARGET= joe
MAN1= joe.1