diff options
| -rw-r--r-- | editors/scite/Makefile | 2 | ||||
| -rw-r--r-- | editors/scite/distinfo | 4 | ||||
| -rw-r--r-- | editors/scite/files/patch-makefile | 6 | ||||
| -rw-r--r-- | editors/scite/pkg-plist | 2 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-makefile | 10 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/pkg-plist | 1 |
8 files changed, 15 insertions, 16 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile index 973420c17321..31d1ade1ec51 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.4.4 +PORTVERSION= 3.5.1 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} diff --git a/editors/scite/distinfo b/editors/scite/distinfo index 7ab540d3f6b8..45327911ae49 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499 -SIZE (scite344.tgz) = 2245870 +SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581 +SIZE (scite351.tgz) = 2272014 diff --git a/editors/scite/files/patch-makefile b/editors/scite/files/patch-makefile index 457f46b4801a..4ca96963fef6 100644 --- a/editors/scite/files/patch-makefile +++ b/editors/scite/files/patch-makefile @@ -1,5 +1,5 @@ ---- ./makefile.orig 2014-07-25 07:00:13.000000000 -0400 -+++ ./makefile 2014-08-07 21:57:08.000000000 -0400 +--- makefile.orig 2014-08-09 23:52:11 UTC ++++ makefile @@ -5,14 +5,6 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. @@ -9,7 +9,7 @@ -# thread also need to create Position Independent Executable -> search online documentation -SANITIZE = address -#SANITIZE = undefined --CXX = clang++ -fsanitize=$(SANITIZE) --std=c++0x +-CXX = clang++ -fsanitize=$(SANITIZE) --std=c++0x -Wno-deprecated-register -CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body -endif diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist index ea394f1598f7..c568ccd02512 100644 --- a/editors/scite/pkg-plist +++ b/editors/scite/pkg-plist @@ -63,6 +63,7 @@ share/pixmaps/Sci48M.png %%DATADIR%%/python.properties %%DATADIR%%/r.properties %%DATADIR%%/rebol.properties +%%DATADIR%%/registry.properties %%DATADIR%%/ruby.properties %%DATADIR%%/rust.properties %%DATADIR%%/scriptol.properties @@ -80,4 +81,3 @@ share/pixmaps/Sci48M.png %%DATADIR%%/verilog.properties %%DATADIR%%/vhdl.properties %%DATADIR%%/yaml.properties -@dirrm %%DATADIR%% diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index c4b0c259bc38..4645e9f16403 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.4.4 +PORTVERSION= 3.5.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 7ab540d3f6b8..45327911ae49 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499 -SIZE (scite344.tgz) = 2245870 +SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581 +SIZE (scite351.tgz) = 2272014 diff --git a/x11-toolkits/scintilla/files/patch-makefile b/x11-toolkits/scintilla/files/patch-makefile index f07d7225376e..e70955f6267b 100644 --- a/x11-toolkits/scintilla/files/patch-makefile +++ b/x11-toolkits/scintilla/files/patch-makefile @@ -1,11 +1,11 @@ ---- ./makefile.orig 2014-07-25 06:59:40.000000000 -0400 -+++ ./makefile 2014-08-07 08:31:47.000000000 -0400 +--- makefile.orig 2014-08-09 23:52:02 UTC ++++ makefile @@ -7,14 +7,6 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a -ifdef CLANG --CXX = clang++ +-CXX = clang++ -Wno-deprecated-register -CC = clang -# 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 @@ -49,8 +49,8 @@ clean: $(DEL) *.o $(COMPLIB) *.plist -@@ -93,9 +85,11 @@ - ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \ +@@ -94,9 +86,11 @@ + 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 \ - $(MARSHALLER) $(LEXOBJS) diff --git a/x11-toolkits/scintilla/pkg-plist b/x11-toolkits/scintilla/pkg-plist index 4589adf0b057..1ec6d5e076b3 100644 --- a/x11-toolkits/scintilla/pkg-plist +++ b/x11-toolkits/scintilla/pkg-plist @@ -7,4 +7,3 @@ lib/libscintilla.so lib/libscintilla.so.2 lib/libscintilla_lexers.so lib/libscintilla_lexers.so.2 -@dirrm include/scintilla |