Index: head/editors/scite/Makefile =================================================================== --- head/editors/scite/Makefile (revision 421511) +++ head/editors/scite/Makefile (revision 421512) @@ -1,45 +1,45 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.6.6 +PORTVERSION= 3.6.7 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 OPTIONS_DEFINE= DOCS WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USES= compiler:c++11-lib desktop-file-utils gmake pkgconfig tar:tgz 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 421511) +++ head/editors/scite/distinfo (revision 421512) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464048149 -SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa -SIZE (scite366.tgz) = 2371062 +TIMESTAMP = 1472947347 +SHA256 (scite367.tgz) = 851a681d2fefe02770d318c4c25401f423b6ea686f6cae3eed5257e27c86c49f +SIZE (scite367.tgz) = 2331985 Index: head/editors/scite/files/patch-makefile =================================================================== --- head/editors/scite/files/patch-makefile (revision 421511) +++ head/editors/scite/files/patch-makefile (revision 421512) @@ -1,38 +1,40 @@ ---- makefile.orig 2015-09-22 01:37:15 UTC +--- makefile.orig 2016-08-30 04:39:12 UTC +++ makefile -@@ -5,14 +5,6 @@ - # GNU make does not like \r\n line endings so should be saved to CVS in binary form. +@@ -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 -@@ -24,7 +16,7 @@ endif +@@ -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) -@@ -114,8 +106,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook +@@ -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 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++ + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) -+ $(CXX) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \ ++ $(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