diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2013-09-12 11:34:39 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2013-09-12 11:34:39 +0000 |
| commit | 644b855b6e840b913b6f7403737e5528527f7dcf (patch) | |
| tree | 4e8cbfc1bed925addde70b69dd1d8c8441cacc72 /x11-toolkits/scintilla | |
| parent | 9518965c2157ea68db1e58608deac0c3d7463bbb (diff) | |
| download | ports-644b855b6e840b913b6f7403737e5528527f7dcf.tar.gz ports-644b855b6e840b913b6f7403737e5528527f7dcf.zip | |
- Update scintilla and scite to 3.3.5
- The update fixes build on recent head
PR: ports/182014
Submitted by: me
Approved by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=327053
Diffstat (limited to 'x11-toolkits/scintilla')
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 11 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 14 |
3 files changed, 19 insertions, 10 deletions
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index 6f2b4a5f4e5d..1889bbb6c308 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.3.3 +PORTVERSION= 3.3.5 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} @@ -28,8 +28,17 @@ PICFLAG?= -fPIC PICFLAG?= -fpic .endif +CCISCLANG!= ${CC} --version + +.if empty(CCISCLANG:M*clang*) +CPPSTDRE= -e 's|--std=c++0x||' +.else +CPPSTDRE= +.endif + post-patch: @${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g' \ + ${CPPSTDRE} \ ${WRKSRC}/makefile do-install: diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo index 92cff5c6d8f8..70f1da111ad7 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite333.tgz) = ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3 -SIZE (scite333.tgz) = 1992362 +SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 +SIZE (scite335.tgz) = 2099170 diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 0bf57df19ec4..cd5b51477d0c 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -1,11 +1,11 @@ ---- makefile.orig 2013-02-18 02:20:43.000000000 -0500 -+++ makefile 2013-02-26 18:16:54.000000000 -0500 +--- makefile.orig 2013-08-31 05:20:24.000000000 +0200 ++++ makefile 2013-09-11 13:10:02.007909736 +0200 @@ -7,14 +7,7 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a -ifdef CLANG --CC = clang --std=c++0x +-CC = clang -CCOMP = clang -else -CC = g++ @@ -26,8 +26,8 @@ endif vpath %.h ../src ../include ../lexlib -@@ -63,16 +57,17 @@ - CFLAGS:=$(CXXTFLAGS) +@@ -68,16 +62,17 @@ + CXXTFLAGS:=--std=c++0x $(CTFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) +CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION)) @@ -46,9 +46,9 @@ clean: $(DEL) *.o $(COMPLIB) *.plist -@@ -88,9 +83,11 @@ +@@ -93,9 +88,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 \ + KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ - $(MARSHALLER) $(LEXOBJS) - $(AR) rc $@ $^ |