diff options
| author | Dennis Herrmann <dhn@FreeBSD.org> | 2011-05-02 17:34:04 +0000 |
|---|---|---|
| committer | Dennis Herrmann <dhn@FreeBSD.org> | 2011-05-02 17:34:04 +0000 |
| commit | 339668b50d4b33b21a8b49f3a4e2b55946580f3d (patch) | |
| tree | 5c3c076a253d64d21dafcf030288de1db60dab33 /x11-toolkits/scintilla | |
| parent | 6d13208aa53332b4db6e2289e814374e62e2050c (diff) | |
| download | ports-339668b50d4b33b21a8b49f3a4e2b55946580f3d.tar.gz ports-339668b50d4b33b21a8b49f3a4e2b55946580f3d.zip | |
- Update to 2.25
PR: ports/156761
Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=273485
Diffstat (limited to 'x11-toolkits/scintilla')
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 32 |
3 files changed, 17 insertions, 21 deletions
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index 7f2f02d4b0f2..d035fdb2c395 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -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 --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo index 2d71900cf18b..22d24ccaf674 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite224.tgz) = b2de71d4e9d36465e410dd41186ab86d287be5a00e3d06037cb40bb4510f7360 -SIZE (scite224.tgz) = 1829813 +SHA256 (scite225.tgz) = e9f1c7d5909fca359cb2993eb82a07b3323d53bcd0d4ba1e8ff181a8d471061f +SIZE (scite225.tgz) = 1843570 diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index ec326e8d330b..9b3bb463809f 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -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) |