From owner-svn-ports-all@freebsd.org Wed Sep 7 16:38:52 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBBE9BCBB2E; Wed, 7 Sep 2016 16:38:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7712DB5; Wed, 7 Sep 2016 16:38:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87GcqbY071496; Wed, 7 Sep 2016 16:38:52 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87Gcpek071492; Wed, 7 Sep 2016 16:38:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201609071638.u87Gcpek071492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 7 Sep 2016 16:38:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421511 - in head/x11-toolkits/scintilla: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 16:38:53 -0000 Author: amdmi3 Date: Wed Sep 7 16:38:51 2016 New Revision: 421511 URL: https://svnweb.freebsd.org/changeset/ports/421511 Log: - Update to 3.6.7 (changes: http://www.scintilla.org/ScintillaHistory.html) - Silence mkdir - Add "-soname" linker option to create SONAME for scintilla libraries (fixes stage-qa) PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) Modified: head/x11-toolkits/scintilla/Makefile head/x11-toolkits/scintilla/distinfo head/x11-toolkits/scintilla/files/patch-makefile head/x11-toolkits/scintilla/pkg-plist Modified: head/x11-toolkits/scintilla/Makefile ============================================================================== --- head/x11-toolkits/scintilla/Makefile Wed Sep 7 16:36:25 2016 (r421510) +++ head/x11-toolkits/scintilla/Makefile Wed Sep 7 16:38:51 2016 (r421511) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.6.6 +PORTVERSION= 3.6.7 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} @@ -21,9 +21,15 @@ USES= compiler:c++11-lib gmake iconv pk MAKEFILE= makefile USE_LDCONFIG= yes USE_GNOME= gtk20 -MAKE_ENV+= LDFLAGS="${LDFLAGS}" +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" @@ -36,11 +42,14 @@ post-patch: @${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla + @${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) +.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 Modified: head/x11-toolkits/scintilla/distinfo ============================================================================== --- head/x11-toolkits/scintilla/distinfo Wed Sep 7 16:36:25 2016 (r421510) +++ head/x11-toolkits/scintilla/distinfo Wed Sep 7 16:38:51 2016 (r421511) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464048149 -SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa -SIZE (scite366.tgz) = 2371062 +TIMESTAMP = 1472947347 +SHA256 (scite367.tgz) = 851a681d2fefe02770d318c4c25401f423b6ea686f6cae3eed5257e27c86c49f +SIZE (scite367.tgz) = 2331985 Modified: head/x11-toolkits/scintilla/files/patch-makefile ============================================================================== --- head/x11-toolkits/scintilla/files/patch-makefile Wed Sep 7 16:36:25 2016 (r421510) +++ head/x11-toolkits/scintilla/files/patch-makefile Wed Sep 7 16:38:51 2016 (r421511) @@ -1,7 +1,7 @@ ---- makefile.orig 2016-05-17 23:50:39 UTC +--- makefile.orig 2016-08-30 04:39:06 UTC +++ makefile -@@ -7,14 +7,6 @@ - # Also works with ming32-make on Windows. +@@ -9,14 +9,6 @@ + srcdir ?= . .SUFFIXES: .cxx .c .o .h .a .list -ifdef CLANG @@ -12,57 +12,44 @@ -SANITIZE = address -#SANITIZE = undefined -endif + ARFLAGS = rc RANLIB = touch - ifdef GTK3 -@@ -42,7 +34,8 @@ DEL = del /q - COMPLIB=..\bin\scintilla.a +@@ -45,7 +37,12 @@ DEL = del /q + COMPLIB=$(srcdir)\..\bin\scintilla.a else DEL = rm -f --COMPLIB=../bin/scintilla.a -+COMPLIB=../bin/libscintilla.so.2 -+LEXRLIB=../bin/libscintilla_lexers.so.2 +-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 ../src ../include ../lexlib -@@ -74,7 +67,6 @@ else - CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) - endif - --CFLAGS:=$(CTFLAGS) - CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS) - - CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) -@@ -83,7 +75,7 @@ MARSHALLER=scintilla-marshal.o - .cxx.o: - $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $< - .c.o: -- $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $< -+ $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $< - - GLIB_GENMARSHAL = glib-genmarshal - GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal -@@ -95,7 +87,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil + vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib +@@ -98,7 +95,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil - LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) + LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))) -all: $(COMPLIB) +all: $(COMPLIB) $(LEXRLIB) clean: $(DEL) *.o $(COMPLIB) *.plist -@@ -112,9 +104,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le +@@ -116,9 +113,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le 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 $@ $^ +- $(AR) $(ARFLAGS) $@ $^ - $(RANLIB) $@ + $(MARSHALLER) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) + +$(LEXRLIB): $(LEXOBJS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) # Automatically generate header dependencies with "make deps" include deps.mak Modified: head/x11-toolkits/scintilla/pkg-plist ============================================================================== --- head/x11-toolkits/scintilla/pkg-plist Wed Sep 7 16:36:25 2016 (r421510) +++ head/x11-toolkits/scintilla/pkg-plist Wed Sep 7 16:38:51 2016 (r421511) @@ -5,6 +5,8 @@ include/scintilla/SciLexer.h include/scintilla/Scintilla.h include/scintilla/ScintillaWidget.h lib/libscintilla.so -lib/libscintilla.so.2 +lib/libscintilla.so.%%MAJOR%% +lib/libscintilla.so.%%MAJOR%%.%%AGE%%.%%REVISION%% lib/libscintilla_lexers.so -lib/libscintilla_lexers.so.2 +lib/libscintilla_lexers.so.%%MAJOR%% +lib/libscintilla_lexers.so.%%MAJOR%%.%%AGE%%.%%REVISION%%