Update SciTE to 4.4.6

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Update SciTE to 4.4.6
From: Silas <silas_nfm21%nocafe.net@localhost>
Date: Wed, 06 Jan 2021 20:25:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Silas <silas_nfm21%nocafe.net@localhost>
Pushed By:	silasdb
Date:		Wed Jan 6 17:25:55 2021 -0300
Changeset:	f4a3528da682f322cf3fe937d5dd1e4a506273fe

Modified Files:
	scite/Makefile
	scite/PLIST
	scite/distinfo
	scite/patches/patch-gtk_makefile

Log Message:
Update SciTE to 4.4.6

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f4a3528da682f322cf3fe937d5dd1e4a506273fe

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 scite/Makefile                   |   8 +--
 scite/PLIST                      |  11 +++-
 scite/distinfo                   |  10 ++--
 scite/patches/patch-gtk_makefile | 125 +++++++--------------------------------
 4 files changed, 39 insertions(+), 115 deletions(-)

diffs:
diff --git a/scite/Makefile b/scite/Makefile
index 2794943972..a8232cc911 100644
--- a/scite/Makefile
+++ b/scite/Makefile
@@ -1,7 +1,8 @@
 # $NetBSD: Makefile,v 1.25 2016/02/25 08:27:03 jperkin Exp $
+#
 
-DISTNAME=	scite375
-PKGNAME=	scite-3.7.5
+DISTNAME=	scite446
+PKGNAME=	scite-4.4.6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
 EXTRACT_SUFX=	.tgz
@@ -25,10 +26,9 @@ post-extract:
 	${RM} ${WRKSRC}/gtk/deps.mak
 	${TOUCH} ${WRKSRC}/gtk/deps.mak
 
-.include "../../devel/pango/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.scintilla+= scintilla>=3.7.4
+BUILDLINK_API_DEPENDS.scintilla+= scintilla>=4.4.6
 .include "../../devel/scintilla/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/scite/PLIST b/scite/PLIST
index efa46a1253..5b62e51347 100644
--- a/scite/PLIST
+++ b/scite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/02/06 17:26:32 drochner Exp $
+@comment $NetBSD$
 bin/SciTE
 share/applications/SciTE.desktop
 share/pixmaps/Sci48M.png
@@ -18,6 +18,7 @@ share/scite/SciTEFAQ.html
 share/scite/SciTEGlobal.properties
 share/scite/SciTEIco.png
 share/scite/SciTEImage.html
+share/scite/SciTEIndicators.png
 share/scite/SciTELexer.html
 share/scite/SciTELua.html
 share/scite/SciTERegEx.html
@@ -35,6 +36,7 @@ share/scite/baan.properties
 share/scite/blitzbasic.properties
 share/scite/bullant.properties
 share/scite/caml.properties
+share/scite/cil.properties
 share/scite/cmake.properties
 share/scite/cobol.properties
 share/scite/coffeescript.properties
@@ -43,6 +45,7 @@ share/scite/cpp.properties
 share/scite/csound.properties
 share/scite/css.properties
 share/scite/d.properties
+share/scite/dataflex.properties
 share/scite/ecl.properties
 share/scite/eiffel.properties
 share/scite/erlang.properties
@@ -63,10 +66,13 @@ share/scite/lisp.properties
 share/scite/lot.properties
 share/scite/lout.properties
 share/scite/lua.properties
+share/scite/markdown.properties
 share/scite/matlab.properties
+share/scite/maxima.properties
 share/scite/metapost.properties
 share/scite/mmixal.properties
 share/scite/modula3.properties
+share/scite/nim.properties
 share/scite/nimrod.properties
 share/scite/nncrontab.properties
 share/scite/nsis.properties
@@ -82,6 +88,7 @@ share/scite/ps.properties
 share/scite/purebasic.properties
 share/scite/python.properties
 share/scite/r.properties
+share/scite/raku.properties
 share/scite/rebol.properties
 share/scite/registry.properties
 share/scite/ruby.properties
@@ -100,4 +107,6 @@ share/scite/txt2tags.properties
 share/scite/vb.properties
 share/scite/verilog.properties
 share/scite/vhdl.properties
+share/scite/visualprolog.properties
 share/scite/yaml.properties
+@pkgdir lib/scite
diff --git a/scite/distinfo b/scite/distinfo
index 425b36bbe1..23851ca20b 100644
--- a/scite/distinfo
+++ b/scite/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.8 2015/11/03 03:32:21 agc Exp $
 
-SHA1 (scite375.tgz) = 28f4ce1c7b2aaead0009a93ef5e469fb9a2e55f6
-RMD160 (scite375.tgz) = 5cfc34714fee7c7b6ac75f4aa8a202ba128fff97
-SHA512 (scite375.tgz) = d4c39e73f9bf7ae02f98774ddefc6f8ee92fea3dff62aeae0c8d10744cb3093828034449498756253c07d83169ca40da6864a23a2ded6a5749dc1614bbd51864
-Size (scite375.tgz) = 2380823 bytes
-SHA1 (patch-gtk_makefile) = 32703e9339e1e228120870fd1a55e3e27a46cbea
+SHA1 (scite446.tgz) = 9dccbedd540ab5cde0dd89e5f518fcc27c09a67e
+RMD160 (scite446.tgz) = 18a867d72230e447a43e51fe0f2d92f42b8e3c3b
+SHA512 (scite446.tgz) = 9784307e15c23158dd0a4324573e353389d327dcda3873632f9bebe6cc7a62f898cda04b825409a922069b32d5e94394a3bccec69b15de8f27285dcb88bce16e
+Size (scite446.tgz) = 2777984 bytes
+SHA1 (patch-gtk_makefile) = 29e2c7d690cf5e637b1c6fec4dd07c1c720d0d3d
diff --git a/scite/patches/patch-gtk_makefile b/scite/patches/patch-gtk_makefile
index 0d768dcb2c..2c21bcca62 100644
--- a/scite/patches/patch-gtk_makefile
+++ b/scite/patches/patch-gtk_makefile
@@ -1,114 +1,29 @@
 $NetBSD$
 
---- gtk/makefile.orig	2017-05-08 01:13:24.000000000 +0000
-+++ gtk/makefile	2017-06-18 15:02:39.186736662 +0000
-@@ -7,16 +7,6 @@
- srcdir ?= .
+--- gtk/makefile.orig	2020-09-11 10:44:44.000000000 +0000
++++ gtk/makefile
+@@ -59,12 +59,12 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
+ COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
+ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
  
- .SUFFIXES: .cxx .o .h .a .c
--ifdef CLANG
--# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
--# thread also need to create Position Independent Executable -> search online documentation
--SANITIZE = address
--#SANITIZE = undefined
--CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
--CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
--else
--MISLEADING=-Wno-misleading-indentation
--endif
+-all: $(PROG) $(COMPONENT) $(LEXILLA)
++all: $(PROG)
  
- ifdef GTK3
- GTKVERSION=gtk+-3.0
-@@ -28,41 +18,44 @@
- CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
- CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
- CONFIGTHREADS:=
--gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
-+gnomeprefix:=${PREFIX}
- ifndef prefix
- ifdef gnomeprefix
-   prefix=$(gnomeprefix)
- else
--  prefix=/usr
-+  prefix=${PREFIX}
- endif
- endif
- datadir=$(prefix)/share
- pixmapdir=$(datadir)/pixmaps
- bindir=$(prefix)/bin
- SYSCONF_PATH=$(prefix)/share/scite
-+DOCPATH=$(PREFIX)/share/doc/scite
- 
--INSTALL=install
-+INSTALL=install -o root -g bin
- 
- PROG	= $(srcdir)/../bin/SciTE
- 
- all: $(PROG)
- 
--vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../../scintilla/include
-+vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../scintilla
+-vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include
++vpath %.h $(srcdir) $(srcdir)/../src $(prefix)/include
  vpath %.cxx $(srcdir) $(srcdir)/../src
  
--INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
-+INCLUDEDIRS=-I $(PREFIX)/include/scintilla -I $(srcdir)/../src -I $(prefix)/include
- ifdef CHECK_DEPRECATED
- DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
- endif
--CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
-+CXXBASEFLAGS=-W -Wall -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
- 
- ifdef DEBUG
--CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
- else
--CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
- endif
- 
--ifndef NO_LUA
-+LIBS= -L $(PREFIX)/lib -lscintilla -lscintilla_lexers
-+
-+ifdef LUA
- LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- 		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
- 		ltable.o ltm.o lundump.o lvm.o lzio.o
-@@ -74,7 +67,7 @@
- 
- vpath %.c $(srcdir)/../lua/src $(srcdir)/../lua/src/lib
- 
--INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -I$(srcdir)/../lua/include
-+INCLUDEDIRS+=-I$(srcdir)/../lua/include
- 
- .c.o:
- 	$(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o $@
-@@ -111,17 +104,14 @@
- deps.mak:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
+-INCLUDES=-I $(SCINTILLA_DIR)/include -I $(srcdir)/../src
++INCLUDES=-I $(prefix)/include/scintilla -I $(srcdir)/../src
+ DEFINES += -DGTK
+ DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
  
--# make should be run in ../../scintilla/gtk to compile all the lexers.
--COMPLIB=$(srcdir)/../../scintilla/bin/scintilla.a
--
- $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
- FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
- ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
- MatchMarker.o StringHelpers.o \
- PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
--	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
--	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
--
-+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
-+	$(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
-+	$(LDFLAGS) $(LIBS) -Wl,--as-needed $(CONFIGLIB)
- # Automatically generate header dependencies with "make deps"
- include deps.mak
+@@ -164,8 +164,6 @@ install:
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
  
-@@ -141,7 +131,7 @@
- ifdef gnomeprefix
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
- 	$(INSTALL) -m 755 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
--	$(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+	$(INSTALL) -m 444 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
- endif
+ 	$(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
+-	$(INSTALL) -m 755 $(COMPONENT) $(DESTDIR)$(libdir)
+-	$(INSTALL) -m 755 $(LEXILLA) $(DESTDIR)$(libdir)
  
- uninstall:
+ 	for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \
+ 	do \
Prev by Date: Update Scintilla to 4.4.6
Next by Date: rust: fix static option.
Previous by Thread: Update Scintilla to 4.4.6
Next by Thread: rust: fix static option.
Indexes:
Home | Main Index | Thread Index | Old Index