Index: head/editors/scite/Makefile =================================================================== --- head/editors/scite/Makefile (revision 506374) +++ head/editors/scite/Makefile (revision 506375) @@ -1,47 +1,47 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scite -DISTVERSION= 4.1.0 +DISTVERSION= 4.2.0 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Full-featured SCIntilla based text editor for GTK/GNOME LICENSE= SCINTILLA LICENSE_NAME= License for 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 RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= compiler:c++17-lang desktop-file-utils gmake pkgconfig tar:tgz +USES= compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig tar:tgz OPTIONS_DEFINE= DOCS PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USE_GNOME= cairo gdkpixbuf2 gtk20 MAKEFILE= makefile PORTDATA= *.properties PORTDOCS= *.html *.jpg *.png post-patch: @${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile @${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \ ${WRKSRC}/../src/SciTEGlobal.properties do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${MANPREFIX}/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 Index: head/editors/scite/distinfo =================================================================== --- head/editors/scite/distinfo (revision 506374) +++ head/editors/scite/distinfo (revision 506375) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529613535 -SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7 -SIZE (scite410.tgz) = 2493701 +TIMESTAMP = 1562690433 +SHA256 (scite420.tgz) = 2e0b95842bbc875a9224416fad3a9179ec329b3af2ca1abdd8e64c008068bb99 +SIZE (scite420.tgz) = 2629884 Index: head/editors/scite/files/patch-src_EditorConfig.cxx =================================================================== --- head/editors/scite/files/patch-src_EditorConfig.cxx (revision 506374) +++ head/editors/scite/files/patch-src_EditorConfig.cxx (nonexistent) @@ -1,10 +0,0 @@ ---- src/EditorConfig.cxx.orig 2018-05-06 22:32:10 UTC -+++ src/EditorConfig.cxx -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "Scintilla.h" - Property changes on: head/editors/scite/files/patch-src_EditorConfig.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/scite/files/patch-gtk_makefile =================================================================== --- head/editors/scite/files/patch-gtk_makefile (revision 506374) +++ head/editors/scite/files/patch-gtk_makefile (revision 506375) @@ -1,34 +1,34 @@ ---- gtk/makefile.orig 2018-05-06 22:32:10 UTC +--- gtk/makefile.orig 2019-06-07 22:35:09 UTC +++ gtk/makefile @@ -12,8 +12,8 @@ ifdef CLANG # thread also need to create Position Independent Executable -> search online documentation SANITIZE = address #SANITIZE = undefined -CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register --CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body +-CC = clang -fsanitize=$(SANITIZE) +CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register -+CC = $(CC) -fsanitize=$(SANITIZE) -Wno-empty-body ++CC = $(CC) -fsanitize=$(SANITIZE) + CCWARNINGS = -Wno-empty-body -Wno-string-plus-int else MISLEADING=-Wno-misleading-indentation - endif -@@ -28,7 +28,7 @@ endif +@@ -29,7 +29,7 @@ endif CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) CONFIGTHREADS:= -gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null) +gnomeprefix:=$(PREFIX) ifndef prefix ifdef gnomeprefix prefix=$(gnomeprefix) -@@ -122,8 +122,9 @@ FilePath.o EditorConfig.o SciTEBase.o Fi +@@ -125,8 +125,9 @@ FilePath.o EditorConfig.o SciTEBase.o FileWorker.o Coo 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 $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++ + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) + $(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \ + $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB) # Automatically generate header dependencies with "make deps" include deps.mak Index: head/x11-toolkits/scintilla/Makefile =================================================================== --- head/x11-toolkits/scintilla/Makefile (revision 506374) +++ head/x11-toolkits/scintilla/Makefile (revision 506375) @@ -1,55 +1,55 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scintilla -DISTVERSION= 4.1.0 +DISTVERSION= 4.2.0 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Full-featured free source code editing component for GTK+ LICENSE= SCINTILLA LICENSE_NAME= License for 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 gmake iconv pkgconfig tar:tgz +USES= compiler:c++17-lang gmake gnome iconv pkgconfig tar:tgz WRKSRC= ${WRKDIR}/${PORTNAME}/gtk MAKEFILE= makefile USE_LDCONFIG= yes USE_GNOME= gtk20 MAKE_ENV= LDFLAGS="${LDFLAGS}" CFLAGS+= -DPIC ${PICFLAG} MAJOR= 2 AGE= 0 REVISION= 0 MAKE_ARGS= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" PLIST_SUB= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" .include .if ${ARCH} == "sparc64" PICFLAG?= -fPIC .else PICFLAG?= -fpic .endif post-patch: @${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla ${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla .for f in libscintilla.so libscintilla_lexers.so ${INSTALL_LIB} ${WRKSRC}/${f}.${MAJOR}.${AGE}.${REVISION} \ ${STAGEDIR}${PREFIX}/lib (cd ${STAGEDIR}${PREFIX}/lib && \ ${LN} -sf ${f}.${MAJOR}.${AGE}.${REVISION} ${f}.${MAJOR} && \ ${LN} -sf ${f}.${MAJOR} ${f}) .endfor .include Index: head/x11-toolkits/scintilla/distinfo =================================================================== --- head/x11-toolkits/scintilla/distinfo (revision 506374) +++ head/x11-toolkits/scintilla/distinfo (revision 506375) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529613442 -SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7 -SIZE (scite410.tgz) = 2493701 +TIMESTAMP = 1562690306 +SHA256 (scite420.tgz) = 2e0b95842bbc875a9224416fad3a9179ec329b3af2ca1abdd8e64c008068bb99 +SIZE (scite420.tgz) = 2629884 Index: head/x11-toolkits/scintilla/files/patch-makefile =================================================================== --- head/x11-toolkits/scintilla/files/patch-makefile (revision 506374) +++ head/x11-toolkits/scintilla/files/patch-makefile (revision 506375) @@ -1,50 +1,50 @@ ---- makefile.orig 2018-04-10 01:38:39 UTC +--- makefile.orig 2019-04-16 20:34:45 UTC +++ makefile @@ -11,9 +11,7 @@ srcdir ?= . ifdef CLANG -CXX = clang++ CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces -CC = clang # Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for # thread also need to create Position Independent Executable -> search online documentation SANITIZE = address @@ -49,7 +47,12 @@ DEL = del /q COMPLIB=$(srcdir)\..\bin\scintilla.a else DEL = rm -f -COMPLIB=$(srcdir)/../bin/scintilla.a +COMPLIB_NAME=libscintilla.so +COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR) +COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION) +LEXRLIB_NAME=libscintilla_lexers.so +LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR) +LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION) endif vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib -@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(RE +@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o -all: $(COMPLIB) +all: $(COMPLIB) $(LEXRLIB) clean: $(DEL) *.o $(COMPLIB) *.plist -@@ -123,9 +126,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De +@@ -119,9 +122,11 @@ $(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o L PropSetSimple.o PlatGTK.o \ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \ - RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ + RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o UniqueString.o XPM.o \ - $(MARSHALLER) $(LEXOBJS) - $(AR) $(ARFLAGS) $@ $^ - $(RANLIB) $@ + $(MARSHALLER) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) + +$(LEXRLIB): $(LEXOBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) # Automatically generate header dependencies with "make deps" include deps.mak