- Update to 1.70

PR:		ports/99442
Submitted by:	Mark Schellhase <15874d@gmail.com>

4 files changed, 88 insertions, 78 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 8861c6a81ac6..ede2873ce48f 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	skite
+# New ports collection makefile for:	scite
 # Date created:				27 November 2000
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.62
-PORTREVISION=	2
+PORTVERSION=	1.70
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 35d221789f64..37a1f2ae24ea 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,3 +1,3 @@
-MD5 (scite162.tgz) = 4d34c8b669f0a8e0ae862a8e56fd8d01
-SHA256 (scite162.tgz) = c2469ad27dbcbdedcd50752310837a938b84c5895d2b6191d26fdc47fcbc7720
-SIZE (scite162.tgz) = 1140114
+MD5 (scite170.tgz) = bf7509820b23438e272d7526e1058bff
+SHA256 (scite170.tgz) = 7c786ddc00799e6f4f30a2b475a776fc49563087853f585f986f098e07797bf5
+SIZE (scite170.tgz) = 1298313
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index f242d49f57f5..455c64b317a4 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.orig	Fri Aug 20 09:21:00 2004
-+++ makefile	Thu Feb  3 19:14:13 2005
+--- makefile.bak	Mon Feb 13 07:27:08 2006
++++ makefile		Sat Jun 24 09:06:54 2006
 @@ -5,7 +5,7 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
  
@@ -34,7 +34,7 @@
  #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
 -INCLUDEDIRS=-I ../../scintilla/include -I ../src
 +INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
- CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+ CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
  
  ifdef DEBUG
 -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -45,15 +45,16 @@
  endif
  
  ifndef NO_LUA
-@@ -102,8 +102,9 @@
+@@ -102,9 +102,9 @@
  
- $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
+ $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
  MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
 -	$(COMPLIB) $(LUA_OBJS)
 -	$(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
+-
 +	$(LUA_OBJS)
 +	$(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \
 +	`$(CONFIGTHREADS)` -DGTK $^ -o $@
- 
  # Automatically generate header dependencies with "make deps"
  include deps.mak
+ 
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 03794672b053..661cef0e6f74 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -1,69 +1,79 @@
 bin/SciTE
 share/gnome/applications/SciTE.desktop
 share/gnome/pixmaps/Sci48M.png
-%%DATADIR%%/Embedded.properties
-%%DATADIR%%/PrintHi.png
-%%DATADIR%%/SciBreak2.jpg
-%%DATADIR%%/SciTE.html
-%%DATADIR%%/SciTE.properties
-%%DATADIR%%/SciTEDirector.html
-%%DATADIR%%/SciTEDoc.html
-%%DATADIR%%/SciTEDownload.html
-%%DATADIR%%/SciTEExtension.html
-%%DATADIR%%/SciTEExternalLexer.html
-%%DATADIR%%/SciTEExtras.html
-%%DATADIR%%/SciTEFAQ.html
-%%DATADIR%%/SciTEGlobal.properties
-%%DATADIR%%/SciTEIco.png
-%%DATADIR%%/SciTEImage.html
-%%DATADIR%%/SciTELexer.html
-%%DATADIR%%/SciTELua.html
-%%DATADIR%%/SciTERegEx.html
-%%DATADIR%%/SciTETranslation.html
-%%DATADIR%%/SciTEWord.jpg
-%%DATADIR%%/abbrev.properties
-%%DATADIR%%/ada.properties
-%%DATADIR%%/asn1.properties
-%%DATADIR%%/asm.properties
-%%DATADIR%%/au3.properties
-%%DATADIR%%/ave.properties
-%%DATADIR%%/baan.properties
-%%DATADIR%%/bullant.properties
-%%DATADIR%%/conf.properties
-%%DATADIR%%/cpp.properties
-%%DATADIR%%/css.properties
-%%DATADIR%%/demo.png
-%%DATADIR%%/eiffel.properties
-%%DATADIR%%/erlang.properties
-%%DATADIR%%/escript.properties
-%%DATADIR%%/forth.properties
-%%DATADIR%%/fortran.properties
-%%DATADIR%%/html.properties
-%%DATADIR%%/kix.properties
-%%DATADIR%%/latex.properties
-%%DATADIR%%/lisp.properties
-%%DATADIR%%/lot.properties
-%%DATADIR%%/lout.properties
-%%DATADIR%%/lua.properties
-%%DATADIR%%/matlab.properties
-%%DATADIR%%/metapost.properties
-%%DATADIR%%/mmixal.properties
-%%DATADIR%%/nncrontab.properties
-%%DATADIR%%/nsis.properties
-%%DATADIR%%/others.properties
-%%DATADIR%%/pascal.properties
-%%DATADIR%%/perl.properties
-%%DATADIR%%/pov.properties
-%%DATADIR%%/ps.properties
-%%DATADIR%%/python.properties
-%%DATADIR%%/ruby.properties
-%%DATADIR%%/scriptol.properties
-%%DATADIR%%/specman.properties
-%%DATADIR%%/sql.properties
-%%DATADIR%%/tcl.properties
-%%DATADIR%%/tex.properties
-%%DATADIR%%/vb.properties
-%%DATADIR%%/verilog.properties
-%%DATADIR%%/vhdl.properties
-%%DATADIR%%/yaml.properties
-@dirrm %%DATADIR%%
+share/scite/Embedded.properties
+share/scite/PrintHi.png
+share/scite/SciBreak2.jpg
+share/scite/SciTE.html
+share/scite/SciTE.properties
+share/scite/SciTEDirector.html
+share/scite/SciTEDoc.html
+share/scite/SciTEDownload.html
+share/scite/SciTEExtension.html
+share/scite/SciTEExternalLexer.html
+share/scite/SciTEExtras.html
+share/scite/SciTEFAQ.html
+share/scite/SciTEGlobal.properties
+share/scite/SciTEIco.png
+share/scite/SciTEImage.html
+share/scite/SciTELexer.html
+share/scite/SciTELua.html
+share/scite/SciTERegEx.html
+share/scite/SciTEWord.jpg
+share/scite/abbrev.properties
+share/scite/ada.properties
+share/scite/asm.properties
+share/scite/asn1.properties
+share/scite/au3.properties
+share/scite/ave.properties
+share/scite/baan.properties
+share/scite/blitzbasic.properties
+share/scite/bullant.properties
+share/scite/caml.properties
+share/scite/conf.properties
+share/scite/cpp.properties
+share/scite/csound.properties
+share/scite/css.properties
+share/scite/demo.png
+share/scite/eiffel.properties
+share/scite/erlang.properties
+share/scite/escript.properties
+share/scite/flagship.properties
+share/scite/forth.properties
+share/scite/fortran.properties
+share/scite/freebasic.properties
+share/scite/html.properties
+share/scite/inno.properties
+share/scite/kix.properties
+share/scite/latex.properties
+share/scite/lisp.properties
+share/scite/lot.properties
+share/scite/lout.properties
+share/scite/lua.properties
+share/scite/matlab.properties
+share/scite/metapost.properties
+share/scite/mmixal.properties
+share/scite/nncrontab.properties
+share/scite/nsis.properties
+share/scite/opal.properties
+share/scite/others.properties
+share/scite/pascal.properties
+share/scite/perl.properties
+share/scite/pov.properties
+share/scite/ps.properties
+share/scite/purebasic.properties
+share/scite/python.properties
+share/scite/rebol.properties
+share/scite/ruby.properties
+share/scite/scriptol.properties
+share/scite/smalltalk.properties
+share/scite/specman.properties
+share/scite/spice.properties
+share/scite/sql.properties
+share/scite/tcl.properties
+share/scite/tex.properties
+share/scite/vb.properties
+share/scite/verilog.properties
+share/scite/vhdl.properties
+share/scite/yaml.properties
+@dirrm share/scite