editors/cooledit: Update to 4.1.2

ChangeLog: https://github.com/paulsheer/cooledit/blob/master/NEWS PR: 266918
freebsd · Nov 7, 2022 · 68e1b53 · 68e1b53
1 parent 3133fb1
commit 68e1b53
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 20 deletions.
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
@@ -1,30 +1,39 @@
 PORTNAME=	cooledit
-DISTVERSION=	3.17.28
-PORTREVISION=	4
+DISTVERSION=	4.1.2
 CATEGORIES=	editors
 MASTER_SITES=	SUNSITE/apps/editors/X/cooledit
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	CoolEdit Programmers Code Editor
 WWW=		https://github.com/paulsheer/cooledit
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	BSD2CLAUSE GPLv2
+LICENSE_COMB=	dual
+LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/COPYRIGHT.bsd
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYRIGHT.gpl
 
-USES=		gettext-runtime libtool:build python xorg # gettext is linked to despite .mo files having been deleted
-USE_LDCONFIG=	yes
+LIB_DEPENDS=	libfreetype.so:print/freetype2
+RUN_DEPENDS=	font-misc-misc>0:x11-fonts/font-misc-misc \
+		noto-basic>0:x11-fonts/noto-basic \
+		noto-emoji>0:x11-fonts/noto-emoji \
+		noto-extra>0:x11-fonts/noto-extra
+
+USES=		gettext-runtime libtool:build pkgconfig python xorg
 USE_XORG=	x11 xt
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-LDFLAGS+=	-lpthread
-
-OPTIONS_DEFINE=			NEXT_LOOK
-NEXT_LOOK_DESC=			Enable NeXT look
-NEXT_LOOK_CONFIGURE_ENABLE=	NeXT-look
+OPTIONS_DEFINE=		CJK
+CJK_DESC=		Chinese, Japanese and Korean fonts
+CJK_RUN_DEPENDS=	noto-hk>0:x11-fonts/noto-hk \
+			noto-jp>0:x11-fonts/noto-jp \
+			noto-kr>0:x11-fonts/noto-kr \
+			noto-sc>0:x11-fonts/noto-sc \
+			noto-tc>0:x11-fonts/noto-tc
 
+# Don't install bundled fonts
 post-patch:
-	@${REINPLACE_CMD} -e 's|po pixmap man|po man|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|man notosans|man|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/editors/cooledit/distinfo b/editors/cooledit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527085795
-SHA256 (cooledit-3.17.28.tar.gz) = 4d8b664592737bb1d4b93e509fe185d712318f40fc3c5a36bbc522d87f6b686d
-SIZE (cooledit-3.17.28.tar.gz) = 1265017
+TIMESTAMP = 1667787759
+SHA256 (cooledit-4.1.2.tar.gz) = 9b9fb6283f5f41d520e8f67b3d4daa1e5ae4fa19e29b1e55454588ac314f3910
+SIZE (cooledit-4.1.2.tar.gz) = 117858991
diff --git a/editors/cooledit/files/patch-configure b/editors/cooledit/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2022-10-09 14:17:59 UTC
++++ configure
+@@ -13197,7 +13197,7 @@ else
+     echo "If you don't care about this then delete the exit command below" ;
+     echo "in the configure script" ;
+     echo "" ;
+-    exit 1 ;
++#    exit 1 ;
+ fi
+ TST_MAN_CMD='for i in `man -a -w ls` ; do man -Tutf8 -Z $i | grotty ; echo ; echo --- ; echo ; done' ;
+ THE_MAN_CMD='for i in `man -a -w %m` ; do man -Tutf8 -Z $i | grotty ; echo ; echo --- ; echo ; done' ;
diff --git a/editors/cooledit/pkg-plist b/editors/cooledit/pkg-plist
@@ -2,48 +2,116 @@ bin/cooledit
 bin/cooledit-gdb
 bin/coolman
 bin/coolproject
+bin/remotefs
 bin/smalledit
 lib/libCw.a
-lib/libCw.so
-lib/libCw.so.1
-lib/libCw.so.1.0.0
 man/man1/cooledit.1.gz
-man/man1/coolman.1.gz
-man/man1/smalledit.1.gz
+man/man1/remotefs.1.gz
 %%DATADIR%%/c_utils.py
 %%DATADIR%%/global.py
 %%DATADIR%%/sh_utils.py
+%%DATADIR%%/syntax/PKGBUILD.syntax
 %%DATADIR%%/syntax/ada95.syntax
+%%DATADIR%%/syntax/as.syntax
+%%DATADIR%%/syntax/aspx.syntax
+%%DATADIR%%/syntax/assembler.syntax
+%%DATADIR%%/syntax/awk.syntax
 %%DATADIR%%/syntax/bapc.syntax
 %%DATADIR%%/syntax/c.syntax
+%%DATADIR%%/syntax/cabal.syntax
 %%DATADIR%%/syntax/changelog.syntax
+%%DATADIR%%/syntax/cmake.syntax
+%%DATADIR%%/syntax/cobol.syntax
+%%DATADIR%%/syntax/cs.syntax
 %%DATADIR%%/syntax/css.syntax
+%%DATADIR%%/syntax/cuda.syntax
+%%DATADIR%%/syntax/cxx.syntax
+%%DATADIR%%/syntax/cython.syntax
+%%DATADIR%%/syntax/d.syntax
+%%DATADIR%%/syntax/debian-changelog.syntax
+%%DATADIR%%/syntax/debian-control.syntax
+%%DATADIR%%/syntax/debian-description.syntax
+%%DATADIR%%/syntax/debian-sources-list.syntax
 %%DATADIR%%/syntax/diff.syntax
+%%DATADIR%%/syntax/dlink.syntax
+%%DATADIR%%/syntax/dos.syntax
+%%DATADIR%%/syntax/dot.syntax
+%%DATADIR%%/syntax/ebuild.syntax
+%%DATADIR%%/syntax/eiffel.syntax
+%%DATADIR%%/syntax/erlang.syntax
+%%DATADIR%%/syntax/f90.syntax
+%%DATADIR%%/syntax/filehighlight.syntax
 %%DATADIR%%/syntax/fortran.syntax
+%%DATADIR%%/syntax/glsl.syntax
+%%DATADIR%%/syntax/go.syntax
+%%DATADIR%%/syntax/haskell.syntax
+%%DATADIR%%/syntax/hive.syntax
 %%DATADIR%%/syntax/html.syntax
+%%DATADIR%%/syntax/idl.syntax
+%%DATADIR%%/syntax/ini.syntax
+%%DATADIR%%/syntax/j.syntax
+%%DATADIR%%/syntax/jal.syntax
 %%DATADIR%%/syntax/jasm.syntax
 %%DATADIR%%/syntax/java.syntax
 %%DATADIR%%/syntax/js.syntax
+%%DATADIR%%/syntax/json.syntax
+%%DATADIR%%/syntax/kotlin.syntax
 %%DATADIR%%/syntax/latex.syntax
+%%DATADIR%%/syntax/lisp.syntax
+%%DATADIR%%/syntax/lkr.syntax
 %%DATADIR%%/syntax/lsm.syntax
 %%DATADIR%%/syntax/lsm4.syntax
 %%DATADIR%%/syntax/lua.syntax
+%%DATADIR%%/syntax/m4.syntax
 %%DATADIR%%/syntax/mail.syntax
 %%DATADIR%%/syntax/makefile.syntax
+%%DATADIR%%/syntax/markdown.syntax
+%%DATADIR%%/syntax/meson.syntax
 %%DATADIR%%/syntax/mhtml.syntax
 %%DATADIR%%/syntax/ml.syntax
 %%DATADIR%%/syntax/mudela.syntax
+%%DATADIR%%/syntax/named.syntax
+%%DATADIR%%/syntax/nemerle.syntax
 %%DATADIR%%/syntax/nroff.syntax
+%%DATADIR%%/syntax/octave.syntax
+%%DATADIR%%/syntax/opencl.syntax
+%%DATADIR%%/syntax/osl.syntax
 %%DATADIR%%/syntax/pascal.syntax
 %%DATADIR%%/syntax/perl.syntax
 %%DATADIR%%/syntax/php.syntax
+%%DATADIR%%/syntax/php3.syntax
+%%DATADIR%%/syntax/po.syntax
+%%DATADIR%%/syntax/povray.syntax
+%%DATADIR%%/syntax/privoxy.syntax
+%%DATADIR%%/syntax/procmail.syntax
 %%DATADIR%%/syntax/prolog.syntax
+%%DATADIR%%/syntax/properties.syntax
+%%DATADIR%%/syntax/protobuf.syntax
+%%DATADIR%%/syntax/puppet.syntax
 %%DATADIR%%/syntax/python.syntax
+%%DATADIR%%/syntax/r.syntax
+%%DATADIR%%/syntax/ruby.syntax
+%%DATADIR%%/syntax/rust.syntax
 %%DATADIR%%/syntax/scm.syntax
 %%DATADIR%%/syntax/sh.syntax
+%%DATADIR%%/syntax/slang.syntax
 %%DATADIR%%/syntax/smalltalk.syntax
+%%DATADIR%%/syntax/spec.syntax
+%%DATADIR%%/syntax/spice.syntax
 %%DATADIR%%/syntax/sql.syntax
+%%DATADIR%%/syntax/strace.syntax
+%%DATADIR%%/syntax/swift.syntax
 %%DATADIR%%/syntax/swig.syntax
+%%DATADIR%%/syntax/syntax.syntax
+%%DATADIR%%/syntax/tcl.syntax
 %%DATADIR%%/syntax/texinfo.syntax
+%%DATADIR%%/syntax/ts.syntax
+%%DATADIR%%/syntax/tt.syntax
 %%DATADIR%%/syntax/unknown.syntax
+%%DATADIR%%/syntax/verilog.syntax
+%%DATADIR%%/syntax/vhdl.syntax
 %%DATADIR%%/syntax/xml.syntax
+%%DATADIR%%/syntax/yabasic.syntax
+%%DATADIR%%/syntax/yaml.syntax
+%%DATADIR%%/syntax/yum-repo.syntax
+%%DATADIR%%/syntax/yxx.syntax