From owner-svn-ports-head@FreeBSD.ORG Mon Aug 13 19:40:37 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0131E106564A; Mon, 13 Aug 2012 19:40:37 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D74078FC08; Mon, 13 Aug 2012 19:40:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7DJeavA084259; Mon, 13 Aug 2012 19:40:36 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7DJeaKA084255; Mon, 13 Aug 2012 19:40:36 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201208131940.q7DJeaKA084255@svn.freebsd.org> From: Guido Falsi Date: Mon, 13 Aug 2012 19:40:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302478 - in head/x11-toolkits/scintilla: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 19:40:37 -0000 Author: madpilot Date: Mon Aug 13 19:40:36 2012 New Revision: 302478 URL: http://svn.freebsd.org/changeset/ports/302478 Log: - Update to 3.2.1 PR: ports/170564 Submitted by: Naram Qashat (maintainer) Approved by: tabthorpe (mentor) Modified: head/x11-toolkits/scintilla/Makefile (contents, props changed) head/x11-toolkits/scintilla/distinfo (contents, props changed) head/x11-toolkits/scintilla/files/patch-aa (contents, props changed) Modified: head/x11-toolkits/scintilla/Makefile ============================================================================== --- head/x11-toolkits/scintilla/Makefile Mon Aug 13 19:07:12 2012 (r302477) +++ head/x11-toolkits/scintilla/Makefile Mon Aug 13 19:40:36 2012 (r302478) @@ -6,8 +6,7 @@ # $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $ PORTNAME= scintilla -PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTVERSION= 3.2.1 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 Mon Aug 13 19:07:12 2012 (r302477) +++ head/x11-toolkits/scintilla/distinfo Mon Aug 13 19:40:36 2012 (r302478) @@ -1,2 +1,2 @@ -SHA256 (scite310.tgz) = 09b020a331f7c54edd731440fa1c717776021d5dc775e58965f8ef71673202e3 -SIZE (scite310.tgz) = 1933322 +SHA256 (scite321.tgz) = f95c89074fd73a22b783b5582d3b23cdbd4b7eb38ab407721a702c4a1bcb678c +SIZE (scite321.tgz) = 2043490 Modified: head/x11-toolkits/scintilla/files/patch-aa ============================================================================== --- head/x11-toolkits/scintilla/files/patch-aa Mon Aug 13 19:07:12 2012 (r302477) +++ head/x11-toolkits/scintilla/files/patch-aa Mon Aug 13 19:40:36 2012 (r302478) @@ -1,12 +1,15 @@ ---- makefile.orig 2012-01-27 18:52:23.000000000 -0500 -+++ makefile 2012-02-12 14:28:24.000000000 -0500 -@@ -7,14 +7,7 @@ +--- makefile.orig 2012-06-01 04:26:24.000000000 -0400 ++++ makefile 2012-08-12 14:34:52.000000000 -0400 +@@ -7,17 +7,7 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a -ifdef CLANG --CC = clang --CCOMP = clang +-ifdef CLANG_ANALYZE +-ANALYZE=--analyze +-endif +-CC = clang $(ANALYZE) +-CCOMP = clang $(ANALYZE) -else -CC = g++ -CCOMP = gcc @@ -16,7 +19,7 @@ RANLIB = touch ifdef GTK3 -@@ -36,7 +29,8 @@ +@@ -39,7 +29,8 @@ COMPLIB=..\bin\scintilla.a else DEL = rm -f @@ -26,7 +29,7 @@ endif vpath %.h ../src ../include ../lexlib -@@ -63,6 +57,7 @@ +@@ -66,6 +57,7 @@ CFLAGS:=$(CXXTFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) @@ -34,7 +37,7 @@ MARSHALLER=scintilla-marshal.o .cxx.o: -@@ -72,7 +67,7 @@ +@@ -75,7 +67,7 @@ LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) @@ -43,7 +46,7 @@ clean: $(DEL) *.o $(COMPLIB) -@@ -85,9 +80,11 @@ +@@ -88,9 +80,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 \