Diff below brings scite to the latest version. Tested ok on amd64 using
the latest scintilla for which a diff has been sent to this list.
Comments/OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 19 Jan 2018 17:11:35 -0000 1.29
+++ Makefile 24 Feb 2018 09:44:51 -0000
@@ -2,7 +2,7 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 4.0.2
+VERSION= 4.0.3
DISTNAME= scite${VERSION:S/.//g}
PKGNAME= scite-${VERSION}
CATEGORIES= editors x11
@@ -13,13 +13,14 @@ HOMEPAGE= http://www.scintilla.org/SciT
PERMIT_PACKAGE_CDROM= may not sell
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}
+WANTLIB += ${COMPILER_LIBCXX} c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0
+WANTLIB += gobject-2.0 gtk-3 pango-1.0 pangocairo-1.0 scintilla
+WANTLIB += scintilla_lexers
MASTER_SITES= http://www.scintilla.org/
EXTRACT_SUFX= .tgz
-# c++11
+# c++17
COMPILER= base-clang ports-clang ports-gcc
LIB_DEPENDS= x11/gtk+3 \
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 1 Nov 2017 17:01:23 -0000 1.11
+++ distinfo 24 Feb 2018 09:44:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (scite402.tgz) = H5u47Muu13wRDDDA5tuqwEs/YrdRqTAZKxM6e28PKfs=
-SIZE (scite402.tgz) = 2424648
+SHA256 (scite403.tgz) = crVJIMqL4cbsXg9Cnc/bCSgtkhl51keXMyff165Uq94=
+SIZE (scite403.tgz) = 2433537
Index: patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.10
diff -u -p -r1.10 patch-gtk_makefile
--- patches/patch-gtk_makefile 1 Nov 2017 17:01:23 -0000 1.10
+++ patches/patch-gtk_makefile 24 Feb 2018 09:44:51 -0000
@@ -1,7 +1,4 @@
-$OpenBSD
-
-Drop `-pedantic'
-/usr/local/include/gtk-3.0/gdk/gdktypes.h:318: error: comma at end of
enumerator list
+$OpenBSD$
Index: gtk/makefile
--- gtk/makefile.orig
@@ -57,8 +54,7 @@ Index: gtk/makefile
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
endif
--CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
-+CXXBASEFLAGS=-W -Wall -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\"
-DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
+ CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -84,7 +80,7 @@ Index: gtk/makefile
.c.o:
$(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS)
$(CFLAGS) -c $< -o $@
-@@ -111,19 +104,16 @@ deps: deps.mak
+@@ -111,9 +104,6 @@ deps: deps.mak
deps.mak:
$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx
$(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
@@ -94,18 +90,12 @@ Index: gtk/makefile
# 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 \
--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 \
-+ 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 \
+@@ -123,7 +113,7 @@ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o Expor
+ MatchMarker.o StringHelpers.o \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleDefinition.o StyleWriter.o Utf8_16.o \
JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
-- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL)
-lm -lstdc++
-+ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL)
-lm -lstdc++
+- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL)
$(LDLIBS) -lm -lstdc++
++ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL)
$(LDLIBS) -lm -lstdc++
# Automatically generate header dependencies with "make deps"
include deps.mak
@@ -129,7 +119,7 @@ Index: gtk/makefile
-
ifdef gnomeprefix
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications
$(DESTDIR)$(pixmapdir)
- $(INSTALL) -m 755 $(srcdir)/SciTE.desktop
$(DESTDIR)$(datadir)/applications/SciTE.desktop
+ $(INSTALL) -m 644 $(srcdir)/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
Index: patches/patch-src_SciTEGlobal_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_SciTEGlobal_properties,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_SciTEGlobal_properties
--- patches/patch-src_SciTEGlobal_properties 1 Nov 2017 17:01:23 -0000
1.7
+++ patches/patch-src_SciTEGlobal_properties 24 Feb 2018 09:44:51 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_SciTEGlobal_properti
Index: src/SciTEGlobal.properties
--- src/SciTEGlobal.properties.orig
+++ src/SciTEGlobal.properties
-@@ -284,7 +284,7 @@ if PLAT_WIN
+@@ -285,7 +285,7 @@ if PLAT_WIN
command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
command.scite.help.subsystem=2
if PLAT_GTK
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scite/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 1 Nov 2017 17:01:23 -0000 1.9
+++ pkg/PLIST 24 Feb 2018 09:44:51 -0000
@@ -63,6 +63,7 @@ share/scite/lisp.properties
share/scite/lot.properties
share/scite/lout.properties
share/scite/lua.properties
+share/scite/markdown.properties
share/scite/matlab.properties
share/scite/metapost.properties
share/scite/mmixal.properties
