ports/156761: [MAINTAINER] x11-toolkits/scintilla: update to 2.25

[Naram Qashat]

>Number:         156761
>Category:       ports
>Synopsis:       [MAINTAINER] x11-toolkits/scintilla: update to 2.25
>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:   Mon May 02 01:40:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.2-RELEASE FreeBSD 8.2-RELEASE #3: Sun Feb 27 08:58:31 EST 2011
>Description:
- Update to 2.25

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- scintilla-2.25.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/Makefile /kirby/shared/ports/scintilla/Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile	2011-02-06 12:37:11.000000000 -0500
+++ /kirby/shared/ports/scintilla/Makefile	2011-05-01 19:52:35.000000000 -0400
@@ -6,7 +6,7 @@
 #    $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
 
 PORTNAME=	scintilla
-PORTVERSION=	2.24
+PORTVERSION=	2.25
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/distinfo /kirby/shared/ports/scintilla/distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo	2011-02-06 12:37:11.000000000 -0500
+++ /kirby/shared/ports/scintilla/distinfo	2011-05-01 19:52:44.000000000 -0400
@@ -1,2 +1,2 @@
-SHA256 (scite224.tgz) = b2de71d4e9d36465e410dd41186ab86d287be5a00e3d06037cb40bb4510f7360
-SIZE (scite224.tgz) = 1829813
+SHA256 (scite225.tgz) = e9f1c7d5909fca359cb2993eb82a07b3323d53bcd0d4ba1e8ff181a8d471061f
+SIZE (scite225.tgz) = 1843570
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/files/patch-aa /kirby/shared/ports/scintilla/files/patch-aa
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa	2010-06-02 19:42:39.000000000 -0400
+++ /kirby/shared/ports/scintilla/files/patch-aa	2011-05-01 19:57:33.000000000 -0400
@@ -1,5 +1,5 @@
---- makefile.orig	2010-05-31 23:35:35.000000000 -0400
-+++ makefile	2010-06-01 17:41:51.000000000 -0400
+--- makefile.orig	2011-03-17 18:41:24.000000000 -0400
++++ makefile	2011-05-01 19:57:17.000000000 -0400
 @@ -7,14 +7,14 @@
  # Also works with ming32-make on Windows.
  
@@ -22,18 +22,18 @@
 +AR = $(CXX) -shared
  RANLIB = touch
  
- ifndef windir
-@@ -23,7 +23,8 @@
- endif
- endif
- 
+ # Environment variable windir always defined on Win32
+@@ -30,7 +30,8 @@
+ COMPLIB=..\bin\scintilla.a
+ else
+ DEL = rm -f
 -COMPLIB=../bin/scintilla.a
 +COMPLIB=../bin/libscintilla.so.2
 +LEXRLIB=../bin/libscintilla_lexers.so.2
+ endif
  
- vpath %.h ../src ../include
- vpath %.cxx ../src
-@@ -38,18 +39,18 @@
+ vpath %.h ../src ../include ../lexlib
+@@ -47,22 +48,22 @@
  endif
  
  ifdef DEBUG
@@ -55,19 +55,15 @@
 -	$(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
 +	$(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
  
- #++Autogenerated -- run src/LexGen.py to regenerate
- #**LEXOBJS=\\\n\(\*.o \)
-@@ -68,7 +69,7 @@
- LexVHDL.o LexYAML.o
- #--Autogenerated -- end of automatically generated section
+ LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
  
 -all: $(COMPLIB)
 +all: $(COMPLIB) $(LEXRLIB)
  
  clean:
- 	rm -f *.o $(COMPLIB)
-@@ -81,9 +82,11 @@
- 	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
+ 	$(DEL) *.o $(COMPLIB)
+@@ -75,9 +76,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 \
 -	$(MARSHALLER) $(LEXOBJS)
--- scintilla-2.25.patch ends here ---

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