Attachment #251702 for bug #279995

View | Details | Raw Unified | Return to bug 279995
Collapse All | Expand All




PORTNAME=	scite
DISTVERSION=	5.5.0
PORTREVISION=	3
CATEGORIES=	editors gnome
MASTER_SITES=	https://www.scintilla.org/
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}

MAINTAINER=	cyberbotx@cyberbotx.com

WWW=		https://www.scintilla.org/SciTE.html

LICENSE=	SCINTILLA
LICENSE_NAME=	License for Lexilla, Scintilla and SciTE
LICENSE_FILE=	${WRKSRC}/../License.txt
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

LIB_DEPENDS=	liblexilla.so:textproc/lexilla \
		libscintilla.so:x11-toolkits/scintilla
RUN_DEPENDS=	xdg-open:devel/xdg-utils

USES=		compiler:c++20-lang desktop-file-utils gmake gnome pkgconfig \
		tar:tgz
OPTIONS_DEFINE=	DOCS

PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
WRKSRC=		${WRKDIR}/${PORTNAME}/gtk

USE_GNOME=	cairo gdkpixbuf2 gtk30
MAKEFILE=	makefile

MAKE_ARGS+=	DEBUG=1
.endif

PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
WRKSRC=		${WRKDIR}/${PORTNAME}/gtk

PORTDATA=	*.properties
PORTDOCS=	*.html *.jpg *.png

OPTIONS_DEFINE=	DOCS

.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang

		${WRKSRC}/../src/SciTEGlobal.properties

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE \
		${STAGEDIR}${PREFIX}/bin
	${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite
	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 \
		${STAGEDIR}${PREFIX}/share/man/man1
	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop \
		${STAGEDIR}${PREFIX}/share/applications
	${INSTALL_DATA} ${WRKSRC}/Sci48M.png \
		${STAGEDIR}${PREFIX}/share/pixmaps
	(cd ${WRKSRC}/../src && \
		${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
	(cd ${WRKSRC}/../doc && \
		${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/editors/scite/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1601836826	1	TIMESTAMP = 1719371126
2	SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1	2	SHA256 (scite550.tgz) = f7726a57be521f71c81b4fcc6d171fbf4a62e08c1c1840f5a74e014f3607ee11
3	SIZE (scite445.tgz) = 2777899	3	SIZE (scite550.tgz) = 4784815




--- gtk/makefile.orig	2024-03-19 04:36:42 UTC
+++ gtk/makefile
@@ -19,9 +19,7 @@ SANITIZE = address
 # thread also need to create Position Independent Executable -> search online documentation
 SANITIZE = address
 #SANITIZE = undefined

 WARNINGS += -Wno-deprecated-register
 WARNINGS += -Wno-empty-body
 else
@@ -60,7 +58,7 @@ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
 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
@@ -156,7 +154,9 @@ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o Directo
 	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,--undefined-version \
+	-Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers \
+	$^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla -llexilla $(LDLIBS)
 
 # Automatically generate header dependencies with "make depend"
 include deps.mak

Lines 382-387 Link Here

(-)b/textproc/Makefile (+1 lines)
382	SUBDIR += lasem	382	SUBDIR += lasem
383	SUBDIR += latex-service	383	SUBDIR += latex-service
384	SUBDIR += latex2html	384	SUBDIR += latex2html
		385	SUBDIR += lexilla
385	SUBDIR += libabw	386	SUBDIR += libabw
386	SUBDIR += libcroco	387	SUBDIR += libcroco
387	SUBDIR += libcss	388	SUBDIR += libcss




PORTNAME=	lexilla
DISTVERSION=	5.3.2
CATEGORIES=	textproc
MASTER_SITES=	https://www.scintilla.org/
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}

MAINTAINER=	cyberbotx@cyberbotx.com
COMMENT=	Free library of language lexers
WWW=		https://www.scintilla.org/Lexilla.html

LICENSE=	SCINTILLA
LICENSE_NAME=	License for Lexilla, Scintilla and SciTE
LICENSE_FILE=	${WRKSRC}/../License.txt
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

#LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
BUILD_DEPENDS=	scintilla>0:x11-toolkits/scintilla

USES=		compiler:c++17-lang cpe gmake gnome iconv pkgconfig tar:tgz

USE_LDCONFIG=	yes

MAKEFILE=	makefile
.if defined(WITH_DEBUG)
MAKE_ARGS+=	DEBUG=1
.endif
MAKE_ENV=	LDFLAGS="${LDFLAGS}"

CFLAGS+=	-DPIC -fpic

PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
WRKSRC=		${WRKDIR}/${PORTNAME}/src

PLIST_FILES=	include/lexilla/Lexilla.h \
		include/lexilla/SciLexer.h \
		lib/liblexilla.so

.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang
MAKE_ARGS+=	CLANG=1
.endif

do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lexilla
	${INSTALL_DATA} ${WRKSRC}/../include/*.h \
		${STAGEDIR}${PREFIX}/include/lexilla
	${INSTALL_LIB} ${WRKSRC}/../bin/*.so \
		${STAGEDIR}${PREFIX}/lib

.include <bsd.port.post.mk>

Added Link Here

(-)b/textproc/lexilla/distinfo (+3 lines)
1	TIMESTAMP = 1719353875
2	SHA256 (lexilla532.tgz) = fc06be954401c9dc1810f927bccd2604c43a70cf98178161cf817e95c4ebf00f
3	SIZE (lexilla532.tgz) = 993809




--- src/deps.mak.orig	2024-06-25 22:48:45 UTC
+++ src/deps.mak
@@ -1,15 +1,15 @@ $(DIR_O)/Lexilla.o: \
 # Created by DepGen.py. To recreate, run DepGen.py.
 $(DIR_O)/Lexilla.o: \
 	../src/Lexilla.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
 	../lexlib/LexerModule.h \
 	../lexlib/CatalogueModules.h
 $(DIR_O)/Accessor.o: \
 	../lexlib/Accessor.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -23,9 +23,9 @@ $(DIR_O)/DefaultLexer.o: \
 	../lexlib/CharacterSet.h
 $(DIR_O)/DefaultLexer.o: \
 	../lexlib/DefaultLexer.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -39,15 +39,15 @@ $(DIR_O)/LexAccessor.o: \
 	../lexlib/CharacterSet.h
 $(DIR_O)/LexAccessor.o: \
 	../lexlib/LexAccessor.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/CharacterSet.h
 $(DIR_O)/LexerBase.o: \
 	../lexlib/LexerBase.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -57,9 +57,9 @@ $(DIR_O)/LexerModule.o: \
 	../lexlib/LexerBase.h
 $(DIR_O)/LexerModule.o: \
 	../lexlib/LexerModule.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -70,9 +70,9 @@ $(DIR_O)/LexerNoExceptions.o: \
 	../lexlib/LexerSimple.h
 $(DIR_O)/LexerNoExceptions.o: \
 	../lexlib/LexerNoExceptions.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -83,9 +83,9 @@ $(DIR_O)/LexerSimple.o: \
 	../lexlib/LexerNoExceptions.h
 $(DIR_O)/LexerSimple.o: \
 	../lexlib/LexerSimple.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -99,8 +99,8 @@ $(DIR_O)/StyleContext.o: \
 	../lexlib/PropSetSimple.h
 $(DIR_O)/StyleContext.o: \
 	../lexlib/StyleContext.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
 	../lexlib/StyleContext.h \
@@ -110,9 +110,9 @@ $(DIR_O)/LexA68k.o: \
 	../lexlib/WordList.h
 $(DIR_O)/LexA68k.o: \
 	../lexers/LexA68k.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -122,9 +122,9 @@ $(DIR_O)/LexAbaqus.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAbaqus.o: \
 	../lexers/LexAbaqus.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -134,9 +134,9 @@ $(DIR_O)/LexAda.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAda.o: \
 	../lexers/LexAda.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -146,9 +146,9 @@ $(DIR_O)/LexAPDL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAPDL.o: \
 	../lexers/LexAPDL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -158,9 +158,9 @@ $(DIR_O)/LexAsciidoc.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAsciidoc.o: \
 	../lexers/LexAsciidoc.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -170,9 +170,9 @@ $(DIR_O)/LexAsm.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAsm.o: \
 	../lexers/LexAsm.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -183,9 +183,9 @@ $(DIR_O)/LexAsn1.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexAsn1.o: \
 	../lexers/LexAsn1.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -195,9 +195,9 @@ $(DIR_O)/LexASY.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexASY.o: \
 	../lexers/LexASY.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -207,9 +207,9 @@ $(DIR_O)/LexAU3.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAU3.o: \
 	../lexers/LexAU3.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -219,9 +219,9 @@ $(DIR_O)/LexAVE.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAVE.o: \
 	../lexers/LexAVE.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -231,9 +231,9 @@ $(DIR_O)/LexAVS.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexAVS.o: \
 	../lexers/LexAVS.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -243,9 +243,9 @@ $(DIR_O)/LexBaan.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexBaan.o: \
 	../lexers/LexBaan.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -256,9 +256,9 @@ $(DIR_O)/LexBash.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexBash.o: \
 	../lexers/LexBash.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
 	../lexlib/InList.h \
@@ -272,9 +272,9 @@ $(DIR_O)/LexBasic.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexBasic.o: \
 	../lexers/LexBasic.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -285,9 +285,9 @@ $(DIR_O)/LexBatch.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexBatch.o: \
 	../lexers/LexBatch.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/InList.h \
 	../lexlib/WordList.h \
@@ -298,9 +298,9 @@ $(DIR_O)/LexBibTeX.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexBibTeX.o: \
 	../lexers/LexBibTeX.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -311,9 +311,9 @@ $(DIR_O)/LexBullant.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexBullant.o: \
 	../lexers/LexBullant.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -323,9 +323,9 @@ $(DIR_O)/LexCaml.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCaml.o: \
 	../lexers/LexCaml.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -335,9 +335,9 @@ $(DIR_O)/LexCIL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCIL.o: \
 	../lexers/LexCIL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
@@ -350,9 +350,9 @@ $(DIR_O)/LexCLW.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexCLW.o: \
 	../lexers/LexCLW.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -362,9 +362,9 @@ $(DIR_O)/LexCmake.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCmake.o: \
 	../lexers/LexCmake.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -374,9 +374,9 @@ $(DIR_O)/LexCOBOL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCOBOL.o: \
 	../lexers/LexCOBOL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -386,9 +386,9 @@ $(DIR_O)/LexCoffeeScript.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCoffeeScript.o: \
 	../lexers/LexCoffeeScript.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -398,9 +398,9 @@ $(DIR_O)/LexConf.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexConf.o: \
 	../lexers/LexConf.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -410,9 +410,9 @@ $(DIR_O)/LexCPP.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCPP.o: \
 	../lexers/LexCPP.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
@@ -426,9 +426,9 @@ $(DIR_O)/LexCrontab.o: \
 	../lexlib/SubStyles.h
 $(DIR_O)/LexCrontab.o: \
 	../lexers/LexCrontab.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -438,9 +438,9 @@ $(DIR_O)/LexCsound.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCsound.o: \
 	../lexers/LexCsound.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -450,9 +450,9 @@ $(DIR_O)/LexCSS.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexCSS.o: \
 	../lexers/LexCSS.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -462,9 +462,9 @@ $(DIR_O)/LexD.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexD.o: \
 	../lexers/LexD.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -475,9 +475,9 @@ $(DIR_O)/LexDataflex.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexDataflex.o: \
 	../lexers/LexDataflex.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -487,9 +487,9 @@ $(DIR_O)/LexDiff.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexDiff.o: \
 	../lexers/LexDiff.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -499,9 +499,9 @@ $(DIR_O)/LexDMAP.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexDMAP.o: \
 	../lexers/LexDMAP.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -511,9 +511,9 @@ $(DIR_O)/LexDMIS.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexDMIS.o: \
 	../lexers/LexDMIS.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -523,9 +523,9 @@ $(DIR_O)/LexECL.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexECL.o: \
 	../lexers/LexECL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -537,18 +537,18 @@ $(DIR_O)/LexEDIFACT.o: \
 	../lexlib/OptionSet.h
 $(DIR_O)/LexEDIFACT.o: \
 	../lexers/LexEDIFACT.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/LexerModule.h \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexEiffel.o: \
 	../lexers/LexEiffel.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -558,9 +558,9 @@ $(DIR_O)/LexErlang.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexErlang.o: \
 	../lexers/LexErlang.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -570,9 +570,9 @@ $(DIR_O)/LexErrorList.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexErrorList.o: \
 	../lexers/LexErrorList.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/InList.h \
 	../lexlib/WordList.h \
@@ -583,9 +583,9 @@ $(DIR_O)/LexEScript.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexEScript.o: \
 	../lexers/LexEScript.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -595,9 +595,9 @@ $(DIR_O)/LexFlagship.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexFlagship.o: \
 	../lexers/LexFlagship.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -607,9 +607,9 @@ $(DIR_O)/LexForth.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexForth.o: \
 	../lexers/LexForth.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -619,9 +619,9 @@ $(DIR_O)/LexFortran.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexFortran.o: \
 	../lexers/LexFortran.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -631,9 +631,9 @@ $(DIR_O)/LexFSharp.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexFSharp.o: \
 	../lexers/LexFSharp.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -644,9 +644,9 @@ $(DIR_O)/LexGAP.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexGAP.o: \
 	../lexers/LexGAP.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -656,9 +656,9 @@ $(DIR_O)/LexGDScript.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexGDScript.o: \
 	../lexers/LexGDScript.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
@@ -673,9 +673,9 @@ $(DIR_O)/LexGui4Cli.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexGui4Cli.o: \
 	../lexers/LexGui4Cli.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -685,9 +685,9 @@ $(DIR_O)/LexHaskell.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexHaskell.o: \
 	../lexers/LexHaskell.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -701,9 +701,9 @@ $(DIR_O)/LexHex.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexHex.o: \
 	../lexers/LexHex.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -713,9 +713,9 @@ $(DIR_O)/LexHollywood.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexHollywood.o: \
 	../lexers/LexHollywood.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -726,9 +726,9 @@ $(DIR_O)/LexHTML.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexHTML.o: \
 	../lexers/LexHTML.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/InList.h \
 	../lexlib/WordList.h \
@@ -742,9 +742,9 @@ $(DIR_O)/LexIndent.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexIndent.o: \
 	../lexers/LexIndent.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -754,9 +754,9 @@ $(DIR_O)/LexInno.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexInno.o: \
 	../lexers/LexInno.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -766,9 +766,9 @@ $(DIR_O)/LexJSON.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexJSON.o: \
 	../lexers/LexJSON.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -779,9 +779,9 @@ $(DIR_O)/LexJulia.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexJulia.o: \
 	../lexers/LexJulia.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
 	../lexlib/PropSetSimple.h \
@@ -796,9 +796,9 @@ $(DIR_O)/LexKix.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexKix.o: \
 	../lexers/LexKix.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -808,9 +808,9 @@ $(DIR_O)/LexKVIrc.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexKVIrc.o: \
 	../lexers/LexKVIrc.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -820,9 +820,9 @@ $(DIR_O)/LexLaTeX.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexLaTeX.o: \
 	../lexers/LexLaTeX.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -835,9 +835,9 @@ $(DIR_O)/LexLisp.o: \
 	../lexlib/LexerBase.h
 $(DIR_O)/LexLisp.o: \
 	../lexers/LexLisp.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -847,9 +847,9 @@ $(DIR_O)/LexLout.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexLout.o: \
 	../lexers/LexLout.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -859,9 +859,9 @@ $(DIR_O)/LexLua.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexLua.o: \
 	../lexers/LexLua.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -874,9 +874,9 @@ $(DIR_O)/LexMagik.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexMagik.o: \
 	../lexers/LexMagik.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -886,9 +886,9 @@ $(DIR_O)/LexMake.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMake.o: \
 	../lexers/LexMake.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -898,9 +898,9 @@ $(DIR_O)/LexMarkdown.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMarkdown.o: \
 	../lexers/LexMarkdown.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -910,9 +910,9 @@ $(DIR_O)/LexMatlab.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMatlab.o: \
 	../lexers/LexMatlab.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -922,9 +922,9 @@ $(DIR_O)/LexMaxima.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMaxima.o: \
 	../lexers/LexMaxima.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -934,9 +934,9 @@ $(DIR_O)/LexMetapost.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMetapost.o: \
 	../lexers/LexMetapost.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -946,9 +946,9 @@ $(DIR_O)/LexMMIXAL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMMIXAL.o: \
 	../lexers/LexMMIXAL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -958,9 +958,9 @@ $(DIR_O)/LexModula.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexModula.o: \
 	../lexers/LexModula.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -971,9 +971,9 @@ $(DIR_O)/LexMPT.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMPT.o: \
 	../lexers/LexMPT.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -983,9 +983,9 @@ $(DIR_O)/LexMSSQL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMSSQL.o: \
 	../lexers/LexMSSQL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -995,9 +995,9 @@ $(DIR_O)/LexMySQL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexMySQL.o: \
 	../lexers/LexMySQL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1007,9 +1007,9 @@ $(DIR_O)/LexNim.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexNim.o: \
 	../lexers/LexNim.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
@@ -1022,9 +1022,9 @@ $(DIR_O)/LexNimrod.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexNimrod.o: \
 	../lexers/LexNimrod.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1034,9 +1034,9 @@ $(DIR_O)/LexNsis.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexNsis.o: \
 	../lexers/LexNsis.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1046,9 +1046,9 @@ $(DIR_O)/LexNull.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexNull.o: \
 	../lexers/LexNull.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1058,9 +1058,9 @@ $(DIR_O)/LexOpal.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexOpal.o: \
 	../lexers/LexOpal.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1070,9 +1070,9 @@ $(DIR_O)/LexOScript.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexOScript.o: \
 	../lexers/LexOScript.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1082,9 +1082,9 @@ $(DIR_O)/LexPascal.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPascal.o: \
 	../lexers/LexPascal.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1094,9 +1094,9 @@ $(DIR_O)/LexPB.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPB.o: \
 	../lexers/LexPB.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1106,9 +1106,9 @@ $(DIR_O)/LexPerl.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPerl.o: \
 	../lexers/LexPerl.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1119,9 +1119,9 @@ $(DIR_O)/LexPLM.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexPLM.o: \
 	../lexers/LexPLM.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1131,9 +1131,9 @@ $(DIR_O)/LexPO.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPO.o: \
 	../lexers/LexPO.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1143,9 +1143,9 @@ $(DIR_O)/LexPOV.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPOV.o: \
 	../lexers/LexPOV.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1155,9 +1155,9 @@ $(DIR_O)/LexPowerPro.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPowerPro.o: \
 	../lexers/LexPowerPro.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1167,9 +1167,9 @@ $(DIR_O)/LexPowerShell.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPowerShell.o: \
 	../lexers/LexPowerShell.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1179,9 +1179,9 @@ $(DIR_O)/LexProgress.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexProgress.o: \
 	../lexers/LexProgress.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1193,9 +1193,9 @@ $(DIR_O)/LexProps.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexProps.o: \
 	../lexers/LexProps.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1205,9 +1205,9 @@ $(DIR_O)/LexPS.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPS.o: \
 	../lexers/LexPS.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1217,9 +1217,9 @@ $(DIR_O)/LexPython.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexPython.o: \
 	../lexers/LexPython.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1233,9 +1233,9 @@ $(DIR_O)/LexR.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexR.o: \
 	../lexers/LexR.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1245,9 +1245,9 @@ $(DIR_O)/LexRaku.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexRaku.o: \
 	../lexers/LexRaku.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1259,9 +1259,9 @@ $(DIR_O)/LexRebol.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexRebol.o: \
 	../lexers/LexRebol.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1271,9 +1271,9 @@ $(DIR_O)/LexRegistry.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexRegistry.o: \
 	../lexers/LexRegistry.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1284,9 +1284,9 @@ $(DIR_O)/LexRuby.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexRuby.o: \
 	../lexers/LexRuby.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1296,9 +1296,9 @@ $(DIR_O)/LexRust.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexRust.o: \
 	../lexers/LexRust.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/PropSetSimple.h \
 	../lexlib/WordList.h \
@@ -1311,9 +1311,9 @@ $(DIR_O)/LexSAS.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexSAS.o: \
 	../lexers/LexSAS.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1323,9 +1323,9 @@ $(DIR_O)/LexScriptol.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexScriptol.o: \
 	../lexers/LexScriptol.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1335,9 +1335,9 @@ $(DIR_O)/LexSmalltalk.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexSmalltalk.o: \
 	../lexers/LexSmalltalk.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1347,9 +1347,9 @@ $(DIR_O)/LexSML.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexSML.o: \
 	../lexers/LexSML.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1359,9 +1359,9 @@ $(DIR_O)/LexSorcus.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexSorcus.o: \
 	../lexers/LexSorcus.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1371,9 +1371,9 @@ $(DIR_O)/LexSpecman.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexSpecman.o: \
 	../lexers/LexSpecman.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1383,9 +1383,9 @@ $(DIR_O)/LexSpice.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexSpice.o: \
 	../lexers/LexSpice.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1395,9 +1395,9 @@ $(DIR_O)/LexSQL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexSQL.o: \
 	../lexers/LexSQL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1410,9 +1410,9 @@ $(DIR_O)/LexStata.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexStata.o: \
 	../lexers/LexStata.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1422,9 +1422,9 @@ $(DIR_O)/LexSTTXT.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexSTTXT.o: \
 	../lexers/LexSTTXT.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1434,9 +1434,9 @@ $(DIR_O)/LexTACL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexTACL.o: \
 	../lexers/LexTACL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1446,9 +1446,9 @@ $(DIR_O)/LexTADS3.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexTADS3.o: \
 	../lexers/LexTADS3.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1458,9 +1458,9 @@ $(DIR_O)/LexTAL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexTAL.o: \
 	../lexers/LexTAL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1470,9 +1470,9 @@ $(DIR_O)/LexTCL.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexTCL.o: \
 	../lexers/LexTCL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1482,9 +1482,9 @@ $(DIR_O)/LexTCMD.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexTCMD.o: \
 	../lexers/LexTCMD.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1494,9 +1494,9 @@ $(DIR_O)/LexTeX.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexTeX.o: \
 	../lexers/LexTeX.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1506,9 +1506,9 @@ $(DIR_O)/LexTxt2tags.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexTxt2tags.o: \
 	../lexers/LexTxt2tags.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1518,9 +1518,9 @@ $(DIR_O)/LexVB.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexVB.o: \
 	../lexers/LexVB.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1530,9 +1530,9 @@ $(DIR_O)/LexVerilog.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexVerilog.o: \
 	../lexers/LexVerilog.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1545,9 +1545,9 @@ $(DIR_O)/LexVHDL.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexVHDL.o: \
 	../lexers/LexVHDL.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1557,9 +1557,9 @@ $(DIR_O)/LexVisualProlog.o: \
 	../lexlib/LexerModule.h
 $(DIR_O)/LexVisualProlog.o: \
 	../lexers/LexVisualProlog.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
@@ -1572,17 +1572,17 @@ $(DIR_O)/LexX12.o: \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexX12.o: \
 	../lexers/LexX12.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/LexerModule.h \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexYAML.o: \
 	../lexers/LexYAML.cxx \
-	../../scintilla/include/ILexer.h \
-	../../scintilla/include/Sci_Position.h \
-	../../scintilla/include/Scintilla.h \
+	$(LOCALBASE)/include/scintilla/ILexer.h \
+	$(LOCALBASE)/include/scintilla/Sci_Position.h \
+	$(LOCALBASE)/include/scintilla/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \




--- src/makefile.orig	2024-04-23 05:51:50 UTC
+++ src/makefile
@@ -44,7 +44,6 @@ ifdef CLANG
 BASE_FLAGS += --std=c++17
 
 ifdef CLANG
-CXX = clang++
 ifdef windir
 # Clang on Win32 uses MSVC headers so will complain about strcpy without this
 DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
@@ -73,9 +72,9 @@ RANLIB ?= ranlib
 
 RANLIB ?= ranlib
 
-SCINTILLA_INCLUDE = ../../scintilla/include
+SCINTILLA_INCLUDE = $(LOCALBASE)/include/scintilla
 
-vpath %.h ../include ../../scintilla/include ../lexlib
+vpath %.h ../include $(LOCALBASE)/include/scintilla ../lexlib
 vpath %.cxx ../src ../lexlib ../lexers
 
 DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)

Added Link Here

(-)b/textproc/lexilla/pkg-descr (+6 lines)
1	Lexilla is a free library of language lexers that can be used with the Scintilla
2	editing component. Originally, this functionality was incorporated inside
3	Scintilla. It has been extracted as a separate project to make it easier for
4	contributors to work on support for new languages and to fix bugs in existing
5	lexers. It also defines a protocol where projects can implement their own
6	lexers and distribute them as they wish.




PORTNAME=	scintilla
DISTVERSION=	5.5.0
PORTREVISION=	2
CATEGORIES=	x11-toolkits
MASTER_SITES=	https://www.scintilla.org/
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}

MAINTAINER=	cyberbotx@cyberbotx.com
COMMENT=	Full-featured free source code editing component for GTK
WWW=		https://www.scintilla.org/

LICENSE=	SCINTILLA
LICENSE_NAME=	License for Lexilla, Scintilla and SciTE
LICENSE_FILE=	${WRKSRC}/../License.txt
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		compiler:c++17-lang cpe gmake gnome iconv pkgconfig tar:tgz

PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
MAKEFILE=	makefile
USE_LDCONFIG=	yes
USE_GNOME=	cairo gdkpixbuf2 gtk30
USE_LDCONFIG=	yes
CFLAGS+=	-DPIC -fpic

MAKEFILE=	makefile
MAKE_ARGS=	GTK3=1
.if defined(WITH_DEBUG)
MAKE_ARGS+=	DEBUG=1
.endif
MAKE_ENV=	LDFLAGS="${LDFLAGS}"

CFLAGS+=	-DPIC -fpic

PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
WRKSRC=		${WRKDIR}/${PORTNAME}/gtk

.include <bsd.port.pre.mk>


	@${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
	${INSTALL_DATA} ${WRKSRC}/../include/*.h \
		${STAGEDIR}${PREFIX}/include/scintilla
	${INSTALL_LIB} ${WRKSRC}/../bin/*.so \
		${STAGEDIR}${PREFIX}/lib

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/x11-toolkits/scintilla/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1601836808	1	TIMESTAMP = 1719352619
2	SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1	2	SHA256 (scintilla550.tgz) = e553e95509f01f92aa157fa02d06a712642e13d69a11ec1a02a7ddf22c406231
3	SIZE (scite445.tgz) = 2777899	3	SIZE (scintilla550.tgz) = 1784060




--- gtk/makefile.orig	2024-03-19 04:36:37 UTC
+++ gtk/makefile
@@ -16,8 +16,6 @@ ifdef CLANG
 
 WARNINGS = -Wpedantic -Wall
 ifdef CLANG

 WARNINGS += -Wno-deprecated-register
 ifdef windir
 # Turn off some warnings that occur when Clang is being used on Windows where it
@@ -34,7 +32,7 @@ SANITIZE = address
 # thread also need to create Position Independent Executable -> search online documentation
 SANITIZE = address
 #SANITIZE = undefined

 endif
 ARFLAGS = rc
 RANLIB ?= ranlib
@@ -68,7 +66,8 @@ COMPLIB=$(basedir)/bin/scintilla.a
 DEL = rm -f
 endif
 COMPLIB=$(basedir)/bin/scintilla.a
-COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
+SONAME=libscintilla.$(SHAREDEXTENSION)
+COMPONENT=$(basedir)/bin/$(SONAME)
 
 vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
 vpath %.c $(srcdir)
@@ -166,7 +165,7 @@ $(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
 	$(RANLIB) $@
 
 $(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
-	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@ $(CONFIGLIB)
 
 # Automatically generate header dependencies with "make depend"
 include deps.mak




# HG changeset patch
# User Neil Hodgson <nyamatongwe@gmail.com>
# Date 1619159850 -36000
#      Fri Apr 23 16:37:30 2021 +1000
# Node ID 790bfd4c0747eb5e0bc4d627a101298207a8421e
# Parent  bf180d712ff771fe40a2d5dc178fa0a15cf14b2d
Remove volatile qualifiers as they cause an error with Clang 12.
The glib documentation shows use without volatile and mentions that -
    While location has a volatile qualifier, this is a historical artifact and
    the pointer passed to it should not be volatile.
https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter

diff -r bf180d712ff7 -r 790bfd4c0747 gtk/ScintillaGTKAccessible.cxx
--- gtk/ScintillaGTKAccessible.cxx	Fri Apr 23 16:05:55 2021 +1000
+++ gtk/ScintillaGTKAccessible.cxx	Fri Apr 23 16:37:30 2021 +1000
@@ -1008,7 +1008,7 @@
 
 // @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 = {
@@ -1099,7 +1099,7 @@
 #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(&registered)) {
 		// Figure out whether accessibility is enabled by looking at the type of the accessible




--- lexilla/src/makefile.orig	2020-05-31 23:08:11 UTC
+++ lexilla/src/makefile
@@ -35,13 +35,13 @@ else
     BASE_FLAGS += -fvisibility=hidden
 endif
 
-LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
+SONAME=$(SHARED_NAME).$(SHAREDEXTENSION)
+LEXILLA=$(DIR_BIN)/$(SONAME)
 LIBLEXILLA=$(DIR_BIN)/liblexilla.a
 
 BASE_FLAGS += --std=c++17
 
 ifdef CLANG
-CXX = clang++
 ifdef windir
 # Clang on Win32 uses MSVC headers so will complain about strcpy without this
 DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
@@ -119,7 +119,7 @@ LEXILLA_OBJS=\
 	$(LEXERS:.cxx=.o)
 
 $(LEXILLA): $(LEXILLA_OBJS) $(VERSION_RESOURCE)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@
 
 $(LIBLEXILLA):  $(LEXILLA_OBJS)
 	$(AR) rc $@ $^




--- src/PositionCache.h.orig	2020-07-18 05:40:22 UTC
+++ src/PositionCache.h
@@ -187,8 +187,8 @@ class PositionCacheEntry { (public)
 	PositionCacheEntry() noexcept;
 	// Copy constructor not currently used, but needed for being element in std::vector.
 	PositionCacheEntry(const PositionCacheEntry &);
+	PositionCacheEntry(PositionCacheEntry &&) noexcept = default;
 	// Deleted so PositionCacheEntry objects can not be assigned.
-	PositionCacheEntry(PositionCacheEntry &&) = delete;
 	void operator=(const PositionCacheEntry &) = delete;
 	void operator=(PositionCacheEntry &&) = delete;
 	~PositionCacheEntry();




--- src/Style.cxx.orig	2020-04-23 01:50:17 UTC
+++ src/Style.cxx
@@ -24,6 +24,11 @@ FontAlias::FontAlias(const FontAlias &other) noexcept 
 	SetID(other.fid);
 }
 
+FontAlias::FontAlias(FontAlias &&other) noexcept : Font() {
+	SetID(other.fid);
+	other.ClearFont();
+}
+
 FontAlias::~FontAlias() {
 	SetID(FontID{});
 	// ~Font will not release the actual font resource since it is now 0




--- src/Style.h.orig	2020-04-23 01:50:17 UTC
+++ src/Style.h
@@ -33,9 +33,9 @@ struct FontSpecification {
 class FontAlias : public Font {
 public:
 	FontAlias() noexcept;
-	// FontAlias objects can not be assigned except for initialization
+	// FontAlias objects can be copy or move constructed but not be assigned
 	FontAlias(const FontAlias &) noexcept;
-	FontAlias(FontAlias &&)  = delete;
+	FontAlias(FontAlias &&) noexcept;
 	FontAlias &operator=(const FontAlias &) = delete;
 	FontAlias &operator=(FontAlias &&) = delete;
 	~FontAlias() override;
@@ -72,7 +72,7 @@ class Style : public FontSpecification, public FontMea
 
 	Style();
 	Style(const Style &source) noexcept;
-	Style(Style &&) = delete;
+	Style(Style &&) noexcept = default;
 	~Style();
 	Style &operator=(const Style &source) noexcept;
 	Style &operator=(Style &&) = delete;

Lines 5-9 styling, error indicators, code completion and call tips. The selection margin Link Here

(-)b/x11-toolkits/scintilla/pkg-descr (-2 / +1 lines)
5	can contain markers like those used in debuggers to indicate breakpoints and the	5	can contain markers like those used in debuggers to indicate breakpoints and the
6	current line. Styling choices are more open than with many editors, allowing the	6	current line. Styling choices are more open than with many editors, allowing the
7	use of proportional fonts, bold and italics, multiple foreground and background	7	use of proportional fonts, bold and italics, multiple foreground and background
8	colours and multiple fonts. It comes with complete source code and may be used	8	colours and multiple fonts.
9	in any free project or commercial product.

Lines 1-9 Link Here

(-)b/x11-toolkits/scintilla/pkg-plist (-3 / +4 lines)
1	include/scintilla/ILexer.h	1	include/scintilla/ILexer.h
2	include/scintilla/ILoader.h	2	include/scintilla/ILoader.h
3	include/scintilla/Platform.h
4	include/scintilla/Sci_Position.h	3	include/scintilla/Sci_Position.h
5	include/scintilla/SciLexer.h
6	include/scintilla/Scintilla.h	4	include/scintilla/Scintilla.h
		5	include/scintilla/ScintillaCall.h
		6	include/scintilla/ScintillaMessages.h
		7	include/scintilla/ScintillaStructures.h
		8	include/scintilla/ScintillaTypes.h
7	include/scintilla/ScintillaWidget.h	9	include/scintilla/ScintillaWidget.h
8	lib/liblexilla.so
9	lib/libscintilla.so	10	lib/libscintilla.so

Return to bug 279995

Lines 1-8 Link Here

(-)b/editors/scite/Makefile (-17 / +24 lines)
1	PORTNAME= scite	1	PORTNAME= scite
2	DISTVERSION= 4.4.5	2	DISTVERSION= 5.5.0
3	PORTREVISION= 3
4	CATEGORIES= editors gnome	3	CATEGORIES= editors gnome
5	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	4	MASTER_SITES= https://www.scintilla.org/
6	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}	5	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
7		6
8	MAINTAINER= cyberbotx@cyberbotx.com	7	MAINTAINER= cyberbotx@cyberbotx.com
Lines 10-28 COMMENT= Full-featured SCIntilla based text editor for GTK/GNOME Link Here
10	WWW= https://www.scintilla.org/SciTE.html	9	WWW= https://www.scintilla.org/SciTE.html
11		10
12	LICENSE= SCINTILLA	11	LICENSE= SCINTILLA
13	LICENSE_NAME= License for Scintilla and SciTE	12	LICENSE_NAME= License for Lexilla, Scintilla and SciTE
14	LICENSE_FILE= ${WRKSRC}/../License.txt	13	LICENSE_FILE= ${WRKSRC}/../License.txt
15	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
16		15
17	LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla	16	LIB_DEPENDS= liblexilla.so:textproc/lexilla \
		17	libscintilla.so:x11-toolkits/scintilla
18	RUN_DEPENDS= xdg-open:devel/xdg-utils	18	RUN_DEPENDS= xdg-open:devel/xdg-utils
19		19
20	USES= compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig tar:tgz	20	USES= compiler:c++20-lang desktop-file-utils gmake gnome pkgconfig \
21		21	tar:tgz
22	OPTIONS_DEFINE= DOCS
23
24	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}
25	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
26		22
27	USE_GNOME= cairo gdkpixbuf2 gtk30	23	USE_GNOME= cairo gdkpixbuf2 gtk30
28	MAKEFILE= makefile	24	MAKEFILE= makefile
Lines 31-39 MAKE_ARGS= GTK3=1 Link Here
31	MAKE_ARGS+= DEBUG=1	27	MAKE_ARGS+= DEBUG=1
32	.endif	28	.endif
33		29
		30	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}
		31	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
		32
34	PORTDATA= *.properties	33	PORTDATA= *.properties
35	PORTDOCS= .html .jpg *.png	34	PORTDOCS= .html .jpg *.png
36		35
		36	OPTIONS_DEFINE= DOCS
		37
37	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
38		39
39	.if ${CHOSEN_COMPILER_TYPE} == clang	40	.if ${CHOSEN_COMPILER_TYPE} == clang
Lines 45-56 post-patch: Link Here
45	${WRKSRC}/../src/SciTEGlobal.properties	46	${WRKSRC}/../src/SciTEGlobal.properties
46		47
47	do-install:	48	do-install:
48	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin	49	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE \
		50	${STAGEDIR}${PREFIX}/bin
49	${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite	51	${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite
50	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${PREFIX}/share/man/man1	52	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 \
51	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications	53	${STAGEDIR}${PREFIX}/share/man/man1
52	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps	54	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop \
53	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})	55	${STAGEDIR}${PREFIX}/share/applications
54	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})	56	${INSTALL_DATA} ${WRKSRC}/Sci48M.png \
		57	${STAGEDIR}${PREFIX}/share/pixmaps
		58	(cd ${WRKSRC}/../src && \
		59	${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
		60	(cd ${WRKSRC}/../doc && \
		61	${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
55		62
56	.include <bsd.port.post.mk>	63	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)b/editors/scite/files/patch-gtk_makefile (-11 / +11 lines)
1	--- gtk/makefile.orig 2020-09-11 10:44:44 UTC	1	--- gtk/makefile.orig 2024-03-19 04:36:42 UTC
2	+++ gtk/makefile	2	+++ gtk/makefile
3	@@ -18,9 +18,7 @@ ifdef CLANG	3	@@ -19,9 +19,7 @@ SANITIZE = address
4	# thread also need to create Position Independent Executable -> search online documentation	4	# thread also need to create Position Independent Executable -> search online documentation
5	SANITIZE = address	5	SANITIZE = address
6	#SANITIZE = undefined	6	#SANITIZE = undefined
Lines 11-33 Link Here
11	WARNINGS += -Wno-deprecated-register	11	WARNINGS += -Wno-deprecated-register
12	WARNINGS += -Wno-empty-body	12	WARNINGS += -Wno-empty-body
13	else	13	else
14	@@ -59,7 +57,7 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a	14	@@ -60,7 +58,7 @@ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
15	COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)	15	COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
16	LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)	16	LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
17		17
18	-all: $(PROG) $(COMPONENT) $(LEXILLA)	18	-all: $(PROG) $(COMPONENT) $(LEXILLA)
19	+all: $(PROG)	19	+all: $(PROG)
20		20
21	vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include	21	vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_DIR)/include
22	vpath %.cxx $(srcdir) $(srcdir)/../src	22	vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access $(SCINTILLA_DIR)/call
23	@@ -151,7 +149,9 @@ SRC_OBJS = \	23	@@ -156,7 +154,9 @@ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o Directo
24	Utf8_16.o	24	Utf8_16.o
25		25
26	$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)	26	$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
27	- $(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)	27	- $(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)
28	+ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic \	28	+ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--undefined-version \
29	+ -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ -lscintilla \	29	+ -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers \
30	+ -Wl,--as-needed $(CONFIGLIB)	30	+ $^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla -llexilla $(LDLIBS)
31		31
32	# Automatically generate header dependencies with "make deps"	32	# Automatically generate header dependencies with "make depend"
33	include deps.mak	33	include deps.mak

Added Link Here

(-)b/textproc/lexilla/Makefile (+51 lines)
1	PORTNAME= lexilla
2	DISTVERSION= 5.3.2
3	CATEGORIES= textproc
4	MASTER_SITES= https://www.scintilla.org/
5	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
6
7	MAINTAINER= cyberbotx@cyberbotx.com
8	COMMENT= Free library of language lexers
9	WWW= https://www.scintilla.org/Lexilla.html
10
11	LICENSE= SCINTILLA
12	LICENSE_NAME= License for Lexilla, Scintilla and SciTE
13	LICENSE_FILE= ${WRKSRC}/../License.txt
14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
15
16	#LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla
17	BUILD_DEPENDS= scintilla>0:x11-toolkits/scintilla
18
19	USES= compiler:c++17-lang cpe gmake gnome iconv pkgconfig tar:tgz
20
21	USE_LDCONFIG= yes
22
23	MAKEFILE= makefile
24	.if defined(WITH_DEBUG)
25	MAKE_ARGS+= DEBUG=1
26	.endif
27	MAKE_ENV= LDFLAGS="${LDFLAGS}"
28
29	CFLAGS+= -DPIC -fpic
30
31	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}
32	WRKSRC= ${WRKDIR}/${PORTNAME}/src
33
34	PLIST_FILES= include/lexilla/Lexilla.h \
35	include/lexilla/SciLexer.h \
36	lib/liblexilla.so
37
38	.include <bsd.port.pre.mk>
39
40	.if ${CHOSEN_COMPILER_TYPE} == clang
41	MAKE_ARGS+= CLANG=1
42	.endif
43
44	do-install:
45	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lexilla
46	${INSTALL_DATA} ${WRKSRC}/../include/*.h \
47	${STAGEDIR}${PREFIX}/include/lexilla
48	${INSTALL_LIB} ${WRKSRC}/../bin/*.so \
49	${STAGEDIR}${PREFIX}/lib
50
51	.include <bsd.port.post.mk>

Added Link Here

(-)b/textproc/lexilla/files/patch-src_makefile (+22 lines)
1	--- src/makefile.orig 2024-04-23 05:51:50 UTC
2	+++ src/makefile
3	@@ -44,7 +44,6 @@ ifdef CLANG
4	BASE_FLAGS += --std=c++17
5
6	ifdef CLANG
7	-CXX = clang++
8	ifdef windir
9	# Clang on Win32 uses MSVC headers so will complain about strcpy without this
10	DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
11	@@ -73,9 +72,9 @@ RANLIB ?= ranlib
12
13	RANLIB ?= ranlib
14
15	-SCINTILLA_INCLUDE = ../../scintilla/include
16	+SCINTILLA_INCLUDE = $(LOCALBASE)/include/scintilla
17
18	-vpath %.h ../include ../../scintilla/include ../lexlib
19	+vpath %.h ../include $(LOCALBASE)/include/scintilla ../lexlib
20	vpath %.cxx ../src ../lexlib ../lexers
21
22	DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)

Lines 1-33 Link Here

(-)b/x11-toolkits/scintilla/Makefile (-12 / +14 lines)
1	PORTNAME= scintilla	1	PORTNAME= scintilla
2	DISTVERSION= 4.4.5	2	DISTVERSION= 5.5.0
3	PORTREVISION= 2
4	CATEGORIES= x11-toolkits	3	CATEGORIES= x11-toolkits
5	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	4	MASTER_SITES= https://www.scintilla.org/
6	DISTNAME= scite${PORTVERSION:S/.//g}	5	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
7		6
8	MAINTAINER= cyberbotx@cyberbotx.com	7	MAINTAINER= cyberbotx@cyberbotx.com
9	COMMENT= Full-featured free source code editing component for GTK	8	COMMENT= Full-featured free source code editing component for GTK
10	WWW= https://www.scintilla.org/	9	WWW= https://www.scintilla.org/
11		10
12	LICENSE= SCINTILLA	11	LICENSE= SCINTILLA
13	LICENSE_NAME= License for Scintilla and SciTE	12	LICENSE_NAME= License for Lexilla, Scintilla and SciTE
14	LICENSE_FILE= ${WRKSRC}/../License.txt	13	LICENSE_FILE= ${WRKSRC}/../License.txt
15	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
16		15
17	USES= compiler:c++17-lang cpe gmake gnome iconv pkgconfig tar:tgz	16	USES= compiler:c++17-lang cpe gmake gnome iconv pkgconfig tar:tgz
18		17
19	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}
20	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
21	MAKEFILE= makefile
22	USE_LDCONFIG= yes
23	USE_GNOME= cairo gdkpixbuf2 gtk30	18	USE_GNOME= cairo gdkpixbuf2 gtk30
24	MAKE_ENV= LDFLAGS="${LDFLAGS}"	19	USE_LDCONFIG= yes
25	CFLAGS+= -DPIC -fpic
26		20
		21	MAKEFILE= makefile
27	MAKE_ARGS= GTK3=1	22	MAKE_ARGS= GTK3=1
28	.if defined(WITH_DEBUG)	23	.if defined(WITH_DEBUG)
29	MAKE_ARGS+= DEBUG=1	24	MAKE_ARGS+= DEBUG=1
30	.endif	25	.endif
		26	MAKE_ENV= LDFLAGS="${LDFLAGS}"
		27
		28	CFLAGS+= -DPIC -fpic
		29
		30	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}
		31	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
31		32
32	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
33		34
Lines 39-44 do-install: Link Here
39	@${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla	40	@${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
40	${INSTALL_DATA} ${WRKSRC}/../include/*.h \	41	${INSTALL_DATA} ${WRKSRC}/../include/*.h \
41	${STAGEDIR}${PREFIX}/include/scintilla	42	${STAGEDIR}${PREFIX}/include/scintilla
42	${INSTALL_LIB} ${WRKSRC}/../bin/*.so ${STAGEDIR}${PREFIX}/lib	43	${INSTALL_LIB} ${WRKSRC}/../bin/*.so \
		44	${STAGEDIR}${PREFIX}/lib
43		45
44	.include <bsd.port.post.mk>	46	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)b/x11-toolkits/scintilla/files/patch-gtk_makefile (-10 / +10 lines)
1	--- gtk/makefile.orig 2020-09-11 10:44:28 UTC	1	--- gtk/makefile.orig 2024-03-19 04:36:37 UTC
2	+++ gtk/makefile	2	+++ gtk/makefile
3	@@ -16,8 +16,6 @@ basedir = $(srcdir)/..	3	@@ -16,8 +16,6 @@ ifdef CLANG
4		4
5	WARNINGS = -Wpedantic -Wall	5	WARNINGS = -Wpedantic -Wall
6	ifdef CLANG	6	ifdef CLANG
Lines 9-15 Link Here
9	WARNINGS += -Wno-deprecated-register	9	WARNINGS += -Wno-deprecated-register
10	ifdef windir	10	ifdef windir
11	# Turn off some warnings that occur when Clang is being used on Windows where it	11	# Turn off some warnings that occur when Clang is being used on Windows where it
12	@@ -35,7 +33,7 @@ endif	12	@@ -34,7 +32,7 @@ SANITIZE = address
13	# thread also need to create Position Independent Executable -> search online documentation	13	# thread also need to create Position Independent Executable -> search online documentation
14	SANITIZE = address	14	SANITIZE = address
15	#SANITIZE = undefined	15	#SANITIZE = undefined
Lines 18-39 Link Here
18	endif	18	endif
19	ARFLAGS = rc	19	ARFLAGS = rc
20	RANLIB ?= ranlib	20	RANLIB ?= ranlib
21	@@ -69,7 +67,8 @@ DEL = rm -f	21	@@ -68,7 +66,8 @@ COMPLIB=$(basedir)/bin/scintilla.a
22	LEXILLA = liblexilla.so	22	DEL = rm -f
23	endif	23	endif
24	COMPLIB=$(basedir)/bin/scintilla.a	24	COMPLIB=$(basedir)/bin/scintilla.a
25	-COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)	25	-COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
26	+SONAME=libscintilla.$(SHAREDEXTENSION)	26	+SONAME=libscintilla.$(SHAREDEXTENSION)
27	+COMPONENT=$(basedir)/bin/$(SONAME)	27	+COMPONENT=$(basedir)/bin/$(SONAME)
28		28
29	vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib	29	vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
30	vpath %.c $(srcdir)	30	vpath %.c $(srcdir)
31	@@ -185,7 +184,7 @@ $(COMPLIB): $(SRC_OBJS) $(LEXLIBL_OBJS) $(GTK_OBJS) $(	31	@@ -166,7 +165,7 @@ $(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
32	$(RANLIB) $@	32	$(RANLIB) $@
33		33
34	$(COMPONENT): $(SRC_OBJS) $(LEXLIBS_OBJS) $(GTK_OBJS) $(MARSHALLER)	34	$(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
35	- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)	35	- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
36	+ $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@ $(CONFIGLIB)	36	+ $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@ $(CONFIGLIB)
37		37
38	Catalogue.o: Catalogue.cxx	38	# Automatically generate header dependencies with "make depend"
39	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@	39	include deps.mak

Removed Link Here

(-)a/x11-toolkits/scintilla/files/patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 (-33 lines)
1	# HG changeset patch
2	# User Neil Hodgson <nyamatongwe@gmail.com>
3	# Date 1619159850 -36000
4	# Fri Apr 23 16:37:30 2021 +1000
5	# Node ID 790bfd4c0747eb5e0bc4d627a101298207a8421e
6	# Parent bf180d712ff771fe40a2d5dc178fa0a15cf14b2d
7	Remove volatile qualifiers as they cause an error with Clang 12.
8	The glib documentation shows use without volatile and mentions that -
9	While location has a volatile qualifier, this is a historical artifact and
10	the pointer passed to it should not be volatile.
11	https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
12
13	diff -r bf180d712ff7 -r 790bfd4c0747 gtk/ScintillaGTKAccessible.cxx
14	--- gtk/ScintillaGTKAccessible.cxx Fri Apr 23 16:05:55 2021 +1000
15	+++ gtk/ScintillaGTKAccessible.cxx Fri Apr 23 16:37:30 2021 +1000
16	@@ -1008,7 +1008,7 @@
17
18	// @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
19	static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
20	- static volatile gsize type_id_result = 0;
21	+ static gsize type_id_result = 0;
22
23	if (g_once_init_enter(&type_id_result)) {
24	GTypeInfo tinfo = {
25	@@ -1099,7 +1099,7 @@
26	#if HAVE_GTK_A11Y_H // just instantiate the accessible
27	*cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
28	#elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
29	- static volatile gsize registered = 0;
30	+ static gsize registered = 0;
31
32	if (g_once_init_enter(&registered)) {
33	// Figure out whether accessibility is enabled by looking at the type of the accessible

Removed Link Here

(-)a/x11-toolkits/scintilla/files/patch-lexilla_src_makefile (-27 lines)
1	--- lexilla/src/makefile.orig 2020-05-31 23:08:11 UTC
2	+++ lexilla/src/makefile
3	@@ -35,13 +35,13 @@ else
4	BASE_FLAGS += -fvisibility=hidden
5	endif
6
7	-LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
8	+SONAME=$(SHARED_NAME).$(SHAREDEXTENSION)
9	+LEXILLA=$(DIR_BIN)/$(SONAME)
10	LIBLEXILLA=$(DIR_BIN)/liblexilla.a
11
12	BASE_FLAGS += --std=c++17
13
14	ifdef CLANG
15	-CXX = clang++
16	ifdef windir
17	# Clang on Win32 uses MSVC headers so will complain about strcpy without this
18	DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
19	@@ -119,7 +119,7 @@ LEXILLA_OBJS=\
20	$(LEXERS:.cxx=.o)
21
22	$(LEXILLA): $(LEXILLA_OBJS) $(VERSION_RESOURCE)
23	- $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
24	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@
25
26	$(LIBLEXILLA): $(LEXILLA_OBJS)
27	$(AR) rc $@ $^

Removed Link Here

(-)a/x11-toolkits/scintilla/files/patch-src_PositionCache.h (-12 lines)
1	--- src/PositionCache.h.orig 2020-07-18 05:40:22 UTC
2	+++ src/PositionCache.h
3	@@ -187,8 +187,8 @@ class PositionCacheEntry { (public)
4	PositionCacheEntry() noexcept;
5	// Copy constructor not currently used, but needed for being element in std::vector.
6	PositionCacheEntry(const PositionCacheEntry &);
7	+ PositionCacheEntry(PositionCacheEntry &&) noexcept = default;
8	// Deleted so PositionCacheEntry objects can not be assigned.
9	- PositionCacheEntry(PositionCacheEntry &&) = delete;
10	void operator=(const PositionCacheEntry &) = delete;
11	void operator=(PositionCacheEntry &&) = delete;
12	~PositionCacheEntry();

Removed Link Here

(-)a/x11-toolkits/scintilla/files/patch-src_Style.cxx (-14 lines)
1	--- src/Style.cxx.orig 2020-04-23 01:50:17 UTC
2	+++ src/Style.cxx
3	@@ -24,6 +24,11 @@ FontAlias::FontAlias(const FontAlias &other) noexcept
4	SetID(other.fid);
5	}
6
7	+FontAlias::FontAlias(FontAlias &&other) noexcept : Font() {
8	+ SetID(other.fid);
9	+ other.ClearFont();
10	+}
11	+
12	FontAlias::~FontAlias() {
13	SetID(FontID{});
14	// ~Font will not release the actual font resource since it is now 0

Removed Link Here

(-)a/x11-toolkits/scintilla/files/patch-src_Style.h (-23 lines)
1	--- src/Style.h.orig 2020-04-23 01:50:17 UTC
2	+++ src/Style.h
3	@@ -33,9 +33,9 @@ struct FontSpecification {
4	class FontAlias : public Font {
5	public:
6	FontAlias() noexcept;
7	- // FontAlias objects can not be assigned except for initialization
8	+ // FontAlias objects can be copy or move constructed but not be assigned
9	FontAlias(const FontAlias &) noexcept;
10	- FontAlias(FontAlias &&) = delete;
11	+ FontAlias(FontAlias &&) noexcept;
12	FontAlias &operator=(const FontAlias &) = delete;
13	FontAlias &operator=(FontAlias &&) = delete;
14	~FontAlias() override;
15	@@ -72,7 +72,7 @@ class Style : public FontSpecification, public FontMea
16
17	Style();
18	Style(const Style &source) noexcept;
19	- Style(Style &&) = delete;
20	+ Style(Style &&) noexcept = default;
21	~Style();
22	Style &operator=(const Style &source) noexcept;
23	Style &operator=(Style &&) = delete;