Hi,
here's an update to the latest version of the SciTE editor/IDE
(https://www.scintilla.org), there was a previous attempt for 4.4.6 3
years ago (cf
https://marc.info/?l=openbsd-ports&m=160779863709630&w=2).
since then, the lexers have been split off in a separate project
(lexilla) but the scite distfile ships its source, so i went the lazy
way and built a static lib out of it in pre-build and tell SciTE to
statically link against it. The resulting binary has working syntax
highlighting so lexilla works.
scintilla also now properly link against GTK, and scite installs a
desktop file.
since no other port use scintilla (everyone seems to bundle it, or use
the qscintilla variant), one could also build it directly from the scite
source tarball like lexilla.. opinions ?
feedback and okays welcome.
Landry
? scite/patch-gtk_makefile
Index: scintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- scintilla/Makefile 6 Mar 2023 13:37:15 -0000 1.32
+++ scintilla/Makefile 25 Apr 2023 06:22:02 -0000
@@ -1,15 +1,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 4.0.3
-REVISION= 0
+VERSION= 5.3.4
DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
CATEGORIES= editors x11
-SHARED_LIBS= scintilla 11.0 \
- scintilla_lexers 11.0
+SHARED_LIBS= scintilla 12.0
-HOMEPAGE= http://www.scintilla.org/
+HOMEPAGE= https://www.scintilla.org/
# old Python license
PERMIT_PACKAGE= Yes
@@ -26,13 +24,14 @@
WANTLIB= m ${COMPILER_LIBCXX}
-# -std=gnu++17
+# -std=c++17
COMPILER= base-clang ports-gcc
-# Not LIB_DEPENDS as it's only shared libraries that don't link directly
-# to gtk+3
-BUILD_DEPENDS= x11/gtk+3
-RUN_DEPENDS= x11/gtk+3
+LIB_DEPENDS= x11/gtk+3
+
+WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 harfbuzz intl
+WANTLIB += pango-1.0 pangocairo-1.0
.for n v in ${SHARED_LIBS}
MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION}
@@ -40,12 +39,5 @@
WRKDIST= ${WRKDIR}/scintilla
WRKSRC= ${WRKDIST}/gtk
-
-post-extract:
- perl -pi -e 's|\x0d||' ${WRKDIST}/include/*.h ${WRKDIST}/gtk/*.cxx \
- ${WRKDIST}/src/*.cxx
-
-pre-build:
- perl -pi -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${MAKE_FILE}
.include <bsd.port.mk>
Index: scintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- scintilla/distinfo 24 Feb 2018 10:54:50 -0000 1.12
+++ scintilla/distinfo 25 Apr 2023 06:22:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (scintilla403.tgz) = nmfi9NjJy6Pi6D7qiDhSrZrfqNwXdfJR+GjMbNBYya4=
-SIZE (scintilla403.tgz) = 1404814
+SHA256 (scintilla534.tgz) = PwGxrvK36Y9iivLP+WWHb10V7igB2d+W3TrO2PCHy0Y=
+SIZE (scintilla534.tgz) = 1318534
Index: scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx
===================================================================
RCS file: scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx
diff -N scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx
--- scintilla/patches/patch-gtk_ScintillaGTKAccessible_cxx 11 Mar 2022
18:58:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-Fix build with GLib >=2.68
-https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/tree/gtk/ScintillaGTKAccessible.cxx?diff=bf180d712ff771fe40a2d5dc178fa0a15cf14b2d
-
-Index: gtk/ScintillaGTKAccessible.cxx
---- gtk/ScintillaGTKAccessible.cxx.orig
-+++ gtk/ScintillaGTKAccessible.cxx
-@@ -1015,7 +1015,7 @@ static gpointer scintilla_object_accessible_parent_cla
-
- // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first
call
- static GType scintilla_object_accessible_get_type(GType parent_type
G_GNUC_UNUSED) {
-- static volatile gsize type_id_result = 0;
-+ static gsize type_id_result = 0;
-
- if (g_once_init_enter(&type_id_result)) {
- GTypeInfo tinfo = {
-@@ -1106,7 +1106,7 @@ AtkObject *ScintillaGTKAccessible::WidgetGetAccessible
- #if HAVE_GTK_A11Y_H // just instantiate the accessible
- *cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
- #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
-- static volatile gsize registered = 0;
-+ static gsize registered = 0;
-
- if (g_once_init_enter(®istered)) {
- // Figure out whether accessibility is enabled by looking at
the type of the accessible
Index: scintilla/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.15
diff -u -r1.15 patch-gtk_makefile
--- scintilla/patches/patch-gtk_makefile 11 Mar 2022 18:58:34 -0000
1.15
+++ scintilla/patches/patch-gtk_makefile 25 Apr 2023 06:22:02 -0000
@@ -1,117 +1,24 @@
Index: gtk/makefile
--- gtk/makefile.orig
+++ gtk/makefile
-@@ -8,19 +8,9 @@
-
- srcdir ?= .
-
--.SUFFIXES: .cxx .c .o .h .a .list
--ifdef CLANG
--CXX = clang++
--CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
--CC = 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
--else
--CXXWARNFLAGS = -Wall -pedantic
--endif
-+.SUFFIXES: .cxx .c .o .h .a .list .so
- ARFLAGS = rc
-+AR = ar
- RANLIB = touch
-
- ifdef GTK3
-@@ -48,18 +38,21 @@ DEL = del /q
- COMPLIB=$(srcdir)\..\bin\scintilla.a
- else
+@@ -68,7 +68,7 @@ else
DEL = rm -f
--COMPLIB=$(srcdir)/../bin/scintilla.a
-+COMPLIB=$(srcdir)/../bin/libscintilla.a
-+LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a
-+SHAREDLIB=$(srcdir)/../bin/libscintilla.so.${LIBscintilla_VERSION}
-+SHAREDLEXER=$(srcdir)/../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
endif
+ COMPLIB=$(basedir)/bin/scintilla.a
+-COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
++COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION).${LIBscintilla_VERSION}
- vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
+ vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
vpath %.c $(srcdir)
- vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../lexlib $(srcdir)/../lexers
-
--INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib
-+INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I
$(srcdir)/../lexlib -I${LOCALBASE}/include
- ifdef CHECK_DEPRECATED
- DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
- endif
--CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS)
$(DEPRECATED)
-+CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER -Dunix
$(INCLUDEDIRS) $(DEPRECATED)
-
- ifdef NOTHREADS
- THREADFLAGS=-DG_THREADS_IMPL_NONE
-@@ -78,7 +71,7 @@ else
- CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
- endif
- else
--CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
- endif
-
- CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS)
-@@ -88,8 +81,12 @@ MARSHALLER=scintilla-marshal.o
-
- .cxx.o:
- $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
-+.cxx.so:
-+ $(CXX) -fPIC $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -o $@ -c $<
- .c.o:
- $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
-+.c.so:
-+ $(CC) -fPIC $(CONFIGFLAGS) $(CFLAGS) -w -o $@ -c $<
-
- GLIB_GENMARSHAL = glib-genmarshal
- GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
-@@ -101,8 +98,14 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
-
- LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard
$(srcdir)/../lexers/Lex*.cxx)))))
-
--all: $(COMPLIB)
-+all: $(COMPLIB) $(SHAREDLIB) $(LEXERLIB) $(SHAREDLEXER)
+@@ -97,6 +97,11 @@ all: $(COMPLIB) $(COMPONENT)
+ static: $(COMPLIB)
+ shared: $(COMPONENT)
++
+install:
+ mkdir -p ${PREFIX}/include/scintilla
+ install -m 444 ../include/*.h ${PREFIX}/include/scintilla
-+ install -m 444 ${COMPLIB} ${LEXERLIB} ${PREFIX}/lib
-+ install -m 444 ${SHAREDLIB} ${SHAREDLEXER} ${PREFIX}/lib
-+
- clean:
- $(DEL) *.o $(COMPLIB) *.plist
-
-@@ -116,15 +119,26 @@ deps: deps.mak
- deps.mak:
- $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.*
//' | grep [a-zA-Z] > $@
++ install -m 444 ${COMPONENT} ${PREFIX}/lib
--$(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o LexerBase.o
LexerModule.o LexerSimple.o StyleContext.o WordList.o \
-+LIBOBJS= Accessor.o CharacterSet.o DefaultLexer.o LexerBase.o LexerModule.o
LexerSimple.o StyleContext.o WordList.o \
- CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o
CaseConvert.o CaseFolder.o \
- ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o
ExternalLexer.o MarginView.o \
- PropSetSimple.o PlatGTK.o \
- KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o
ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
- RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o
UniConversion.o XPM.o \
-- $(MARSHALLER) $(LEXOBJS)
-+ $(MARSHALLER)
-+
-+$(COMPLIB): $(LIBOBJS)
- $(AR) $(ARFLAGS) $@ $^
- $(RANLIB) $@
-+
-+$(LEXERLIB): $(LEXOBJS)
-+ $(AR) rc $@ $^
-+ $(RANLIB) $@
-+
-+$(SHAREDLIB): $(addsuffix .so,$(basename $(LIBOBJS)))
-+ $(CXX) -shared -fPIC -o $@ -Wl,-soname,$(notdir $(SHAREDLIB)) $^
-+$(SHAREDLEXER): $(addsuffix .so,$(basename $(LEXOBJS)))
-+ $(CXX) -shared -fPIC -o $@ -Wl,-soname,$(notdir $(SHAREDLEXER)) $^
-
- # Automatically generate header dependencies with "make deps"
- include deps.mak
+ clean:
+ $(DEL) *.o $(call normalize,$(COMPLIB)) $(call normalize,$(COMPONENT))
*.plist
Index: scintilla/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scintilla/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- scintilla/pkg/PLIST 11 Mar 2022 18:58:34 -0000 1.7
+++ scintilla/pkg/PLIST 25 Apr 2023 06:22:02 -0000
@@ -1,12 +1,11 @@
include/scintilla/
include/scintilla/ILexer.h
include/scintilla/ILoader.h
-include/scintilla/Platform.h
-include/scintilla/SciLexer.h
include/scintilla/Sci_Position.h
include/scintilla/Scintilla.h
+include/scintilla/ScintillaCall.h
+include/scintilla/ScintillaMessages.h
+include/scintilla/ScintillaStructures.h
+include/scintilla/ScintillaTypes.h
include/scintilla/ScintillaWidget.h
-@static-lib lib/libscintilla.a
@lib lib/libscintilla.so.${LIBscintilla_VERSION}
-@static-lib lib/libscintilla_lexers.a
-@lib lib/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
Index: scite/Makefile
===================================================================
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- scite/Makefile 11 Mar 2022 18:58:34 -0000 1.33
+++ scite/Makefile 25 Apr 2023 06:22:02 -0000
@@ -1,20 +1,19 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 4.0.3
+VERSION= 5.3.5
DISTNAME= scite${VERSION:S/.//g}
PKGNAME= scite-${VERSION}
CATEGORIES= editors x11
-HOMEPAGE= http://www.scintilla.org/SciTE.html
+HOMEPAGE= https://www.scintilla.org/SciTE.html
# old Python license
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0
-WANTLIB += gobject-2.0 gtk-3 pango-1.0 pangocairo-1.0 scintilla
-WANTLIB += scintilla_lexers
+WANTLIB += gobject-2.0 gtk-3 m pango-1.0 pangocairo-1.0 scintilla
-MASTER_SITES= http://www.scintilla.org/
+MASTER_SITES= https://www.scintilla.org/
EXTRACT_SUFX= .tgz
# c++17
@@ -22,6 +21,8 @@
LIB_DEPENDS= x11/gtk+3 \
editors/scintilla
+RUN_DEPENDS += devel/xdg-utils \
+ devel/desktop-file-utils
USE_GMAKE= Yes
NO_TEST= Yes
@@ -31,11 +32,9 @@
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
CC="${CC}" CFLAGS="${CFLAGS}" GTK3=1
-post-extract:
- perl -pi -e 's|\x0d||' ${WRKSRC}/*.cxx ${WRKDIST}/src/*.cxx
-
+#pre-configure:
+# ${SUBST_CMD} ${WRKDIST}/src/{Embedded,SciTEGlobal}.properties
pre-build:
- perl -pi -e 's|__DOCDIR__|${LOCALBASE}/share/doc/scite|' \
- ${WRKDIST}/src/*.properties
+ cd ${WRKDIR}/lexilla/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
.include <bsd.port.mk>
Index: scite/distinfo
===================================================================
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- scite/distinfo 24 Feb 2018 10:55:25 -0000 1.12
+++ scite/distinfo 25 Apr 2023 06:22:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (scite403.tgz) = crVJIMqL4cbsXg9Cnc/bCSgtkhl51keXMyff165Uq94=
-SIZE (scite403.tgz) = 2433537
+SHA256 (scite535.tgz) = plJ4Me+NZYaXvKMGOBSYhPnQr7P3SMhvXSftiwvRqm4=
+SIZE (scite535.tgz) = 3535798
Index: scite/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.12
diff -u -r1.12 patch-gtk_makefile
--- scite/patches/patch-gtk_makefile 11 Mar 2022 18:58:34 -0000 1.12
+++ scite/patches/patch-gtk_makefile 25 Apr 2023 06:22:02 -0000
@@ -1,125 +1,40 @@
+we build lexilla in pre-build, link against it statically
+link against scintilla shared lib.
+
Index: gtk/makefile
--- gtk/makefile.orig
+++ gtk/makefile
-@@ -7,16 +7,6 @@
- srcdir ?= .
+@@ -60,13 +60,13 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
+ COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
+ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
+
+-all: $(PROG) $(COMPONENT) $(LEXILLA)
++all: $(PROG)
+
+ vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include
$(SCINTILLA_DIR)/include
+ vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access
$(SCINTILLA_DIR)/call
+
+ INCLUDES=-I $(LEXILLA_DIR)/include -I $(LEXILLA_DIR)/access -I
$(SCINTILLA_DIR)/include -I $(srcdir)/../src
+-DEFINES += -DGTK
++DEFINES += -DGTK -DLEXILLA_STATIC
+ DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
+
+ DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+@@ -156,7 +156,7 @@ SRC_OBJS = \
+ Utf8_16.o
+
+ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o
$(SRC_OBJS) $(LUA_OBJS)
+- $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed
-Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers
-Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin
-lscintilla $(LDLIBS)
++ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed
-Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers
-Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla
../../lexilla/bin/liblexilla.a $(LDLIBS)
- .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
-
- ifdef GTK3
- GTKVERSION=gtk+-3.0
-@@ -28,20 +18,21 @@ endif
- 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:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
- 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
-+DOC_PATH=$(prefix)/share/doc/scite
-
--INSTALL=install
-+INSTALL=install -o root -g bin
-
- PROG = $(srcdir)/../bin/SciTE
-
-@@ -50,19 +41,21 @@ all: $(PROG)
- vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../../scintilla/include
- vpath %.cxx $(srcdir) $(srcdir)/../src
-
--INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
-+INCLUDEDIRS=-I ${prefix}/include/scintilla -I
$(srcdir)/../../scintilla/include -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)
-
- 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 lctype.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 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_O
-
- vpath %.c $(srcdir)/../lua/src
-
--INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
-I$(srcdir)/../lua/src
-+INCLUDEDIRS+=-I$(srcdir)/../lua/src
-
- .c.o:
- $(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS)
$(CFLAGS) -c $< -o $@
-@@ -111,9 +104,6 @@ deps: deps.mak
- deps.mak:
- $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx
$(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
-
--# make should be run in ../../scintilla/gtk to compile all the lexers.
--COMPLIB=$(srcdir)/../../scintilla/bin/scintilla.a
--
- # To almost make lua.vers (needs header and footer added) which is only
needed after updating Lua:
- # nm -g ../bin/SciTE | grep lua | awk '{print "\t\t" $3 ";"}' >lua2.vers
-
-@@ -123,7 +113,7 @@ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o Expor
- 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)
$(LDLIBS) -lm -lstdc++
-+ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL)
$(LDLIBS) -lm -lstdc++
-
- # Automatically generate header dependencies with "make deps"
+ # Automatically generate header dependencies with "make depend"
include deps.mak
-@@ -132,19 +122,17 @@ include deps.mak
- # This is OK - just means no SciTE in the Gnome Applications menu
- # Dead: install -D SciTEGTK.properties
$(SYSCONF_PATH)/SciTEGlobal.properties
- install:
-- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH)
-+ $(INSTALL) -m 755 -d $(bindir) $(SYSCONF_PATH)
-
-- $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 755 $(PROG) $(bindir)
-+ $(INSTALL) -m 755 -d $(SYSCONF_PATH) $(DOC_PATH)
-+ $(INSTALL) -m 444 ../src/*.properties $(SYSCONF_PATH)
-+ $(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png
$(DOC_PATH)
-
-- for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html
$(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png; \
-- do \
-- $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
-- done
--
- ifdef gnomeprefix
- $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications
$(DESTDIR)$(pixmapdir)
- $(INSTALL) -m 644 $(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
+@@ -169,8 +169,6 @@ install:
+ $(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
+
+ $(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 \
Index: scite/patches/patch-src_Embedded_properties
===================================================================
RCS file: scite/patches/patch-src_Embedded_properties
diff -N scite/patches/patch-src_Embedded_properties
--- scite/patches/patch-src_Embedded_properties 11 Mar 2022 18:58:34 -0000
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/Embedded.properties
---- src/Embedded.properties.orig
-+++ src/Embedded.properties
-@@ -99,7 +99,7 @@ if PLAT_WIN
- command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
- command.scite.help.subsystem=2
- if PLAT_GTK
-- command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
-+ command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
-
- code.page=0
- if PLAT_GTK
Index: scite/patches/patch-src_SciTEGlobal_properties
===================================================================
RCS file: scite/patches/patch-src_SciTEGlobal_properties
diff -N scite/patches/patch-src_SciTEGlobal_properties
--- scite/patches/patch-src_SciTEGlobal_properties 11 Mar 2022 18:58:34
-0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/SciTEGlobal.properties
---- src/SciTEGlobal.properties.orig
-+++ src/SciTEGlobal.properties
-@@ -285,7 +285,7 @@ if PLAT_WIN
- command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
- command.scite.help.subsystem=2
- if PLAT_GTK
-- command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
-+ command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
-
- # Internationalisation
- # Japanese input code page 932 and ShiftJIS character set 128
Index: scite/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scite/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- scite/pkg/PLIST 11 Mar 2022 18:58:34 -0000 1.11
+++ scite/pkg/PLIST 25 Apr 2023 06:22:02 -0000
@@ -1,29 +1,35 @@
@bin bin/SciTE
-share/doc/scite/
-share/doc/scite/CommandValues.html
-share/doc/scite/PaneAPI.html
-share/doc/scite/PrintHi.png
-share/doc/scite/SciTE.html
-share/doc/scite/SciTEDirector.html
-share/doc/scite/SciTEDoc.html
-share/doc/scite/SciTEDownload.html
-share/doc/scite/SciTEExtension.html
-share/doc/scite/SciTEExternalLexer.html
-share/doc/scite/SciTEExtras.html
-share/doc/scite/SciTEFAQ.html
-share/doc/scite/SciTEIco.png
-share/doc/scite/SciTEImage.html
-share/doc/scite/SciTELexer.html
-share/doc/scite/SciTELua.html
-share/doc/scite/SciTERegEx.html
-share/doc/scite/ScriptLexer.html
+lib/scite/
+share/applications/SciTE.desktop
+share/pixmaps/
+share/pixmaps/Sci48M.png
share/scite/
+share/scite/CommandValues.html
share/scite/Embedded.properties
+share/scite/PaneAPI.html
+share/scite/PrintHi.png
+share/scite/SciTE.html
share/scite/SciTE.properties
+share/scite/SciTEDirector.html
+share/scite/SciTEDoc.html
+share/scite/SciTEDownload.html
+share/scite/SciTEExtension.html
+share/scite/SciTEExternalLexer.html
+share/scite/SciTEExtras.html
+share/scite/SciTEFAQ.html
share/scite/SciTEGlobal.properties
+share/scite/SciTEHistory.html
+share/scite/SciTEIco.png
+share/scite/SciTEImage.html
+share/scite/SciTEIndicators.png
+share/scite/SciTELexer.html
+share/scite/SciTELua.html
+share/scite/SciTERegEx.html
+share/scite/ScriptLexer.html
share/scite/abaqus.properties
share/scite/abbrev.properties
share/scite/ada.properties
+share/scite/asciidoc.properties
share/scite/asl.properties
share/scite/asm.properties
share/scite/asn1.properties
@@ -34,6 +40,7 @@
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
@@ -42,6 +49,7 @@
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
@@ -50,6 +58,7 @@
share/scite/forth.properties
share/scite/fortran.properties
share/scite/freebasic.properties
+share/scite/fsharp.properties
share/scite/gap.properties
share/scite/haskell.properties
share/scite/hex.properties
@@ -64,9 +73,11 @@
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,10 +93,12 @@
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
share/scite/rust.properties
+share/scite/sas.properties
share/scite/scriptol.properties
share/scite/smalltalk.properties
share/scite/sorcins.properties
@@ -102,3 +115,4 @@
share/scite/vhdl.properties
share/scite/visualprolog.properties
share/scite/yaml.properties
+@tag update-desktop-database
