Date: Wed, 11 Sep 2013 16:37:28 +0200 (CEST) From: Guido Falsi <madpilot@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/182014: [PATCH] x11-toolkits/scintilla editor/scite: update to 3.3.5 and unbreak on head Message-ID: <3cZm0m19Lwz2wC@micro.madpilot.net> Resent-Message-ID: <201309111450.r8BEo0jU060231@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182014
>Category: ports
>Synopsis: [PATCH] x11-toolkits/scintilla editor/scite: update to 3.3.5 and unbreak on head
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 11 14:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 9.1-STABLE FreeBSD 9.1-STABLE #21 r252026: Thu Jun 20 16:27:06 CEST 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64
>Description:
- Update scintilla and scite to 3.3.5
- The update fixes build on recent head
>How-To-Repeat:
>Fix:
Index: editors/scite/Makefile
===================================================================
--- editors/scite/Makefile (revision 326981)
+++ editors/scite/Makefile (working copy)
@@ -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}
Index: editors/scite/distinfo
===================================================================
--- editors/scite/distinfo (revision 326981)
+++ editors/scite/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (scite333.tgz) = ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3
-SIZE (scite333.tgz) = 1992362
+SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89
+SIZE (scite335.tgz) = 2099170
Index: x11-toolkits/scintilla/Makefile
===================================================================
--- x11-toolkits/scintilla/Makefile (revision 326981)
+++ x11-toolkits/scintilla/Makefile (working copy)
@@ -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
.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:
Index: x11-toolkits/scintilla/distinfo
===================================================================
--- x11-toolkits/scintilla/distinfo (revision 326981)
+++ x11-toolkits/scintilla/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (scite333.tgz) = ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3
-SIZE (scite333.tgz) = 1992362
+SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89
+SIZE (scite335.tgz) = 2099170
Index: x11-toolkits/scintilla/files/patch-aa
===================================================================
--- x11-toolkits/scintilla/files/patch-aa (revision 326981)
+++ x11-toolkits/scintilla/files/patch-aa (working copy)
@@ -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 $@ $^
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3cZm0m19Lwz2wC>