Forgot that I had already dropped maintainership of Scintilla and SciTE
until after I promised landry@ I'd update them. Almost all the
patches broke and had to be manually reapplied.
Briefly tested on amd64. If anyone is intresting in taking over
maintainership, don't be shy.
Thanks,
Jeremy
Index: scintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- scintilla/Makefile 26 Jul 2017 22:45:19 -0000 1.25
+++ scintilla/Makefile 1 Nov 2017 14:27:26 -0000
@@ -2,14 +2,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 3.5.2
+VERSION= 4.0.2
DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
CATEGORIES= editors x11
-REVISION= 3
-SHARED_LIBS= scintilla 9.0 \
- scintilla_lexers 9.0
+SHARED_LIBS= scintilla 10.0 \
+ scintilla_lexers 10.0
HOMEPAGE= http://www.scintilla.org/
@@ -17,7 +16,7 @@ HOMEPAGE= http://www.scintilla.org/
PERMIT_PACKAGE_CDROM= may not sell
PERMIT_PACKAGE_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
+MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tgz
PATCHORIG= .orig.port
Index: scintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- scintilla/distinfo 17 Jan 2015 05:06:12 -0000 1.10
+++ scintilla/distinfo 1 Nov 2017 14:28:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (scintilla352.tgz) = OXcagL2B/HpLuN07vZ8x5d3c/547xfRiYD46N+ei3Fw=
-SIZE (scintilla352.tgz) = 1360555
+SHA256 (scintilla402.tgz) = h9lhB0zWRvp/kuPUiMsStqLQg4oZRLVsuVeNhXG7vU4=
+SIZE (scintilla402.tgz) = 1401547
Index: scintilla/patches/patch-gtk_ScintillaGTK_cxx
===================================================================
RCS file: scintilla/patches/patch-gtk_ScintillaGTK_cxx
diff -N scintilla/patches/patch-gtk_ScintillaGTK_cxx
--- scintilla/patches/patch-gtk_ScintillaGTK_cxx 2 May 2017 20:48:21
-0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gtk_ScintillaGTK_cxx,v 1.4 2017/05/02 20:48:21 fcambus Exp $
-
-Fix build with Clang. Patch from Scintilla 3.7.4.
-
---- gtk/ScintillaGTK.cxx.orig
-+++ gtk/ScintillaGTK.cxx
-@@ -1637,7 +1637,7 @@ void ScintillaGTK::ReceivedDrop(GtkSelectionData *sele
- drop.push_back('\0');
- NotifyURIDropped(&drop[0]);
- } else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) ||
(TypeOfGSD(selection_data) == atomUTF8)) {
-- if (TypeOfGSD(selection_data) > 0) {
-+ if (LengthOfGSD(selection_data) > 0) {
- SelectionText selText;
- GetGtkSelectionText(selection_data, selText);
- DropAt(posDrop, selText.Data(), selText.Length(),
false, selText.rectangular);
Index: scintilla/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-gtk_makefile
--- scintilla/patches/patch-gtk_makefile 11 Mar 2016 18:13:19 -0000
1.12
+++ scintilla/patches/patch-gtk_makefile 1 Nov 2017 15:47:27 -0000
@@ -1,53 +1,56 @@
$OpenBSD: patch-gtk_makefile,v 1.12 2016/03/11 18:13:19 naddy Exp $
-Drop `-pedantic'
-/usr/local/include/gtk-3.0/gdk/gdktypes.h:318: error: comma at end of
enumerator list
-
---- gtk/makefile.orig Thu Nov 27 21:47:24 2014
-+++ gtk/makefile Fri Mar 11 18:05:48 2016
-@@ -6,15 +6,8 @@
- # Builds for GTK+ 2 and no longer supports GTK+ 1.
- # Also works with ming32-make on Windows.
+Index: gtk/makefile
+--- gtk/makefile.orig
++++ gtk/makefile
+@@ -8,19 +8,9 @@
--.SUFFIXES: .cxx .c .o .h .a
+ srcdir ?= .
+
+-.SUFFIXES: .cxx .c .o .h .a .list
-ifdef CLANG
--CXX = clang++ -Wno-deprecated-register
+-CXX = clang++
+-CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
-CC = clang
-# Can choose aspect to sanitize: address and undefined can simply change
SANITIZE but for
-# thread also need to create Position Independent Executable -> search online
documentation
-SANITIZE = address
-#SANITIZE = undefined
+-else
+-CXXWARNFLAGS = -Wall -pedantic
-endif
-+.SUFFIXES: .cxx .c .o .h .a .so
++.SUFFIXES: .cxx .c .o .h .a .list .so
+ ARFLAGS = rc
+AR = ar
RANLIB = touch
ifdef GTK3
-@@ -36,17 +29,20 @@ DEL = del /q
- COMPLIB=..\bin\scintilla.a
+@@ -48,18 +38,21 @@ DEL = del /q
+ COMPLIB=$(srcdir)\..\bin\scintilla.a
else
DEL = rm -f
--COMPLIB=../bin/scintilla.a
-+COMPLIB=../bin/libscintilla.a
-+LEXERLIB=../bin/libscintilla_lexers.a
-+SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION}
-+SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
+-COMPLIB=$(srcdir)/../bin/scintilla.a
++COMPLIB=$(srcdir)/../bin/libscintilla.a
++LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a
++SHAREDLIB=$(srcdir)/../bin/libscintilla.so.${LIBscintilla_VERSION}
++SHAREDLEXER=$(srcdir)/../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
endif
- vpath %.h ../src ../include ../lexlib
- vpath %.cxx ../src ../lexlib ../lexers
+ vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
+ vpath %.c $(srcdir)
+ vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../lexlib $(srcdir)/../lexers
--INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
-+INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I${LOCALBASE}/include
+-INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib
++INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I
$(srcdir)/../lexlib -I${LOCALBASE}/include
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
endif
--CXXBASEFLAGS=-Wall -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
-+CXXBASEFLAGS=-Wall -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED)
+-CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS)
$(DEPRECATED)
++CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER -Dunix
$(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
-@@ -65,24 +61,35 @@ else
+@@ -78,7 +71,7 @@ else
CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
endif
else
@@ -55,24 +58,23 @@ Drop `-pedantic'
+CTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- CFLAGS:=$(CTFLAGS)
--CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
-+CXXTFLAGS:=$(CTFLAGS) $(REFLAGS)
-
- CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
- MARSHALLER=scintilla-marshal.o
+ CXXTFLAGS:=--std=gnu++14 $(CTFLAGS) $(REFLAGS)
+@@ -88,8 +81,12 @@ MARSHALLER=scintilla-marshal.o
.cxx.o:
$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
+.cxx.so:
+ $(CXX) -fPIC $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -o $@ -c $<
.c.o:
- $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+ $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
+.c.so:
+ $(CC) -fPIC $(CONFIGFLAGS) $(CFLAGS) -w -o $@ -c $<
-+
- LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
+ GLIB_GENMARSHAL = glib-genmarshal
+ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
+@@ -101,8 +98,14 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
+
+ LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard
$(srcdir)/../lexers/Lex*.cxx)))))
-all: $(COMPLIB)
+all: $(COMPLIB) $(SHAREDLIB) $(LEXERLIB) $(SHAREDLEXER)
@@ -86,21 +88,22 @@ Drop `-pedantic'
clean:
$(DEL) *.o $(COMPLIB) *.plist
-@@ -92,15 +99,26 @@ analyze:
- deps:
- $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx
../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z]
>deps.mak
+@@ -116,15 +119,26 @@ deps: deps.mak
+ deps.mak:
+ $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.*
//' | grep [a-zA-Z] > $@
--$(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 \
+-$(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o LexerBase.o
LexerModule.o LexerSimple.o StyleContext.o WordList.o \
++LIBOBJS= Accessor.o CharacterSet.o DefaultLexer.o LexerBase.o LexerModule.o
LexerSimple.o StyleContext.o WordList.o \
CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o
CaseConvert.o CaseFolder.o \
ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o
ExternalLexer.o MarginView.o \
PropSetSimple.o PlatGTK.o \
- KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o
CharacterCategory.o ViewStyle.o \
+ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o
ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o
UniConversion.o XPM.o \
- $(MARSHALLER) $(LEXOBJS)
+- $(MARSHALLER) $(LEXOBJS)
++ $(MARSHALLER)
+
+$(COMPLIB): $(LIBOBJS)
- $(AR) rc $@ $^
+ $(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
+
+$(LEXERLIB): $(LEXOBJS)
Index: scintilla/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scintilla/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- scintilla/pkg/PLIST 16 Mar 2015 18:07:45 -0000 1.4
+++ scintilla/pkg/PLIST 1 Nov 2017 15:54:00 -0000
@@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.4 2015/03/16 18:07:45 naddy Exp $
include/scintilla/
include/scintilla/ILexer.h
+include/scintilla/ILoader.h
include/scintilla/Platform.h
include/scintilla/SciLexer.h
+include/scintilla/Sci_Position.h
include/scintilla/Scintilla.h
include/scintilla/ScintillaWidget.h
lib/libscintilla.a
Index: scite/Makefile
===================================================================
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- scite/Makefile 26 Jul 2017 22:45:19 -0000 1.27
+++ scite/Makefile 1 Nov 2017 14:57:36 -0000
@@ -2,11 +2,10 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 3.5.2
+VERSION= 4.0.2
DISTNAME= scite${VERSION:S/.//g}
PKGNAME= scite-${VERSION}
CATEGORIES= editors x11
-REVISION= 0
HOMEPAGE= http://www.scintilla.org/SciTE.html
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB += c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gtk-3
WANTLIB += pango-1.0 pangocairo-1.0 pthread scintilla scintilla_lexers
${COMPILER_LIBCXX}
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
+MASTER_SITES= http://www.scintilla.org/
EXTRACT_SUFX= .tgz
LIB_DEPENDS= x11/gtk+3 \
Index: scite/distinfo
===================================================================
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- scite/distinfo 17 Jan 2015 05:06:12 -0000 1.10
+++ scite/distinfo 1 Nov 2017 14:58:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (scite352.tgz) = 0bmhLxuOqA8oVkoWlRRqWbSgMJnIyoaT46nOArsKKDY=
-SIZE (scite352.tgz) = 2277393
+SHA256 (scite402.tgz) = H5u47Muu13wRDDDA5tuqwEs/YrdRqTAZKxM6e28PKfs=
+SIZE (scite402.tgz) = 2424648
Index: scite/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-gtk_makefile
--- scite/patches/patch-gtk_makefile 25 Sep 2015 05:21:34 -0000 1.9
+++ scite/patches/patch-gtk_makefile 1 Nov 2017 15:08:20 -0000
@@ -3,10 +3,11 @@ $OpenBSD
Drop `-pedantic'
/usr/local/include/gtk-3.0/gdk/gdktypes.h:318: error: comma at end of
enumerator list
---- gtk/makefile.orig Sun Aug 10 01:52:11 2014
-+++ gtk/makefile Fri Sep 25 07:19:41 2015
-@@ -5,14 +5,6 @@
- # GNU make does not like \r\n line endings so should be saved to CVS in
binary form.
+Index: gtk/makefile
+--- gtk/makefile.orig
++++ gtk/makefile
+@@ -7,16 +7,6 @@
+ srcdir ?= .
.SUFFIXES: .cxx .o .h .a .c
-ifdef CLANG
@@ -14,13 +15,15 @@ Drop `-pedantic'
-# 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
+-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
+-else
+-MISLEADING=-Wno-misleading-indentation
-endif
ifdef GTK3
GTKVERSION=gtk+-3.0
-@@ -24,20 +16,21 @@ endif
+@@ -28,20 +18,21 @@ endif
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0
gmodule-no-export-2.0)
CONFIGTHREADS:=
@@ -43,14 +46,14 @@ Drop `-pedantic'
-INSTALL=install
+INSTALL=install -o root -g bin
- PROG = ../bin/SciTE
+ PROG = $(srcdir)/../bin/SciTE
-@@ -46,19 +39,21 @@ all: $(PROG)
- vpath %.h ../src ../../scintilla/include
- vpath %.cxx ../src
+@@ -50,19 +41,21 @@ all: $(PROG)
+ vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../../scintilla/include
+ vpath %.cxx $(srcdir) $(srcdir)/../src
--INCLUDEDIRS=-I ../../scintilla/include -I ../src
-+INCLUDEDIRS=-I ${prefix}/include/scintilla -I ../src -I ${prefix}/include
+-INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
++INCLUDEDIRS=-I ${prefix}/include/scintilla -I
$(srcdir)/../../scintilla/include -I $(srcdir)/../src -I ${prefix}/include
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
endif
@@ -69,39 +72,44 @@ Drop `-pedantic'
+LIBS= -L $(prefix)/lib -lscintilla -lscintilla_lexers
+
+ifdef LUA
- LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ LUA_CORE_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o
llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
ltable.o ltm.o lundump.o lvm.o lzio.o
-@@ -70,7 +65,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_O
+@@ -74,7 +67,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_O
- vpath %.c ../lua/src ../lua/src/lib
+ vpath %.c $(srcdir)/../lua/src
--INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
-+INCLUDEDIRS+=-I../lua/include
+-INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
-I$(srcdir)/../lua/src
++INCLUDEDIRS+=-I$(srcdir)/../lua/src
.c.o:
- $(CC) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
-@@ -106,15 +101,12 @@ analyze:
- deps:
- $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ $(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS)
$(CFLAGS) -c $< -o $@
+@@ -111,19 +104,16 @@ deps: deps.mak
+ deps.mak:
+ $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx
$(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
-# make should be run in ../../scintilla/gtk to compile all the lexers.
--COMPLIB=../../scintilla/bin/scintilla.a
+-COMPLIB=$(srcdir)/../../scintilla/bin/scintilla.a
-
+ # To almost make lua.vers (needs header and footer added) which is only
needed after updating Lua:
+ # nm -g ../bin/SciTE | grep lua | awk '{print "\t\t" $3 ";"}' >lua2.vers
+
$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
-FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o
SciTEIO.o StringList.o \
--Exporters.o MatchMarker.o StringHelpers.o \
+-ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
+-MatchMarker.o StringHelpers.o \
-PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleDefinition.o StyleWriter.o Utf8_16.o \
-+ 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 \
++ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
++ MatchMarker.o StringHelpers.o \
++ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleDefinition.o StyleWriter.o Utf8_16.o \
JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
-- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed
-Wl,--version-script 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++
+- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL)
-lm -lstdc++
++ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL)
-lm -lstdc++
# Automatically generate header dependencies with "make deps"
include deps.mak
-@@ -123,19 +115,18 @@ include deps.mak
+@@ -132,19 +122,17 @@ include deps.mak
# This is OK - just means no SciTE in the Gnome Applications menu
# Dead: install -D SciTEGTK.properties
$(SYSCONF_PATH)/SciTEGlobal.properties
install:
@@ -114,16 +122,16 @@ Drop `-pedantic'
+ $(INSTALL) -m 444 ../src/*.properties $(SYSCONF_PATH)
+ $(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png
$(DOC_PATH)
-- for files in ../src/*.properties ../doc/*.html ../doc/SciTEIco.png
../doc/PrintHi.png; \
+- for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html
$(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png; \
- do \
- $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
- done
-
+-
ifdef gnomeprefix
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications
$(DESTDIR)$(pixmapdir)
- $(INSTALL) -m 755 SciTE.desktop
$(DESTDIR)$(datadir)/applications/SciTE.desktop
-- $(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+ $(INSTALL) -m 444 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ $(INSTALL) -m 755 $(srcdir)/SciTE.desktop
$(DESTDIR)$(datadir)/applications/SciTE.desktop
+- $(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++ $(INSTALL) -m 444 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
endif
uninstall:
Index: scite/patches/patch-src_Embedded_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_Embedded_properties,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_Embedded_properties
--- scite/patches/patch-src_Embedded_properties 24 Sep 2015 04:47:08 -0000
1.6
+++ scite/patches/patch-src_Embedded_properties 1 Nov 2017 15:08:20 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-src_Embedded_properties,v 1.6 2015/09/24 04:47:08 ajacoutot
Exp $
---- src/Embedded.properties.orig Thu Nov 27 21:47:34 2014
-+++ src/Embedded.properties Thu Sep 24 06:38:51 2015
-@@ -98,7 +98,7 @@ if PLAT_WIN
+Index: src/Embedded.properties
+--- src/Embedded.properties.orig
++++ src/Embedded.properties
+@@ -99,7 +99,7 @@ if PLAT_WIN
+ command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
command.scite.help.subsystem=2
if PLAT_GTK
- command.print.*=a2ps "$(FileNameExt)"
- command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
+ command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
Index: scite/patches/patch-src_SciTEGlobal_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_SciTEGlobal_properties,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_SciTEGlobal_properties
--- scite/patches/patch-src_SciTEGlobal_properties 24 Sep 2015 04:47:08
-0000 1.6
+++ scite/patches/patch-src_SciTEGlobal_properties 1 Nov 2017 15:08:20
-0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-src_SciTEGlobal_properties,v 1.6 2015/09/24 04:47:08 ajacoutot
Exp $
---- src/SciTEGlobal.properties.orig Tue Sep 30 02:14:42 2014
-+++ src/SciTEGlobal.properties Thu Sep 24 06:38:51 2015
-@@ -271,7 +271,7 @@ if PLAT_WIN
+Index: src/SciTEGlobal.properties
+--- src/SciTEGlobal.properties.orig
++++ src/SciTEGlobal.properties
+@@ -284,7 +284,7 @@ if PLAT_WIN
+ command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
command.scite.help.subsystem=2
if PLAT_GTK
- command.print.*=a2ps "$(FileNameExt)"
- command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
+ command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
Index: scite/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scite/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- scite/pkg/PLIST 17 Jan 2015 05:06:12 -0000 1.8
+++ scite/pkg/PLIST 1 Nov 2017 15:57:44 -0000
@@ -37,6 +37,7 @@ share/scite/bullant.properties
share/scite/caml.properties
share/scite/cmake.properties
share/scite/cobol.properties
+share/scite/coffeescript.properties
share/scite/conf.properties
share/scite/cpp.properties
share/scite/csound.properties
@@ -52,8 +53,10 @@ share/scite/fortran.properties
share/scite/freebasic.properties
share/scite/gap.properties
share/scite/haskell.properties
+share/scite/hex.properties
share/scite/html.properties
share/scite/inno.properties
+share/scite/json.properties
share/scite/kix.properties
share/scite/latex.properties
share/scite/lisp.properties
@@ -97,4 +100,5 @@ share/scite/txt2tags.properties
share/scite/vb.properties
share/scite/verilog.properties
share/scite/vhdl.properties
+share/scite/visualprolog.properties
share/scite/yaml.properties
