git: 859687104e55 - main - editors/textadept: belatedly update the port to version 11.4

Reply: Alexey Dokuchaev : "Re: git: 859687104e55 - main - editors/textadept: belatedly update the port to version 11.4"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Wed, 23 Nov 2022 03:19:07 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=859687104e55d9f04abcbce8651d541fb4124a38

commit 859687104e55d9f04abcbce8651d541fb4124a38
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-11-23 03:17:54 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-11-23 03:17:54 +0000

    editors/textadept: belatedly update the port to version 11.4
    
    - Lexilla was split from main Scintilla distribution into its own
    - Rather than removing -rdynamic and the linker script, append two
      symbols originating from our /lib/crt*.o that must stay global
    - Remove no longer useful hack for glib 2.68.3, shorten the COMMENT
    - Strip the binaries upon installation (subject to -DWITH_DEBUG)
    
    Reported by:    portscout (for a while)
---
 editors/textadept/Makefile                 |  32 +++----
 editors/textadept/distinfo                 |  36 ++++----
 editors/textadept/files/patch-src_Makefile | 137 ++++++++++++++---------------
 editors/textadept/pkg-plist                |   5 +-
 4 files changed, 106 insertions(+), 104 deletions(-)

diff --git a/editors/textadept/Makefile b/editors/textadept/Makefile
index dcd5c29bbf67..22d8861996d7 100644
--- a/editors/textadept/Makefile
+++ b/editors/textadept/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	textadept
-PORTVERSION=	11.1
+PORTVERSION=	11.4
 DISTVERSIONPREFIX=	${PORTNAME}_
 CATEGORIES=	editors
 MASTER_SITES=	https://www.scintilla.org/:sci \
 		http://www.lua.org/ftp/:lua \
 		http://www.inf.puc-rio.br/~roberto/lpeg/:lpeg
-DISTFILES=	scintilla${SCI_VER}.tgz:sci \
+DISTFILES=	scintilla${SCINTILLA_VER}.tgz:sci \
+		lexilla${LEXILLA_VER}.tgz:sci \
 		lua-${LUA_VER}.tar.gz:lua \
 		lpeg-${LPEG_VER}.tar.gz:lpeg
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Fast, minimalist, extensible cross-platform text editor
+COMMENT=	Fast, minimalist, extensible text editor
 WWW=		https://orbitalquark.github.io/textadept/
 
 LICENSE=	MIT
@@ -24,18 +25,18 @@ USE_GNOME=	cairo gdkpixbuf2 glib20
 USE_GITHUB=	yes
 GH_ACCOUNT=	orbitalquark keplerproject:lfs
 GH_PROJECT=	scintillua:scilua luafilesystem:lfs gtdialog:gtd
-GH_TAGNAME=	scintillua_${SCILUA_VER}:scilua v${LFS_VER}:lfs \
-		${GTD_HASH}:gtd
+GH_TAGNAME=	${SCILUA_HASH}:scilua v${LFS_VER}:lfs ${GTD_HASH}:gtd
 
-SCI_VER=	446
-SCILUA_VER=	4.4.5-2
-SCINTERM_HASH=	6a77415
-LUA_VER=	5.3.5
+SCINTILLA_VER=	524
+LEXILLA_VER=	510
+SCINTERM_HASH=	475d8d4
+SCILUA_HASH=	9088723
+LUA_VER=	5.4.4
 LPEG_VER=	1.0.2
 LFS_VER=	1_8_0
-GTD_HASH=	6458754
+GTD_HASH=	444af9c
 CDK_VER=	5.0-20200923
-TERMKEY_VER=	0.20
+TERMKEY_VER=	0.22
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
@@ -49,8 +50,8 @@ OPTIONS_SUB=		yes
 
 UI_DESC=	GTK version
 GTK2_USE=	GNOME=gtk20
+GTK2_MAKE_ARGS=	GTK2=1
 GTK3_USE=	GNOME=gtk30
-GTK3_MAKE_ARGS=	GTK3=yes
 _TARGETS=	gtk
 
 # HTML files require patched https://keplerproject.github.io/luadoc/ to
@@ -71,6 +72,7 @@ post-patch:
 	${LN} -s ${WRKDIR}/scintilla ${BUILD_WRKSRC}
 	${PATCH} -d ${BUILD_WRKSRC}/scintilla -N -p1 < \
 		${BUILD_WRKSRC}/scintilla.patch
+	${LN} -s ${WRKDIR}/lexilla ${BUILD_WRKSRC}
 	${LN} -s ${WRKDIR}/lua-${LUA_VER} ${BUILD_WRKSRC}/lua
 	${PATCH} -d ${BUILD_WRKSRC}/lua -N -p1 < \
 		${BUILD_WRKSRC}/lua.patch
@@ -83,9 +85,9 @@ post-patch:
 	${LN} -s ${WRKDIR}/luafilesystem-${LFS_VER}/src/*.[ch] \
 		${BUILD_WRKSRC}/lua/src/lib
 	${LN} -s ${WRKDIR}/gtdialog-${GTD_HASH} ${BUILD_WRKSRC}/gtdialog
-# Fix build with glib 2.68.3: see https://github.com/orbitalquark/textadept/issues/110
-	${REINPLACE_CMD} -e '/static volatile/s|volatile||g' \
-		${BUILD_WRKSRC}/scintilla/gtk/ScintillaGTKAccessible.cxx
+# On FreeBSD, ``__progname'' and ``environ'' symbols originated from
+# /lib/crt*.o must stay global (see https://bugs.freebsd.org/220103).
+	@${PRINTF} '%s\n%s\n' __progname environ >> ${WRKSRC}/src/lua.sym
 
 post-patch-NCURSES-on:
 	@${MKDIR} ${BUILD_WRKSRC}/scintilla/curses
diff --git a/editors/textadept/distinfo b/editors/textadept/distinfo
index dec3ed5a3eed..543c4c41af56 100644
--- a/editors/textadept/distinfo
+++ b/editors/textadept/distinfo
@@ -1,23 +1,25 @@
-TIMESTAMP = 1611945515
-SHA256 (scintilla446.tgz) = 2df9306ec4539f4fe13f86bab8f2419ba90464933d7cca846d7bb6e7046ec2dc
-SIZE (scintilla446.tgz) = 1640227
-SHA256 (lua-5.3.5.tar.gz) = 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
-SIZE (lua-5.3.5.tar.gz) = 303543
+TIMESTAMP = 1659360961
+SHA256 (scintilla524.tgz) = 4aef1488c9a43b172e05ab762566049e135d1b91ca9d5d5f9f50a59c985acc66
+SIZE (scintilla524.tgz) = 1258284
+SHA256 (lexilla510.tgz) = 6b3595274005498671b854cf57bdeec2254966f371712fcf3a716d97aa7f3fd8
+SIZE (lexilla510.tgz) = 867350
+SHA256 (lua-5.4.4.tar.gz) = 164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61
+SIZE (lua-5.4.4.tar.gz) = 360876
 SHA256 (lpeg-1.0.2.tar.gz) = 48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe
 SIZE (lpeg-1.0.2.tar.gz) = 71840
-SHA256 (textadept_11.1.linux.tgz) = 6b7fa0bc8c3490fa3ee28897735b995f0999f1cdeb93033f51d0c27add706fbe
-SIZE (textadept_11.1.linux.tgz) = 4672969
+SHA256 (textadept_11.4.linux.tgz) = ca7cd7106301858e54aa0c3387a53c9f4e57553b2fc6fbc49af8dd49425013d0
+SIZE (textadept_11.4.linux.tgz) = 3996804
 SHA256 (cdk-5.0-20200923.tgz) = 007f5de880cb2eebd8556df7e4cd8673d5e64c9970147eee6923a814c29faaed
 SIZE (cdk-5.0-20200923.tgz) = 545093
-SHA256 (libtermkey-0.20.tar.gz) = 6c0d87c94ab9915e76ecd313baec08dedf3bd56de83743d9aa923a081935d2f5
-SIZE (libtermkey-0.20.tar.gz) = 45167
-SHA256 (orbitalquark-textadept-textadept_11.1_GH0.tar.gz) = 87d67975b22952344e1bdcb330301b88cdfe8242e7710526cd344ab252499c2a
-SIZE (orbitalquark-textadept-textadept_11.1_GH0.tar.gz) = 2448453
+SHA256 (libtermkey-0.22.tar.gz) = 6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600
+SIZE (libtermkey-0.22.tar.gz) = 46147
+SHA256 (orbitalquark-textadept-textadept_11.4_GH0.tar.gz) = fe10cbe9949e3a2ec4445ace16e26eb4b905cee2e36de76295ea9a7ca6c3aba8
+SIZE (orbitalquark-textadept-textadept_11.4_GH0.tar.gz) = 2474664
 SHA256 (keplerproject-luafilesystem-v1_8_0_GH0.tar.gz) = 16d17c788b8093f2047325343f5e9b74cccb1ea96001e45914a58bbae8932495
 SIZE (keplerproject-luafilesystem-v1_8_0_GH0.tar.gz) = 30374
-SHA256 (orbitalquark-scintillua-scintillua_4.4.5-2_GH0.tar.gz) = 8d891c982c2cbfca3a12c971f66e6c7593dc1daeca1696b93929a32048da1033
-SIZE (orbitalquark-scintillua-scintillua_4.4.5-2_GH0.tar.gz) = 227796
-SHA256 (orbitalquark-gtdialog-6458754_GH0.tar.gz) = a43b015281e43a6b9f7c96df009b6df037ab00896348e11a980a557b1d886b17
-SIZE (orbitalquark-gtdialog-6458754_GH0.tar.gz) = 331729
-SHA256 (orbitalquark-scinterm-6a77415_GH0.tar.gz) = 5f0e0972068eb52f94fca97a453107ed5d691b31f75e0b2c4437d1443d84a0cb
-SIZE (orbitalquark-scinterm-6a77415_GH0.tar.gz) = 89513
+SHA256 (orbitalquark-scintillua-9088723_GH0.tar.gz) = c4ba400915f350631d453c6955f8acdf26fd5b833cd689753e499b84b11d251c
+SIZE (orbitalquark-scintillua-9088723_GH0.tar.gz) = 237678
+SHA256 (orbitalquark-gtdialog-444af9c_GH0.tar.gz) = b583ed59d97ad694929efdbdbb85e9b9933312cf10d801e3f0b10fa561201e98
+SIZE (orbitalquark-gtdialog-444af9c_GH0.tar.gz) = 331777
+SHA256 (orbitalquark-scinterm-475d8d4_GH0.tar.gz) = 0e8c24abcfe5b1fa97efdacc8e6c15690e83f921f4a2804e7ec7072a0f25df3b
+SIZE (orbitalquark-scinterm-475d8d4_GH0.tar.gz) = 91137
diff --git a/editors/textadept/files/patch-src_Makefile b/editors/textadept/files/patch-src_Makefile
index 193d435781eb..e32e0c14ca5b 100644
--- a/editors/textadept/files/patch-src_Makefile
+++ b/editors/textadept/files/patch-src_Makefile
@@ -1,79 +1,75 @@
---- src/Makefile.orig	2021-01-29 18:38:35 UTC
+--- src/Makefile.orig	2022-08-01 13:36:01 UTC
 +++ src/Makefile
-@@ -1,10 +1,9 @@
- # Copyright 2007-2021 Mitchell. See LICENSE.
+@@ -2,9 +2,7 @@
  
--CC = gcc
--CFLAGS = -Os
--CXX = g++
--CXXFLAGS = -Os -std=c++17
--MAKE = make
-+CC ?= gcc
-+CFLAGS ?= -Os
-+CXX ?= g++
-+CXXFLAGS ?= -Os -std=c++17
- ifeq (win, $(findstring win, $(MAKECMDGOALS)))
-   # Cross-compile for Win32.
-   CROSS = i686-w64-mingw32-
-@@ -62,20 +61,21 @@ else ifeq (osx, $(findstring osx, $(MAKECMDGOALS)))
- else
-   # Build for Linux/BSD.
-   LUA_CFLAGS = -DLUA_USE_LINUX
--  LDFLAGS = -rdynamic -Wl,--retain-symbols-file -Wl,$(shell pwd)/lua.sym
-+  # See PR https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220103
-+  #LDFLAGS = -rdynamic -Wl,--retain-symbols-file -Wl,$(shell pwd)/lua.sym
-   ifeq (Linux, $(shell uname -s))
-     LDFLAGS += -ldl
-   else
--    CC = cc
--    CXX = c++
--    LDFLAGS += -liconv
--    MAKE = gmake
-+    CC ?= cc
-+    CXX ?= c++
-+    # Correct spelling on FreeBSD is USES+=iconv :)
-+    #LDFLAGS += -liconv
-   endif
-   PREFIX ?= /usr/local
-   bin_dir = $(PREFIX)/bin
-   data_dir = $(PREFIX)/share/textadept
-   XDG_DATA_DIR ?= $(PREFIX)/share/applications
--  PIXMAPS_DIR ?= /usr/share/pixmaps
-+  PIXMAPS_DIR ?= $(PREFIX)/share/pixmaps
-   desktop_files := $(wildcard *.desktop)
-   ifeq (, $(findstring curses, $(MAKECMDGOALS)))
-     plat_flag = -DGTK
-@@ -103,7 +103,7 @@ else
- endif
- version = $(shell grep -m 1 _RELEASE ../core/init.lua | cut -d ' ' -f4- | \
-                   tr ' ' '_' | tr -d "'")
+ # Base flags and options.
+ 
+-CFLAGS := -Os
+-CXXFLAGS := -Os -std=c++17
 -WGET = wget -O $@
 +WGET = : wget-is-forbidden-during-build -O $@
  
- # Scintilla.
- 
-@@ -164,7 +164,11 @@ endif
- 
- # Build.
+ # Define these once for speed and reference them later.
+ ifdef GTK2
+@@ -194,9 +192,6 @@ $(linux_objs): CXX := g++
+ ifeq (Linux, $(shell uname -s))
+ $(linux_objs): CC := gcc
+ $(linux_objs): CXX := g++
+-else
+-$(linux_objs): CC := cc
+-$(linux_objs): CXX := c++
+ endif
+ $(linux_objs): lua_flags += -DLUA_USE_LINUX
+ $(linux_objs): gtk_flags := $(gtk_flags_linux)
+@@ -231,7 +226,11 @@ osx_exes := $(addprefix ../, textadept-osx textadept-o
  
--all: textadept
+ .PHONY: all curses win osx
+ .DEFAULT_GOAL := all
+-all: $(linux_exes)
 +all:
-+	for tgt in $(TA_TARGETS) ; do $(MAKE) $$tgt ; \
-+	find . -type f -name \*.o -delete ; done
-+
-+gtk: textadept
- curses: textadept-curses
- win32: textadept.exe
- win32-curses: textadept-curses.exe
-@@ -239,20 +243,21 @@ textadept-curses.exe: $(sci_objs) $(sci_lex_objs) LexL
++	for tgt in $(TA_TARGETS) ; do \
++		find . -type f -name \*.o -delete ; \
++		$(MAKE) $$tgt ; done
++gtk: ../textadept
+ curses: ../textadept-curses
+ win: $(win_exes)
+ osx: $(osx_exes)
+@@ -244,8 +243,6 @@ $(linux_exes): CXX := g++
  
- # Install/uninstall.
+ ifeq (Linux, $(shell uname -s))
+ $(linux_exes): CXX := g++
+-else
+-$(linux_exes): CXX := c++
+ endif
+ $(linux_exes): LDFLAGS := -rdynamic
+ ifndef PROFILE
+@@ -261,8 +258,6 @@ $(linux_exes): LDLIBS := -ldl
+   echo -lncursesw) -lpthread
+ ifeq (Linux, $(shell uname -s))
+ $(linux_exes): LDLIBS := -ldl
+-else
+-$(linux_exes): LDLIBS := -liconv
+ endif
+ ifdef PROFILE
+ $(linux_exes): LDLIBS += -lgcov
+@@ -309,7 +304,7 @@ XDG_DATA_DIR ?= $(PREFIX)/share/applications
+ bin_dir := $(PREFIX)/bin
+ data_dir := $(PREFIX)/share/textadept
+ XDG_DATA_DIR ?= $(PREFIX)/share/applications
+-PIXMAPS_DIR ?= /usr/share/pixmaps
++PIXMAPS_DIR ?= $(PREFIX)/share/pixmaps
+ desktop_files := $(wildcard *.desktop)
+ ifeq (, $(findstring curses, $(MAKECMDGOALS)))
+   install_targets := ../textadept
+@@ -318,19 +313,19 @@ endif
+ endif
  
--install: $(install_targets) | ../core ../docs ../init.lua ../lexers ../LICENSE \
-+install: $(wildcard ../textadept*) | ../core ../docs ../init.lua ../lexers \
-                               ../modules ../themes
+ .PHONY: install uninstall
+-install: $(install_targets) | ../core ../docs ../init.lua ../lexers ../LICENSE ../modules ../themes
++install: $(wildcard ../textadept*) | ../core ../docs ../init.lua ../lexers ../modules ../themes
  	install -d $(DESTDIR)$(bin_dir) $(DESTDIR)$(data_dir)
- 	install $^ $(DESTDIR)$(data_dir)
+-	install $^ $(DESTDIR)$(data_dir)
++	$(BSD_INSTALL_PROGRAM) $^ $(DESTDIR)$(data_dir)
  	cp -rL $| $(DESTDIR)$(data_dir)
 -	ln -s $(subst .., $(data_dir), $^) $(DESTDIR)$(bin_dir)
 -	if [ -d "$(XDG_DATA_DIR)" ]; then \
@@ -86,10 +82,9 @@
 +	if : ; then \
  		install -d $(DESTDIR)$(PIXMAPS_DIR); \
 -		ln -s $(data_dir)/core/images/textadept.svg $(DESTDIR)$(PIXMAPS_DIR); \
--		ln -s $(data_dir)/core/images/ta_48x48.png \
-+		ln -s ../..$(subst $(PREFIX),,$(data_dir))/core/images/textadept.svg \
-+			$(DESTDIR)$(PIXMAPS_DIR); \
-+		ln -s ../..$(subst $(PREFIX),,$(data_dir))/core/images/ta_48x48.png \
- 			$(DESTDIR)$(PIXMAPS_DIR)/textadept.png; \
+-		ln -s $(data_dir)/core/images/ta_48x48.png $(DESTDIR)$(PIXMAPS_DIR)/textadept.png; \
++		ln -s ../..$(subst $(PREFIX),,$(data_dir))/core/images/textadept.svg $(DESTDIR)$(PIXMAPS_DIR); \
++		ln -s ../..$(subst $(PREFIX),,$(data_dir))/core/images/ta_48x48.png $(DESTDIR)$(PIXMAPS_DIR)/textadept.png; \
  	fi
  uninstall:
+ 	rm -r $(DESTDIR)$(bin_dir)/textadept* $(DESTDIR)$(data_dir)
diff --git a/editors/textadept/pkg-plist b/editors/textadept/pkg-plist
index 6e1bfb5fe33d..3a7a2665ce42 100644
--- a/editors/textadept/pkg-plist
+++ b/editors/textadept/pkg-plist
@@ -1,6 +1,6 @@
 bin/textadept
 %%NCURSES%%bin/textadept-curses
-share/applications/textadept-curses.desktop
+%%NCURSES%%share/applications/textadept-curses.desktop
 share/applications/textadept.desktop
 %%PORTDOCS%%%%DOCSDIR%%/_layouts/default.html
 %%PORTDOCS%%%%DOCSDIR%%/api.html
@@ -147,11 +147,13 @@ share/pixmaps/textadept.svg
 %%DATADIR%%/lexers/gap.lua
 %%DATADIR%%/lexers/gettext.lua
 %%DATADIR%%/lexers/gherkin.lua
+%%DATADIR%%/lexers/gleam.lua
 %%DATADIR%%/lexers/glsl.lua
 %%DATADIR%%/lexers/gnuplot.lua
 %%DATADIR%%/lexers/go.lua
 %%DATADIR%%/lexers/groovy.lua
 %%DATADIR%%/lexers/gtkrc.lua
+%%DATADIR%%/lexers/hare.lua
 %%DATADIR%%/lexers/haskell.lua
 %%DATADIR%%/lexers/html.lua
 %%DATADIR%%/lexers/icon.lua
@@ -231,6 +233,7 @@ share/pixmaps/textadept.svg
 %%DATADIR%%/lexers/text.lua
 %%DATADIR%%/lexers/toml.lua
 %%DATADIR%%/lexers/txt2tags.lua
+%%DATADIR%%/lexers/typescript.lua
 %%DATADIR%%/lexers/vala.lua
 %%DATADIR%%/lexers/vb.lua
 %%DATADIR%%/lexers/vcard.lua