7 files changed, 48 insertions, 66 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 081144c785b8..973420c17321 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scite
-PORTVERSION=	3.4.1
+PORTVERSION=	3.4.4
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -27,8 +27,7 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g ; \
-		s| -Os||g' ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
 .if ${PORT_OPTIONS:MFULL_BUFFER_MENU}
 	@${REINPLACE_CMD} -e 's|30, "/Buffers|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers|g' ${WRKSRC}/SciTEGTK.cxx
 .endif
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 1c0edc2a254a..7ab540d3f6b8 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scite341.tgz) = ab2940ba6ad3f1c7c33aea233dd5b44efc75319062fe0b3625db04c747bf3341
-SIZE (scite341.tgz) = 2237159
+SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499
+SIZE (scite344.tgz) = 2245870
diff --git a/editors/scite/files/patch-makefile b/editors/scite/files/patch-makefile
index 6406833ddcae..457f46b4801a 100644
--- a/editors/scite/files/patch-makefile
+++ b/editors/scite/files/patch-makefile
@@ -1,20 +1,21 @@
---- makefile.orig	2013-10-13 23:38:06.000000000 +0200
-+++ makefile	2014-01-27 15:50:05.858185668 +0100
-@@ -5,13 +5,6 @@
+--- ./makefile.orig	2014-07-25 07:00:13.000000000 -0400
++++ ./makefile	2014-08-07 21:57:08.000000000 -0400
+@@ -5,14 +5,6 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
  
  .SUFFIXES: .cxx .o .h .a .c
 -ifdef CLANG
--CC = clang -fsanitize=address --std=c++0x
--CCOMP = clang -fsanitize=address -Wno-empty-body
--else
--CC = g++
--CCOMP = gcc
+-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
+-# thread also need to create Position Independent Executable -> search online documentation
+-SANITIZE = address
+-#SANITIZE = undefined
+-CXX = clang++ -fsanitize=$(SANITIZE) --std=c++0x
+-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
 -endif
- AR = ar
  
  ifdef GTK3
-@@ -24,7 +17,7 @@
+ GTKVERSION=gtk+-3.0
+@@ -24,7 +16,7 @@
  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
  CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
  CONFIGTHREADS:=
@@ -23,15 +24,15 @@
  ifndef prefix
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
-@@ -116,8 +109,9 @@
- $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
- FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
+@@ -113,8 +105,9 @@
+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
+ Exporters.o  MatchMarker.o StringHelpers.o \
  PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
 -	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
--	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
+-	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
 +	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
-+	$(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \
-+	-o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
++	$(CXX) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
++	$(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
diff --git a/editors/scite/files/patch-src__FilePath.h b/editors/scite/files/patch-src__FilePath.h
deleted file mode 100644
index c0217ff90e43..000000000000
--- a/editors/scite/files/patch-src__FilePath.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../src/FilePath.h.orig	2011-07-31 22:49:30.000000000 -0400
-+++ ../src/FilePath.h	2011-09-06 21:43:03.000000000 -0400
-@@ -13,6 +13,7 @@
- extern const GUI::gui_char fileWrite[];
- 
- #if defined(__unix__)
-+#include <cstdio>
- #include <limits.h>
- #ifdef PATH_MAX
- #define MAX_PATH PATH_MAX
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 68aa7b86e5ba..c4b0c259bc38 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scintilla
-PORTVERSION=	3.4.1
+PORTVERSION=	3.4.4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
@@ -12,7 +12,7 @@ COMMENT=	Full-featured free source code editing component for GTK+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-USES=		compiler gmake iconv pkgconfig tar:tgz
+USES=		gmake iconv pkgconfig tar:tgz
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk20
@@ -27,17 +27,6 @@ PICFLAG?=	-fPIC
 PICFLAG?=	-fpic
 .endif
 
-.if ! ${COMPILER_TYPE:Mclang}
-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:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 1c0edc2a254a..7ab540d3f6b8 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scite341.tgz) = ab2940ba6ad3f1c7c33aea233dd5b44efc75319062fe0b3625db04c747bf3341
-SIZE (scite341.tgz) = 2237159
+SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499
+SIZE (scite344.tgz) = 2245870
diff --git a/x11-toolkits/scintilla/files/patch-makefile b/x11-toolkits/scintilla/files/patch-makefile
index cd5b51477d0c..f07d7225376e 100644
--- a/x11-toolkits/scintilla/files/patch-makefile
+++ b/x11-toolkits/scintilla/files/patch-makefile
@@ -1,22 +1,21 @@
---- makefile.orig	2013-08-31 05:20:24.000000000 +0200
-+++ makefile	2013-09-11 13:10:02.007909736 +0200
-@@ -7,14 +7,7 @@
+--- ./makefile.orig	2014-07-25 06:59:40.000000000 -0400
++++ ./makefile	2014-08-07 08:31:47.000000000 -0400
+@@ -7,14 +7,6 @@
  # Also works with ming32-make on Windows.
  
  .SUFFIXES: .cxx .c .o .h .a
 -ifdef CLANG
+-CXX = clang++
 -CC = clang
--CCOMP = clang
--else
--CC = g++
--CCOMP = gcc
+-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
+-# thread also need to create Position Independent Executable -> search online documentation
+-SANITIZE = address
+-#SANITIZE = undefined
 -endif
--AR = ar
-+AR = $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
  RANLIB = touch
  
  ifdef GTK3
-@@ -36,7 +29,8 @@
+@@ -36,7 +28,8 @@
  COMPLIB=..\bin\scintilla.a
  else
  DEL = rm -f
@@ -26,18 +25,22 @@
  endif
  
  vpath %.h ../src ../include ../lexlib
-@@ -68,16 +62,17 @@
- CXXTFLAGS:=--std=c++0x $(CTFLAGS)
+@@ -64,8 +57,7 @@
+ CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
+ endif
+ 
+-CFLAGS:=$(CTFLAGS)
+-CXXTFLAGS:=--std=c++0x $(CTFLAGS)
++CXXTFLAGS:=$(CTFLAGS)
  
  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
-+CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION))
  MARSHALLER=scintilla-marshal.o
- 
+@@ -73,11 +65,11 @@
  .cxx.o:
- 	$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
+ 	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
  .c.o:
--	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
-+	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) $(CXXFLAGS) -w -c $<
+-	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
++	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
  
  LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
  
@@ -46,7 +49,7 @@
  
  clean:
  	$(DEL) *.o $(COMPLIB) *.plist
-@@ -93,9 +88,11 @@
+@@ -93,9 +85,11 @@
  	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.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 \
@@ -54,10 +57,10 @@
 -	$(AR) rc $@ $^
 -	$(RANLIB) $@
 +	$(MARSHALLER)
-+	$(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
 +
 +$(LEXRLIB): $(LEXOBJS)
-+	$(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak