svn commit: r462677 - in head: editors/scite x11-toolkits/scintilla x11-toolkits/scintilla/files

[Yuri Victorovich]

Author: yuri
Date: Fri Feb 23 07:46:00 2018
New Revision: 462677
URL: https://svnweb.freebsd.org/changeset/ports/462677

Log:
  x11-toolkits/scintilla editors/scite: Update to 4.0.2
  
  Also changed to DISTVERSION.
  
  PR:		225221
  Submitted by:	Naram Qashat <cyberbotx at cyberbotx.com> (maintainer)
  Approved by:	tcberner (mentor, implicit)

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-makefile
  head/x11-toolkits/scintilla/pkg-plist

Modified: head/editors/scite/Makefile
==============================================================================
--- head/editors/scite/Makefile	Fri Feb 23 07:24:18 2018	(r462676)
+++ head/editors/scite/Makefile	Fri Feb 23 07:46:00 2018	(r462677)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scite
-PORTVERSION=	3.7.5
-PORTREVISION=	1
+DISTVERSION=	4.0.2
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -23,7 +22,7 @@ OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-USES=		compiler:c++11-lib desktop-file-utils gmake pkgconfig tar:tgz
+USES=		compiler:c++14-lang desktop-file-utils gmake pkgconfig tar:tgz
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 MAKEFILE=	makefile
 

Modified: head/editors/scite/distinfo
==============================================================================
--- head/editors/scite/distinfo	Fri Feb 23 07:24:18 2018	(r462676)
+++ head/editors/scite/distinfo	Fri Feb 23 07:46:00 2018	(r462677)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495751226
-SHA256 (scite375.tgz) = 51e6861284077268d4929bb2ff9c516e2ca8914b2bd0ac315d177befe24aef86
-SIZE (scite375.tgz) = 2380823
+TIMESTAMP = 1516108933
+SHA256 (scite402.tgz) = 1f9bb8eccbaed77c110c30c0e6dbaac04b3f62b751a930192b133a7b6f0f29fb
+SIZE (scite402.tgz) = 2424648

Modified: head/x11-toolkits/scintilla/Makefile
==============================================================================
--- head/x11-toolkits/scintilla/Makefile	Fri Feb 23 07:24:18 2018	(r462676)
+++ head/x11-toolkits/scintilla/Makefile	Fri Feb 23 07:46:00 2018	(r462677)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scintilla
-PORTVERSION=	3.7.5
-PORTREVISION=	1
+DISTVERSION=	4.0.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
@@ -18,7 +17,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-USES=		compiler:c++11-lib gmake iconv pkgconfig tar:tgz
+USES=		compiler:c++14-lang gmake iconv pkgconfig tar:tgz
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk20

Modified: head/x11-toolkits/scintilla/distinfo
==============================================================================
--- head/x11-toolkits/scintilla/distinfo	Fri Feb 23 07:24:18 2018	(r462676)
+++ head/x11-toolkits/scintilla/distinfo	Fri Feb 23 07:46:00 2018	(r462677)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495751226
-SHA256 (scite375.tgz) = 51e6861284077268d4929bb2ff9c516e2ca8914b2bd0ac315d177befe24aef86
-SIZE (scite375.tgz) = 2380823
+TIMESTAMP = 1516053463
+SHA256 (scite402.tgz) = 1f9bb8eccbaed77c110c30c0e6dbaac04b3f62b751a930192b133a7b6f0f29fb
+SIZE (scite402.tgz) = 2424648

Modified: head/x11-toolkits/scintilla/files/patch-makefile
==============================================================================
--- head/x11-toolkits/scintilla/files/patch-makefile	Fri Feb 23 07:24:18 2018	(r462676)
+++ head/x11-toolkits/scintilla/files/patch-makefile	Fri Feb 23 07:46:00 2018	(r462677)
@@ -1,21 +1,24 @@
---- makefile.orig	2017-05-24 01:26:25 UTC
+--- makefile.orig	2017-08-16 07:34:01 UTC
 +++ makefile
-@@ -9,14 +9,6 @@
+@@ -9,17 +9,7 @@
  srcdir ?= .
  
  .SUFFIXES: .cxx .c .o .h .a .list
 -ifdef CLANG
--CXX = clang++ -Wno-deprecated-register
+-CXX = clang++
+ CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
 -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
 -SANITIZE = address
 -#SANITIZE = undefined
+-else
+-CXXWARNFLAGS = -Wall -pedantic
 -endif
  ARFLAGS = rc
  RANLIB = touch
  
-@@ -45,7 +37,12 @@ DEL = del /q
+@@ -48,7 +38,12 @@ DEL = del /q
  COMPLIB=$(srcdir)\..\bin\scintilla.a
  else
  DEL = rm -f
@@ -29,7 +32,7 @@
  endif
  
  vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
-@@ -98,7 +95,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
+@@ -101,7 +96,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
  
  LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
  
@@ -38,7 +41,7 @@
  
  clean:
  	$(DEL) *.o $(COMPLIB) *.plist
-@@ -119,9 +116,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le
+@@ -122,9 +117,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De
  	PropSetSimple.o PlatGTK.o \
  	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
  	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \

Modified: head/x11-toolkits/scintilla/pkg-plist
==============================================================================
--- head/x11-toolkits/scintilla/pkg-plist	Fri Feb 23 07:24:18 2018	(r462676)
+++ head/x11-toolkits/scintilla/pkg-plist	Fri Feb 23 07:46:00 2018	(r462677)
@@ -1,4 +1,5 @@
 include/scintilla/ILexer.h
+include/scintilla/ILoader.h
 include/scintilla/Platform.h
 include/scintilla/Sci_Position.h
 include/scintilla/SciLexer.h