Index: head/editors/scite/Makefile =================================================================== --- head/editors/scite/Makefile (revision 385394) +++ head/editors/scite/Makefile (revision 385395) @@ -1,51 +1,51 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.5.4 +PORTVERSION= 3.5.5 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:${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 PORTDATA= *.properties PORTDOCS= *.html *.jpg *.png .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|$$(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 385394) +++ head/editors/scite/distinfo (revision 385395) @@ -1,2 +1,2 @@ -SHA256 (scite354.tgz) = 96041bb6a3aed321e353db7c8fcde720b99cab98cbfa2ef62a5e07dd523e1495 -SIZE (scite354.tgz) = 2301246 +SHA256 (scite355.tgz) = 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f +SIZE (scite355.tgz) = 2302137 Index: head/x11-toolkits/scintilla/Makefile =================================================================== --- head/x11-toolkits/scintilla/Makefile (revision 385394) +++ head/x11-toolkits/scintilla/Makefile (revision 385395) @@ -1,46 +1,46 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.5.4 +PORTVERSION= 3.5.5 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 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 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 ${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 385394) +++ head/x11-toolkits/scintilla/distinfo (revision 385395) @@ -1,2 +1,2 @@ -SHA256 (scite354.tgz) = 96041bb6a3aed321e353db7c8fcde720b99cab98cbfa2ef62a5e07dd523e1495 -SIZE (scite354.tgz) = 2301246 +SHA256 (scite355.tgz) = 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f +SIZE (scite355.tgz) = 2302137 Index: head/x11-toolkits/scintilla/files/patch-makefile =================================================================== --- head/x11-toolkits/scintilla/files/patch-makefile (revision 385394) +++ head/x11-toolkits/scintilla/files/patch-makefile (revision 385395) @@ -1,66 +1,66 @@ ---- makefile.orig 2014-11-28 00:47:24.000000000 +0400 -+++ makefile 2014-12-04 14:28:51.000000000 +0400 +--- makefile.orig 2014-11-27 20:47:24 UTC ++++ makefile @@ -7,14 +7,6 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a -ifdef 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 @@ -68,8 +61,7 @@ CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif -CFLAGS:=$(CTFLAGS) -CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS) +CXXTFLAGS:=$(CTFLAGS) $(REFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o @@ -77,11 +69,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 @@ -98,9 +90,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