From owner-svn-ports-all@FreeBSD.ORG Wed Feb 27 11:47:27 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D9896EE7; Wed, 27 Feb 2013 11:47:27 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B45FAA80; Wed, 27 Feb 2013 11:47:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RBlRW6033441; Wed, 27 Feb 2013 11:47:27 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RBlReE033435; Wed, 27 Feb 2013 11:47:27 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201302271147.r1RBlReE033435@svn.freebsd.org> From: Max Brazhnikov Date: Wed, 27 Feb 2013 11:47:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313046 - 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.14 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, 27 Feb 2013 11:47:27 -0000 Author: makc Date: Wed Feb 27 11:47:26 2013 New Revision: 313046 URL: http://svnweb.freebsd.org/changeset/ports/313046 Log: Update to 3.2.5 PR: ports/176457 Submitted by: Naram Qashat (maintainer) Modified: head/x11-toolkits/scintilla/Makefile head/x11-toolkits/scintilla/distinfo head/x11-toolkits/scintilla/files/patch-aa (contents, props changed) Modified: head/x11-toolkits/scintilla/Makefile ============================================================================== --- head/x11-toolkits/scintilla/Makefile Wed Feb 27 10:39:48 2013 (r313045) +++ head/x11-toolkits/scintilla/Makefile Wed Feb 27 11:47:26 2013 (r313046) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.2.4 +PORTVERSION= 3.2.5 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} Modified: head/x11-toolkits/scintilla/distinfo ============================================================================== --- head/x11-toolkits/scintilla/distinfo Wed Feb 27 10:39:48 2013 (r313045) +++ head/x11-toolkits/scintilla/distinfo Wed Feb 27 11:47:26 2013 (r313046) @@ -1,2 +1,2 @@ -SHA256 (scite324.tgz) = bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08 -SIZE (scite324.tgz) = 1956084 +SHA256 (scite325.tgz) = ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef +SIZE (scite325.tgz) = 1974782 Modified: head/x11-toolkits/scintilla/files/patch-aa ============================================================================== --- head/x11-toolkits/scintilla/files/patch-aa Wed Feb 27 10:39:48 2013 (r313045) +++ head/x11-toolkits/scintilla/files/patch-aa Wed Feb 27 11:47:26 2013 (r313046) @@ -1,15 +1,12 @@ ---- makefile.orig 2012-06-01 04:26:24.000000000 -0400 -+++ makefile 2012-08-12 14:34:52.000000000 -0400 -@@ -7,17 +7,7 @@ +--- makefile.orig 2013-02-18 02:20:43.000000000 -0500 ++++ makefile 2013-02-26 18:16:54.000000000 -0500 +@@ -7,14 +7,7 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a -ifdef CLANG --ifdef CLANG_ANALYZE --ANALYZE=--analyze --endif --CC = clang $(ANALYZE) --CCOMP = clang $(ANALYZE) +-CC = clang --std=c++0x +-CCOMP = clang -else -CC = g++ -CCOMP = gcc @@ -19,7 +16,7 @@ RANLIB = touch ifdef GTK3 -@@ -39,7 +29,8 @@ +@@ -36,7 +29,8 @@ COMPLIB=..\bin\scintilla.a else DEL = rm -f @@ -29,7 +26,7 @@ endif vpath %.h ../src ../include ../lexlib -@@ -66,6 +57,7 @@ +@@ -63,16 +57,17 @@ CFLAGS:=$(CXXTFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) @@ -37,7 +34,10 @@ MARSHALLER=scintilla-marshal.o .cxx.o: -@@ -75,7 +67,7 @@ + $(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $< + .c.o: +- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $< ++ $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) $(CXXFLAGS) -w -c $< LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) @@ -45,8 +45,8 @@ +all: $(COMPLIB) $(LEXRLIB) clean: - $(DEL) *.o $(COMPLIB) -@@ -88,9 +80,11 @@ + $(DEL) *.o $(COMPLIB) *.plist +@@ -88,9 +83,11 @@ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \