ports/176457: [MAINTAINER] x11-toolkits/scintilla: update to 3.2.5

[Naram Qashat]

>Number:         176457
>Category:       ports
>Synopsis:       [MAINTAINER] x11-toolkits/scintilla: update to 3.2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 26 23:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 8.3-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.3-RELEASE-p4 FreeBSD 8.3-RELEASE-p4 #4: Mon Oct  1 19:56:21 EDT
>Description:
- Update to 3.2.5

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- scintilla-3.2.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/Makefile ./Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile	2013-01-18 21:32:38.000000000 -0500
+++ ./Makefile	2013-02-26 17:38:59.000000000 -0500
@@ -2,7 +2,7 @@
 # $FreeBSD: head/x11-toolkits/scintilla/Makefile 310600 2013-01-18 12:35:17Z madpilot $
 
 PORTNAME=	scintilla
-PORTVERSION=	3.2.4
+PORTVERSION=	3.2.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/distinfo ./distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo	2013-01-18 21:32:38.000000000 -0500
+++ ./distinfo	2013-02-26 17:21:48.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (scite324.tgz) = bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08
-SIZE (scite324.tgz) = 1956084
+SHA256 (scite325.tgz) = ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef
+SIZE (scite325.tgz) = 1974782
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/files/patch-aa ./files/patch-aa
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa	2012-10-07 17:04:50.000000000 -0400
+++ ./files/patch-aa	2013-02-26 18:17:05.000000000 -0500
@@ -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 \
--- scintilla-3.2.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: