diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2012-08-13 19:40:36 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2012-08-13 19:40:36 +0000 |
| commit | 05c9737e366d30e801ef1c2e1d59d5d7c604993c (patch) | |
| tree | 73c28021c308f4d072ebb6c7a604c327744e90aa /x11-toolkits | |
| parent | c3fffa8afeb0c8a35715b5e1ece3d94c2b1c4ef8 (diff) | |
| download | ports-05c9737e366d30e801ef1c2e1d59d5d7c604993c.tar.gz ports-05c9737e366d30e801ef1c2e1d59d5d7c604993c.zip | |
Notes
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 21 |
3 files changed, 15 insertions, 13 deletions
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index 738ab84c5dd6..90a3f4650468 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -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} diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo index 0f8084b5e125..d60b41286562 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite310.tgz) = 09b020a331f7c54edd731440fa1c717776021d5dc775e58965f8ef71673202e3 -SIZE (scite310.tgz) = 1933322 +SHA256 (scite321.tgz) = f95c89074fd73a22b783b5582d3b23cdbd4b7eb38ab407721a702c4a1bcb678c +SIZE (scite321.tgz) = 2043490 diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 893662e215fc..b2391ac65c90 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -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 \ |