This updates Scintilla and SciTE to the latest version.
Most of this diff is from Michael Warmuth-Uhl
<michael.warmuth-...@suljee.de>, tested on amd64 by me. I'm
dropping MAINTAINER since I rarely use SciTE anymore.
I plan to commit this in a couple days unless I hear objections.
Thanks,
Jeremy
Index: scintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- scintilla/Makefile 11 Mar 2013 11:02:50 -0000 1.17
+++ scintilla/Makefile 14 Jan 2015 01:49:41 -0000
@@ -2,17 +2,15 @@
COMMENT= source code editing component for GTK+
-VERSION= 3.0.0
+VERSION= 3.5.2
DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
CATEGORIES= editors x11
-SHARED_LIBS= scintilla 8.0 \
- scintilla_lexers 8.0
+SHARED_LIBS= scintilla 9.0 \
+ scintilla_lexers 9.0
HOMEPAGE= http://www.scintilla.org/
-
-MAINTAINER= Jeremy Evans <jer...@openbsd.org>
# old Python license
PERMIT_PACKAGE_CDROM= may not sell
Index: scintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- scintilla/distinfo 15 Nov 2011 19:13:39 -0000 1.9
+++ scintilla/distinfo 14 Jan 2015 01:38:06 -0000
@@ -1,5 +1,2 @@
-MD5 (scintilla300.tgz) = nbe52Jt1TFDtMv0qdy8nXw==
-RMD160 (scintilla300.tgz) = easWsivZFm96Zz1fW5LoY50pGqg=
-SHA1 (scintilla300.tgz) = cv+QQptD26+J1dpqR352+Unip1Q=
-SHA256 (scintilla300.tgz) = E7r1xM0jVkwdVPnseIy4VAXyZm+0MX9NMqZ+ngsGQWs=
-SIZE (scintilla300.tgz) = 969138
+SHA256 (scintilla352.tgz) = OXcagL2B/HpLuN07vZ8x5d3c/547xfRiYD46N+ei3Fw=
+SIZE (scintilla352.tgz) = 1360555
Index: scintilla/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-gtk_makefile
--- scintilla/patches/patch-gtk_makefile 15 Nov 2011 19:13:39 -0000
1.9
+++ scintilla/patches/patch-gtk_makefile 14 Jan 2015 01:38:06 -0000
@@ -1,23 +1,25 @@
$OpenBSD: patch-gtk_makefile,v 1.9 2011/11/15 19:13:39 jeremy Exp $
---- gtk/makefile.orig Mon Aug 1 04:49:04 2011
-+++ gtk/makefile Tue Nov 15 19:33:22 2011
-@@ -6,14 +6,7 @@
+--- gtk/makefile.orig Thu Nov 27 21:47:24 2014
++++ gtk/makefile Mon Dec 22 23:52:04 2014
+@@ -6,15 +6,8 @@
# Builds for GTK+ 2 and no longer supports GTK+ 1.
# Also works with ming32-make on Windows.
-.SUFFIXES: .cxx .c .o .h .a
-ifdef CLANG
+-CXX = clang++ -Wno-deprecated-register
-CC = clang
--CCOMP = clang
--else
--CC = g++
--CCOMP = gcc
+-# 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
-endif
+.SUFFIXES: .cxx .c .o .h .a .so
- AR = ar
++AR = ar
RANLIB = touch
-@@ -36,17 +29,20 @@ DEL = del /q
+ ifdef GTK3
+@@ -36,17 +29,20 @@
COMPLIB=..\bin\scintilla.a
else
DEL = rm -f
@@ -32,37 +34,39 @@ $OpenBSD: patch-gtk_makefile,v 1.9 2011/
vpath %.cxx ../src ../lexlib ../lexers
-INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
-+INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I${LOCALBASE}/include
++INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I${LOCALBASE}/include
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
endif
--CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
-+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED)
+-CXXBASEFLAGS=-Wall -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-Wall -pedantic -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS)
$(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
-@@ -57,7 +53,7 @@ endif
- ifdef DEBUG
- CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
+@@ -65,24 +61,48 @@
+ CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
+ endif
else
--CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
+-CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
++CTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- CFLAGS:=$(CXXFLAGS)
-@@ -66,28 +62,62 @@ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)
+ CFLAGS:=$(CTFLAGS)
+-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
++CXXTFLAGS:=$(CTFLAGS) $(REFLAGS)
+
+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
MARSHALLER=scintilla-marshal.o
.cxx.o:
-- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
-+ $(CXX) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
+ $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
+.cxx.so:
-+ $(CXX) -fPIC $(CONFIGFLAGS) $(CXXFLAGS) -o $@ -c $<
++ $(CXX) -fPIC $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -o $@ -c $<
.c.o:
-- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
-+ $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+ $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+.c.so:
+ $(CC) -fPIC $(CONFIGFLAGS) $(CFLAGS) -w -o $@ -c $<
++
LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
@@ -72,10 +76,10 @@ $OpenBSD: patch-gtk_makefile,v 1.9 2011/
+else
+all: static shared
+endif
-
++
+static: $(COMPLIB) $(LEXERLIB)
+shared: $(SHAREDLIB) $(SHAREDLEXER)
-+
+
+install: install-shared
+ mkdir -p ${PREFIX}/include/scintilla
+ install -m 444 ../include/*.h ${PREFIX}/include/scintilla
@@ -89,17 +93,18 @@ $OpenBSD: patch-gtk_makefile,v 1.9 2011/
+endif
+
clean:
- $(DEL) *.o $(COMPLIB)
+ $(DEL) *.o $(COMPLIB) *.plist
+@@ -92,15 +112,26 @@
deps:
-- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-+ $(CXX) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx
../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z]
>deps.mak
-$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o
StyleContext.o WordList.o \
+LIBOBJS = Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o
StyleContext.o WordList.o \
- CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o \
- ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o
PropSetSimple.o PlatGTK.o \
- KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o
ViewStyle.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 CellBuffer.o
CharacterCategory.o ViewStyle.o \
RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o
UniConversion.o XPM.o \
$(MARSHALLER) $(LEXOBJS)
+
Index: scite/Makefile
===================================================================
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- scite/Makefile 11 Mar 2013 11:02:50 -0000 1.23
+++ scite/Makefile 14 Jan 2015 01:45:08 -0000
@@ -2,14 +2,12 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 3.0.0
+VERSION= 3.5.2
DISTNAME= scite${VERSION:S/.//g}
PKGNAME= scite-${VERSION}
CATEGORIES= editors x11
HOMEPAGE= http://www.scintilla.org/SciTE.html
-
-MAINTAINER= Jeremy Evans <jer...@openbsd.org>
# old Python license
PERMIT_PACKAGE_CDROM= may not sell
Index: scite/distinfo
===================================================================
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- scite/distinfo 15 Nov 2011 19:17:09 -0000 1.9
+++ scite/distinfo 14 Jan 2015 01:38:06 -0000
@@ -1,5 +1,2 @@
-MD5 (scite300.tgz) = Ni+eXcn1wLiWoxNXn6TZNg==
-RMD160 (scite300.tgz) = iuS4OgOZsrm2MiIQVkBIF/6IYxc=
-SHA1 (scite300.tgz) = l7Jhb32Ao6zOmE3upbi1G4+7+Vg=
-SHA256 (scite300.tgz) = Wy9wVYRVpTIp3Y1qKE0ddWg5nvNOE1Kx8a9CRQ+ZzhE=
-SIZE (scite300.tgz) = 1811007
+SHA256 (scite352.tgz) = 0bmhLxuOqA8oVkoWlRRqWbSgMJnIyoaT46nOArsKKDY=
+SIZE (scite352.tgz) = 2277393
Index: scite/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-gtk_makefile
--- scite/patches/patch-gtk_makefile 15 Nov 2011 19:17:09 -0000 1.6
+++ scite/patches/patch-gtk_makefile 14 Jan 2015 01:38:06 -0000
@@ -1,23 +1,23 @@
-$OpenBSD: patch-gtk_makefile,v 1.6 2011/11/15 19:17:09 jeremy Exp $
---- gtk/makefile.orig Fri Sep 16 11:14:07 2011
-+++ gtk/makefile Tue Nov 15 19:30:57 2011
-@@ -5,13 +5,6 @@
+--- gtk/makefile.orig Sun Aug 10 01:52:11 2014
++++ gtk/makefile Mon Dec 22 23:03:04 2014
+@@ -5,14 +5,6 @@
# GNU make does not like \r\n line endings so should be saved to CVS in
binary form.
.SUFFIXES: .cxx .o .h .a .c
-ifdef CLANG
--CC = clang
--CCOMP = clang
--else
--CC = g++
--CCOMP = gcc
+-# 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) --std=c++0x -Wno-deprecated-register
+-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
-endif
- AR = ar
ifdef GTK3
-@@ -24,20 +17,21 @@ endif
+ GTKVERSION=gtk+-3.0
+@@ -24,20 +16,21 @@
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
- CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
+ 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)
@@ -40,7 +40,7 @@ $OpenBSD: patch-gtk_makefile,v 1.6 2011/
PROG = ../bin/SciTE
-@@ -46,19 +40,21 @@ all: $(PROG)
+@@ -46,19 +39,21 @@
vpath %.h ../src ../../scintilla/include
vpath %.cxx ../src
@@ -49,8 +49,8 @@ $OpenBSD: patch-gtk_makefile,v 1.6 2011/
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
endif
--CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
-+CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Dunix -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
+-CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-W -Wall -pedantic -Dunix -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -67,7 +67,7 @@ $OpenBSD: patch-gtk_makefile,v 1.6 2011/
LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
ltable.o ltm.o lundump.o lvm.o lzio.o
-@@ -70,10 +66,10 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_O
+@@ -70,7 +65,7 @@
vpath %.c ../lua/src ../lua/src/lib
@@ -75,40 +75,28 @@ $OpenBSD: patch-gtk_makefile,v 1.6 2011/
+INCLUDEDIRS+=-I../lua/include
.c.o:
-- $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o
$@
-+ $(CC) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
-
- else
- CXXFLAGS+=-DNO_LUA
-@@ -90,22 +86,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
- endif
-
- .cxx.o:
-- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
-+ $(CXX) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
-
- clean:
- rm -f *.o $(PROG)
-
+ $(CC) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
+@@ -106,15 +101,12 @@
deps:
-- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-+ $(CXX) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-# make should be run in ../../scintilla/gtk to compile all the lexers.
-COMPLIB=../../scintilla/bin/scintilla.a
-
$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
--FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o
Exporters.o StringHelpers.o \
--PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleWriter.o Utf8_16.o \
-+ FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o
Exporters.o StringHelpers.o \
-+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleWriter.o Utf8_16.o \
+-FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o
SciTEIO.o StringList.o \
+-Exporters.o MatchMarker.o StringHelpers.o \
+-PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleDefinition.o StyleWriter.o Utf8_16.o \
++ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o
SciTEIO.o StringList.o \
++ Exporters.o MatchMarker.o StringHelpers.o \
++ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleDefinition.o StyleWriter.o Utf8_16.o \
JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
-- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script
lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
-+ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
+- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed
-Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
++ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
# Automatically generate header dependencies with "make deps"
include deps.mak
-@@ -114,19 +107,18 @@ include deps.mak
+@@ -123,19 +115,18 @@
# This is OK - just means no SciTE in the Gnome Applications menu
# Dead: install -D SciTEGTK.properties
$(SYSCONF_PATH)/SciTEGlobal.properties
install:
