From nobody Mon Nov 07 23:58:19 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N5p8X1q8Wz4gm4N; Mon, 7 Nov 2022 23:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N5p8X0G7pz5x8C; Mon, 7 Nov 2022 23:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667865500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kc9cKeV4ks1KP7zKm3dMh+2Kcc1v9lrnRe7GGtTccHA=; b=GCh+QMCvsa567lMthKm+YlPFZZAlt+pCcTXA5zY8BR6nkrfjpAAjKbAUIJkB4A7UE4+o5+ elSUspPr/Z76tem2DgFBPxmXMY3w0jCNUzrZ6NSot5mlJ8T/IrjHe0bH+L8EJDTK4GXxsf ibzSKBHecJwVq/yn/ZrDi/ouYAmN0od+QjhRGploeu2CvXZFKQ9pjw5QxWKOrHDO9XZdOq JW1kULHWzcgzl5JssBHyvR5CxwhWouwaM8rwXQ1cp4XJA56Lk3gvBcBL3XrwcCmLDaTz3J 7oXz4sWzLoDLusn9/qSKjwSvHKV/FKa+7kslNlsb/VGGtZsKIHvIZyYP+1eo5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N5p8W6L0TzL8f; Mon, 7 Nov 2022 23:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A7NwJ6X065960; Mon, 7 Nov 2022 23:58:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A7NwJkm065959; Mon, 7 Nov 2022 23:58:19 GMT (envelope-from git) Date: Mon, 7 Nov 2022 23:58:19 GMT Message-Id: <202211072358.2A7NwJkm065959@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 68e1b53105f4 - main - editors/cooledit: Update to 4.1.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68e1b53105f41783272a1793b0dc4b8092a11d0b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667865500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kc9cKeV4ks1KP7zKm3dMh+2Kcc1v9lrnRe7GGtTccHA=; b=oxW3Ri+1pU12efW4p9h4dhG5i+44u2Wi/KRqXCXm6tjb3UC00EFeNrMPRFGGO0KHJAxVad VkUFKIv4/7LoM+kwl6v88VcFDAQ7XSv3kpemMKHgHf3zIOYnjtC5LuFPj2DYcb1M2yhhF3 9DoHhpobtGnKHSWyd5PW15+CADK9HcBTwBLRPvYCsLhrpOmiz2X2qtx5lZByqv7T/o0lZL OLrUsmtv2R1JjVnEI11DQx0eXGMw66NLlMiOTXZQR125xVkuLS4TMKRKxBQqJB8QggBUFI qr1C0vPLrbJLedeRfK2/V/dPKA/Wx/qUqd1GlAKkLxN+88cW+RMnQOeWqYjLVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667865500; a=rsa-sha256; cv=none; b=mCyw+5BnfH/O2ng3uRTdEnfsXrQf9+N8SBoiakGr4k6BQDX8OPAUd8/QSOJjrSZTACes8O Bh4GRDaX3FnkZqoag2Zw05A9t4jxF2LTkFT7d8NQSbZtvava3ubUszI6RQ9h6OrugKbRP9 CjraXnbzmvgLDr9kdAD3rA8XAXXJtHsqLte0uD6y6Mvm7dci+HP7S3Rxp0V1TY57ZAqFSk fNfzdX8qprZsSe7d45mbtwF4cfcG4nPLdswMOya7fRhX0ijMot33WpbmXQiod/pYAmINXt Mbh65G+gLhxBQxTOdvyaIDYivelNcMl9r68ORRx2Xa8cafwoKY0Q7dnMO/7j1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=68e1b53105f41783272a1793b0dc4b8092a11d0b commit 68e1b53105f41783272a1793b0dc4b8092a11d0b Author: Nuno Teixeira AuthorDate: 2022-11-07 23:55:55 +0000 Commit: Nuno Teixeira CommitDate: 2022-11-07 23:58:06 +0000 editors/cooledit: Update to 4.1.2 ChangeLog: https://github.com/paulsheer/cooledit/blob/master/NEWS PR: 266918 --- editors/cooledit/Makefile | 33 ++++++++------ editors/cooledit/distinfo | 6 +-- editors/cooledit/files/patch-configure | 11 +++++ editors/cooledit/pkg-plist | 78 +++++++++++++++++++++++++++++++--- 4 files changed, 108 insertions(+), 20 deletions(-) diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index dfa40970ed1e..95658fa7f1de 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -1,6 +1,5 @@ PORTNAME= cooledit -DISTVERSION= 3.17.28 -PORTREVISION= 4 +DISTVERSION= 4.1.2 CATEGORIES= editors MASTER_SITES= SUNSITE/apps/editors/X/cooledit @@ -8,23 +7,33 @@ 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 diff --git a/editors/cooledit/distinfo b/editors/cooledit/distinfo index da007b5b5049..32102114487d 100644 --- 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 new file mode 100644 index 000000000000..9edfb319fcba --- /dev/null +++ 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 index 1b53eea7f4d4..c6dc28de0242 100644 --- 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