[Midnightbsd-cvs] mports [24669] trunk/editors/joe: update joe to 4.6

[laffer1 at midnightbsd.org]

Revision: 24669
          http://svnweb.midnightbsd.org/mports/?rev=24669
Author:   laffer1
Date:     2018-11-22 11:26:56 -0500 (Thu, 22 Nov 2018)
Log Message:
-----------
update joe to 4.6

Modified Paths:
--------------
    trunk/editors/joe/Makefile
    trunk/editors/joe/distinfo
    trunk/editors/joe/pkg-descr
    trunk/editors/joe/pkg-plist

Modified: trunk/editors/joe/Makefile
===================================================================
--- trunk/editors/joe/Makefile	2018-11-22 15:50:45 UTC (rev 24668)
+++ trunk/editors/joe/Makefile	2018-11-22 16:26:56 UTC (rev 24669)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	joe
-PORTVERSION=	4.1
+PORTVERSION=	4.6
 CATEGORIES=	editors
 MASTER_SITES=	SF/joe-editor/JOE%20sources/joe-${PORTVERSION}
 
@@ -9,30 +9,27 @@
 COMMENT=	Joe's Own Editor
 
 LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+CONFLICTS=	joe-2.*
 
-OPTIONS_DEFINE=	DOCS
-
-CONFLICTS=	joe-2.* jupp-[0-9]*
-
-USES=		gmake iconv ncurses
+USES=		gmake iconv localbase ncurses
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
+CONFIGURE_ENV=	SPELL=aspell
+LIBS+=		${ICONV_LIB}
 
 ALL_TARGET=	${PORTNAME}
 
+OPTIONS_DEFINE=	ASPELL DOCS
+
+ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
+
 post-patch:
 	${REINPLACE_CMD} -e 's|docs/README.old docs/man.md ||' ${WRKSRC}/Makefile.in
 
 post-install:
-	@${CAT} ${FILESDIR}/ftyperc.mbsd >> ${PREFIX}/etc/${PORTNAME}/ftyperc
-.for file in jmacsrc jpicorc jstarrc rjoerc joerc
-.if !exists(${PREFIX}/etc/${PORTNAME}/${file}.sample)
-	@${CP} ${PREFIX}/etc/${PORTNAME}/${file} ${PREFIX}/etc/${PORTNAME}/${file}.sample
-.endif
+.for rc in ftyperc jmacsrc joerc jpicorc jstarrc rjoerc
+	${MV} ${STAGEDIR}${ETCDIR}/${rc} ${STAGEDIR}${ETCDIR}/${rc}.sample
 .endfor
 
 .include <bsd.port.mk>

Modified: trunk/editors/joe/distinfo
===================================================================
--- trunk/editors/joe/distinfo	2018-11-22 15:50:45 UTC (rev 24668)
+++ trunk/editors/joe/distinfo	2018-11-22 16:26:56 UTC (rev 24669)
@@ -1,2 +1,3 @@
-SHA256 (joe-4.1.tar.gz) = 816211b2bd951f792de3602afd74ea4b51612fffdd9bc24a7808660053fef6db
-SIZE (joe-4.1.tar.gz) = 1292957
+TIMESTAMP = 1530973556
+SHA256 (joe-4.6.tar.gz) = 495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de
+SIZE (joe-4.6.tar.gz) = 1895046

Modified: trunk/editors/joe/pkg-descr
===================================================================
--- trunk/editors/joe/pkg-descr	2018-11-22 15:50:45 UTC (rev 24668)
+++ trunk/editors/joe/pkg-descr	2018-11-22 16:26:56 UTC (rev 24669)
@@ -10,4 +10,4 @@
 
 JOE now has UTF-8 support and Syntax Highlighting.
 
-WWW: http://sourceforge.net/projects/joe-editor/
+WWW: https://sourceforge.net/projects/joe-editor/

Modified: trunk/editors/joe/pkg-plist
===================================================================
--- trunk/editors/joe/pkg-plist	2018-11-22 15:50:45 UTC (rev 24668)
+++ trunk/editors/joe/pkg-plist	2018-11-22 16:26:56 UTC (rev 24669)
@@ -3,26 +3,41 @@
 bin/jpico
 bin/jstar
 bin/rjoe
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/hacking.md
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%ETCDIR%%/ftyperc
+ at sample %%ETCDIR%%/ftyperc.sample
 %%ETCDIR%%/jicerc.ru
 @sample %%ETCDIR%%/jmacsrc.sample
 @sample %%ETCDIR%%/joerc.sample
+%%ETCDIR%%/joerc.zh_TW
 @sample %%ETCDIR%%/jpicorc.sample
 @sample %%ETCDIR%%/jstarrc.sample
 @sample %%ETCDIR%%/rjoerc.sample
 %%ETCDIR%%/shell.csh
 %%ETCDIR%%/shell.sh
-%%ETCDIR%%/joerc.zh_TW
+man/man1/joe.1.gz
+man/ru/man1/joe.1.gz
+share/applications/jmacs.desktop
+share/applications/joe.desktop
+share/applications/jpico.desktop
+share/applications/jstar.desktop
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/hacking.md
 %%DATADIR%%/charmaps/klingon
+%%DATADIR%%/colors/default.jcf
+%%DATADIR%%/colors/gruvbox.jcf
+%%DATADIR%%/colors/ir_black.jcf
+%%DATADIR%%/colors/molokai.jcf
+%%DATADIR%%/colors/solarized.jcf
+%%DATADIR%%/colors/wombat.jcf
+%%DATADIR%%/colors/xoria.jcf
+%%DATADIR%%/colors/zenburn-hc.jcf
+%%DATADIR%%/colors/zenburn.jcf
 %%DATADIR%%/lang/de.po
 %%DATADIR%%/lang/fr.po
 %%DATADIR%%/lang/ru.po
 %%DATADIR%%/lang/uk.po
-%%DATADIR%%/lang/zh.po
+%%DATADIR%%/lang/zh_TW.po
 %%DATADIR%%/syntax/4gl.jsf
 %%DATADIR%%/syntax/ada.jsf
 %%DATADIR%%/syntax/ant.jsf
@@ -36,6 +51,7 @@
 %%DATADIR%%/syntax/coffee.jsf
 %%DATADIR%%/syntax/comment_todo.jsf
 %%DATADIR%%/syntax/conf.jsf
+%%DATADIR%%/syntax/context.jsf
 %%DATADIR%%/syntax/csh.jsf
 %%DATADIR%%/syntax/csharp.jsf
 %%DATADIR%%/syntax/css.jsf
@@ -42,6 +58,7 @@
 %%DATADIR%%/syntax/d.jsf
 %%DATADIR%%/syntax/debian.jsf
 %%DATADIR%%/syntax/diff.jsf
+%%DATADIR%%/syntax/dockerfile.jsf
 %%DATADIR%%/syntax/elixir.jsf
 %%DATADIR%%/syntax/erb.jsf
 %%DATADIR%%/syntax/erlang.jsf
@@ -57,6 +74,7 @@
 %%DATADIR%%/syntax/ini.jsf
 %%DATADIR%%/syntax/iptables.jsf
 %%DATADIR%%/syntax/java.jsf
+%%DATADIR%%/syntax/jcf.jsf
 %%DATADIR%%/syntax/joerc.jsf
 %%DATADIR%%/syntax/js.jsf
 %%DATADIR%%/syntax/jsf.jsf
@@ -101,5 +119,3 @@
 %%DATADIR%%/syntax/whitespace.jsf
 %%DATADIR%%/syntax/xml.jsf
 %%DATADIR%%/syntax/yaml.jsf
-man/man1/joe.1.gz
-man/ru/man1/joe.1.gz