Date: Thu, 12 Sep 2013 11:34:39 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327053 - in head: editors/scite x11-toolkits/scintilla x11-toolkits/scintilla/files Message-ID: <201309121134.r8CBYd7n069581@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Sep 12 11:34:39 2013 New Revision: 327053 URL: http://svnweb.freebsd.org/changeset/ports/327053 Log: - 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) Modified: head/editors/scite/Makefile head/editors/scite/distinfo head/x11-toolkits/scintilla/Makefile head/x11-toolkits/scintilla/distinfo head/x11-toolkits/scintilla/files/patch-aa Modified: head/editors/scite/Makefile ============================================================================== --- head/editors/scite/Makefile Thu Sep 12 10:20:45 2013 (r327052) +++ head/editors/scite/Makefile Thu Sep 12 11:34:39 2013 (r327053) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.3.3 +PORTVERSION= 3.3.5 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} Modified: head/editors/scite/distinfo ============================================================================== --- head/editors/scite/distinfo Thu Sep 12 10:20:45 2013 (r327052) +++ head/editors/scite/distinfo Thu Sep 12 11:34:39 2013 (r327053) @@ -1,2 +1,2 @@ -SHA256 (scite333.tgz) = ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3 -SIZE (scite333.tgz) = 1992362 +SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 +SIZE (scite335.tgz) = 2099170 Modified: head/x11-toolkits/scintilla/Makefile ============================================================================== --- head/x11-toolkits/scintilla/Makefile Thu Sep 12 10:20:45 2013 (r327052) +++ head/x11-toolkits/scintilla/Makefile Thu Sep 12 11:34:39 2013 (r327053) @@ -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: Modified: head/x11-toolkits/scintilla/distinfo ============================================================================== --- head/x11-toolkits/scintilla/distinfo Thu Sep 12 10:20:45 2013 (r327052) +++ head/x11-toolkits/scintilla/distinfo Thu Sep 12 11:34:39 2013 (r327053) @@ -1,2 +1,2 @@ -SHA256 (scite333.tgz) = ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3 -SIZE (scite333.tgz) = 1992362 +SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 +SIZE (scite335.tgz) = 2099170 Modified: head/x11-toolkits/scintilla/files/patch-aa ============================================================================== --- head/x11-toolkits/scintilla/files/patch-aa Thu Sep 12 10:20:45 2013 (r327052) +++ head/x11-toolkits/scintilla/files/patch-aa Thu Sep 12 11:34:39 2013 (r327053) @@ -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 $@ $^
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309121134.r8CBYd7n069581>