From owner-svn-ports-head@FreeBSD.ORG Wed Feb 27 11:47:51 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5958FFC4; Wed, 27 Feb 2013 11:47:51 +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 3DF8AA85; Wed, 27 Feb 2013 11:47:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RBlp8C033571; Wed, 27 Feb 2013 11:47:51 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RBlogf033567; Wed, 27 Feb 2013 11:47:50 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201302271147.r1RBlogf033567@svn.freebsd.org> From: Max Brazhnikov Date: Wed, 27 Feb 2013 11:47:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313047 - in head/editors/scite: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 27 Feb 2013 11:47:51 -0000 Author: makc Date: Wed Feb 27 11:47:50 2013 New Revision: 313047 URL: http://svnweb.freebsd.org/changeset/ports/313047 Log: Update to 3.2.5 PR: ports/176458 Submitted by: Naram Qashat (maintainer) Modified: head/editors/scite/Makefile head/editors/scite/distinfo head/editors/scite/files/patch-aa (contents, props changed) Modified: head/editors/scite/Makefile ============================================================================== --- head/editors/scite/Makefile Wed Feb 27 11:47:26 2013 (r313046) +++ head/editors/scite/Makefile Wed Feb 27 11:47:50 2013 (r313047) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.2.4 +PORTVERSION= 3.2.5 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} Modified: head/editors/scite/distinfo ============================================================================== --- head/editors/scite/distinfo Wed Feb 27 11:47:26 2013 (r313046) +++ head/editors/scite/distinfo Wed Feb 27 11:47:50 2013 (r313047) @@ -1,2 +1,2 @@ -SHA256 (scite324.tgz) = bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08 -SIZE (scite324.tgz) = 1956084 +SHA256 (scite325.tgz) = ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef +SIZE (scite325.tgz) = 1974782 Modified: head/editors/scite/files/patch-aa ============================================================================== --- head/editors/scite/files/patch-aa Wed Feb 27 11:47:26 2013 (r313046) +++ head/editors/scite/files/patch-aa Wed Feb 27 11:47:50 2013 (r313047) @@ -1,15 +1,12 @@ ---- makefile.orig 2012-06-01 10:26:56.000000000 +0200 -+++ makefile 2012-08-13 15:57:01.532542909 +0200 -@@ -5,16 +5,6 @@ +--- makefile.orig 2013-02-18 02:21:10.000000000 -0500 ++++ makefile 2013-02-26 18:30:59.000000000 -0500 +@@ -5,13 +5,6 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. .SUFFIXES: .cxx .o .h .a .c -ifdef CLANG --ifdef CLANG_ANALYZE --ANALYZE=--analyze --endif --CC = clang $(ANALYZE) --CCOMP = clang $(ANALYZE) +-CC = clang --std=c++0x +-CCOMP = clang -Wno-empty-body -else -CC = g++ -CCOMP = gcc @@ -17,7 +14,7 @@ AR = ar ifdef GTK3 -@@ -27,7 +17,7 @@ +@@ -24,7 +17,7 @@ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) CONFIGTHREADS:= @@ -26,12 +23,12 @@ ifndef prefix ifdef gnomeprefix prefix=$(gnomeprefix) -@@ -107,8 +97,9 @@ +@@ -109,8 +102,9 @@ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \ - JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) -- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++ +- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) + $(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \ + -o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)