Index: head/x11-toolkits/scintilla/Makefile =================================================================== --- head/x11-toolkits/scintilla/Makefile (revision 443865) +++ head/x11-toolkits/scintilla/Makefile (revision 443866) @@ -1,55 +1,55 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.7.4 +PORTVERSION= 3.7.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= compiler:c++11-lib gmake iconv pkgconfig tar:tgz 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 443865) +++ head/x11-toolkits/scintilla/distinfo (revision 443866) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490054625 -SHA256 (scite374.tgz) = 197372e80db2c16c86d9677a56a430209dc2f2adfdf9b7bda73b62dd19eb1e20 -SIZE (scite374.tgz) = 2329831 +TIMESTAMP = 1495751226 +SHA256 (scite375.tgz) = 51e6861284077268d4929bb2ff9c516e2ca8914b2bd0ac315d177befe24aef86 +SIZE (scite375.tgz) = 2380823 Index: head/x11-toolkits/scintilla/files/patch-makefile =================================================================== --- head/x11-toolkits/scintilla/files/patch-makefile (revision 443865) +++ head/x11-toolkits/scintilla/files/patch-makefile (revision 443866) @@ -1,55 +1,55 @@ ---- makefile.orig 2016-12-01 09:53:41 UTC +--- makefile.orig 2017-05-24 01:26:25 UTC +++ makefile @@ -9,14 +9,6 @@ srcdir ?= . .SUFFIXES: .cxx .c .o .h .a .list -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 ARFLAGS = rc RANLIB = touch @@ -45,7 +37,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 @@ -98,7 +95,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil - LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))) + LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))) -all: $(COMPLIB) +all: $(COMPLIB) $(LEXRLIB) clean: $(DEL) *.o $(COMPLIB) *.plist @@ -119,9 +116,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le 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 \ - $(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