Index: head/editors/scite/Makefile =================================================================== --- head/editors/scite/Makefile (revision 491444) +++ head/editors/scite/Makefile (revision 491445) @@ -1,46 +1,48 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scite -DISTVERSION= 4.0.2 -PORTREVISION= 1 +DISTVERSION= 4.1.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 + OPTIONS_DEFINE= DOCS +PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}/gtk -USES= compiler:c++14-lang desktop-file-utils gmake pkgconfig tar:tgz +CXXSTD= c++17 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 491444) +++ head/editors/scite/distinfo (revision 491445) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516108933 -SHA256 (scite402.tgz) = 1f9bb8eccbaed77c110c30c0e6dbaac04b3f62b751a930192b133a7b6f0f29fb -SIZE (scite402.tgz) = 2424648 +TIMESTAMP = 1529613535 +SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7 +SIZE (scite410.tgz) = 2493701 Index: head/editors/scite/files/patch-makefile =================================================================== --- head/editors/scite/files/patch-makefile (revision 491444) +++ head/editors/scite/files/patch-makefile (nonexistent) @@ -1,40 +0,0 @@ ---- makefile.orig 2016-08-30 04:39:12 UTC -+++ makefile -@@ -7,16 +7,6 @@ - srcdir ?= . - - .SUFFIXES: .cxx .o .h .a .c --ifdef 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 --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 -@@ -28,7 +18,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) -@@ -119,8 +109,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook - 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) -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 Property changes on: head/editors/scite/files/patch-makefile ___________________________________________________________________ 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 (nonexistent) +++ head/editors/scite/files/patch-gtk_makefile (revision 491445) @@ -0,0 +1,34 @@ +--- gtk/makefile.orig 2018-05-06 22:32:10 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 ++CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register ++CC = $(CC) -fsanitize=$(SANITIZE) -Wno-empty-body + else + MISLEADING=-Wno-misleading-indentation + endif +@@ -28,7 +28,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 + 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 Property changes on: head/editors/scite/files/patch-gtk_makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/scite/files/patch-src_EditorConfig.cxx =================================================================== --- head/editors/scite/files/patch-src_EditorConfig.cxx (nonexistent) +++ head/editors/scite/files/patch-src_EditorConfig.cxx (revision 491445) @@ -0,0 +1,10 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property