Index: head/editors/scite/Makefile =================================================================== --- head/editors/scite/Makefile (revision 370596) +++ head/editors/scite/Makefile (revision 370597) @@ -1,51 +1,51 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.4.4 +PORTVERSION= 3.5.1 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 LIB_DEPENDS= libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils OPTIONS_DEFINE= DOCS FULL_BUFFER_MENU FULL_BUFFER_MENU_DESC= Show all files in buffer menu WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USES= desktop-file-utils gmake pkgconfig tar:tgz USE_GNOME= gtk20 MAKEFILE= makefile PORTDOCS= * .include post-patch: @${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile .if ${PORT_OPTIONS:MFULL_BUFFER_MENU} @${REINPLACE_CMD} -e 's|30, "/Buffers|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers|g' ${WRKSRC}/SciTEGTK.cxx .endif @${REINPLACE_CMD} -e 's|netscape "file://$$(SciteDefaultHome)|xdg-open "file://${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 @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${STAGEDIR}${DOCSDIR} .endif .include Index: head/editors/scite/distinfo =================================================================== --- head/editors/scite/distinfo (revision 370596) +++ head/editors/scite/distinfo (revision 370597) @@ -1,2 +1,2 @@ -SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499 -SIZE (scite344.tgz) = 2245870 +SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581 +SIZE (scite351.tgz) = 2272014 Index: head/editors/scite/files/patch-makefile =================================================================== --- head/editors/scite/files/patch-makefile (revision 370596) +++ head/editors/scite/files/patch-makefile (revision 370597) @@ -1,38 +1,38 @@ ---- ./makefile.orig 2014-07-25 07:00:13.000000000 -0400 -+++ ./makefile 2014-08-07 21:57:08.000000000 -0400 +--- makefile.orig 2014-08-09 23:52:11 UTC ++++ makefile @@ -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 -# 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 +-CXX = clang++ -fsanitize=$(SANITIZE) --std=c++0x -Wno-deprecated-register -CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body -endif ifdef GTK3 GTKVERSION=gtk+-3.0 @@ -24,7 +16,7 @@ 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) @@ -113,8 +105,9 @@ 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) - $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) + $(CXX) -rdynamic -Wl,--version-script 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/editors/scite/pkg-plist =================================================================== --- head/editors/scite/pkg-plist (revision 370596) +++ head/editors/scite/pkg-plist (revision 370597) @@ -1,83 +1,83 @@ bin/SciTE man/man1/scite.1.gz share/applications/SciTE.desktop share/pixmaps/Sci48M.png %%DATADIR%%/Embedded.properties %%DATADIR%%/SciTE.properties %%DATADIR%%/SciTEGlobal.properties %%DATADIR%%/abaqus.properties %%DATADIR%%/abbrev.properties %%DATADIR%%/ada.properties %%DATADIR%%/asl.properties %%DATADIR%%/asm.properties %%DATADIR%%/asn1.properties %%DATADIR%%/au3.properties %%DATADIR%%/ave.properties %%DATADIR%%/avs.properties %%DATADIR%%/baan.properties %%DATADIR%%/blitzbasic.properties %%DATADIR%%/bullant.properties %%DATADIR%%/caml.properties %%DATADIR%%/cmake.properties %%DATADIR%%/cobol.properties %%DATADIR%%/conf.properties %%DATADIR%%/cpp.properties %%DATADIR%%/csound.properties %%DATADIR%%/css.properties %%DATADIR%%/d.properties %%DATADIR%%/ecl.properties %%DATADIR%%/eiffel.properties %%DATADIR%%/erlang.properties %%DATADIR%%/escript.properties %%DATADIR%%/flagship.properties %%DATADIR%%/forth.properties %%DATADIR%%/fortran.properties %%DATADIR%%/freebasic.properties %%DATADIR%%/gap.properties %%DATADIR%%/haskell.properties %%DATADIR%%/html.properties %%DATADIR%%/inno.properties %%DATADIR%%/kix.properties %%DATADIR%%/latex.properties %%DATADIR%%/lisp.properties %%DATADIR%%/lot.properties %%DATADIR%%/lout.properties %%DATADIR%%/lua.properties %%DATADIR%%/matlab.properties %%DATADIR%%/metapost.properties %%DATADIR%%/mmixal.properties %%DATADIR%%/modula3.properties %%DATADIR%%/nimrod.properties %%DATADIR%%/nncrontab.properties %%DATADIR%%/nsis.properties %%DATADIR%%/opal.properties %%DATADIR%%/oscript.properties %%DATADIR%%/others.properties %%DATADIR%%/pascal.properties %%DATADIR%%/perl.properties %%DATADIR%%/pov.properties %%DATADIR%%/powerpro.properties %%DATADIR%%/powershell.properties %%DATADIR%%/ps.properties %%DATADIR%%/purebasic.properties %%DATADIR%%/python.properties %%DATADIR%%/r.properties %%DATADIR%%/rebol.properties +%%DATADIR%%/registry.properties %%DATADIR%%/ruby.properties %%DATADIR%%/rust.properties %%DATADIR%%/scriptol.properties %%DATADIR%%/smalltalk.properties %%DATADIR%%/sorcins.properties %%DATADIR%%/specman.properties %%DATADIR%%/spice.properties %%DATADIR%%/sql.properties %%DATADIR%%/tacl.properties %%DATADIR%%/tal.properties %%DATADIR%%/tcl.properties %%DATADIR%%/tex.properties %%DATADIR%%/txt2tags.properties %%DATADIR%%/vb.properties %%DATADIR%%/verilog.properties %%DATADIR%%/vhdl.properties %%DATADIR%%/yaml.properties -@dirrm %%DATADIR%% Index: head/x11-toolkits/scintilla/Makefile =================================================================== --- head/x11-toolkits/scintilla/Makefile (revision 370596) +++ head/x11-toolkits/scintilla/Makefile (revision 370597) @@ -1,38 +1,38 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.4.4 +PORTVERSION= 3.5.1 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+ WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USES= gmake iconv pkgconfig tar:tgz MAKEFILE= makefile USE_LDCONFIG= yes USE_GNOME= gtk20 MAKE_ENV+= LDFLAGS="${LDFLAGS}" CFLAGS+= -DPIC ${PICFLAG} .include .if ${ARCH} == "sparc64" PICFLAG?= -fPIC .else PICFLAG?= -fpic .endif do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla ${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla ${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${STAGEDIR}${PREFIX}/lib (cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla.so.2 libscintilla.so) ${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${STAGEDIR}${PREFIX}/lib (cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla_lexers.so.2 libscintilla_lexers.so) .include Index: head/x11-toolkits/scintilla/distinfo =================================================================== --- head/x11-toolkits/scintilla/distinfo (revision 370596) +++ head/x11-toolkits/scintilla/distinfo (revision 370597) @@ -1,2 +1,2 @@ -SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499 -SIZE (scite344.tgz) = 2245870 +SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581 +SIZE (scite351.tgz) = 2272014 Index: head/x11-toolkits/scintilla/files/patch-makefile =================================================================== --- head/x11-toolkits/scintilla/files/patch-makefile (revision 370596) +++ head/x11-toolkits/scintilla/files/patch-makefile (revision 370597) @@ -1,66 +1,66 @@ ---- ./makefile.orig 2014-07-25 06:59:40.000000000 -0400 -+++ ./makefile 2014-08-07 08:31:47.000000000 -0400 +--- makefile.orig 2014-08-09 23:52:02 UTC ++++ makefile @@ -7,14 +7,6 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a -ifdef CLANG --CXX = clang++ +-CXX = clang++ -Wno-deprecated-register -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 -endif RANLIB = touch ifdef GTK3 @@ -36,7 +28,8 @@ COMPLIB=..\bin\scintilla.a else DEL = rm -f -COMPLIB=../bin/scintilla.a +COMPLIB=../bin/libscintilla.so.2 +LEXRLIB=../bin/libscintilla_lexers.so.2 endif vpath %.h ../src ../include ../lexlib @@ -64,8 +57,7 @@ CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif -CFLAGS:=$(CTFLAGS) -CXXTFLAGS:=--std=c++0x $(CTFLAGS) +CXXTFLAGS:=$(CTFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o @@ -73,11 +65,11 @@ .cxx.o: $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $< .c.o: - $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $< + $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $< LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) -all: $(COMPLIB) +all: $(COMPLIB) $(LEXRLIB) clean: $(DEL) *.o $(COMPLIB) *.plist -@@ -93,9 +85,11 @@ - ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \ +@@ -94,9 +86,11 @@ + 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) - $(AR) rc $@ $^ - $(RANLIB) $@ + $(MARSHALLER) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) + +$(LEXRLIB): $(LEXOBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) # Automatically generate header dependencies with "make deps" include deps.mak Index: head/x11-toolkits/scintilla/pkg-plist =================================================================== --- head/x11-toolkits/scintilla/pkg-plist (revision 370596) +++ head/x11-toolkits/scintilla/pkg-plist (revision 370597) @@ -1,10 +1,9 @@ include/scintilla/ILexer.h include/scintilla/Platform.h include/scintilla/SciLexer.h include/scintilla/Scintilla.h include/scintilla/ScintillaWidget.h lib/libscintilla.so lib/libscintilla.so.2 lib/libscintilla_lexers.so lib/libscintilla_lexers.so.2 -@dirrm include/scintilla