Update to 1.37.

8 files changed, 32 insertions, 33 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index c239f41c8ec6..e6680c1fc03d 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.36
+PORTVERSION=	1.37
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 8cb605b48339..6fc0cf5e5f24 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite136.tgz) = 037829f907809630ff77278ea63ba173
+MD5 (scite137.tgz) = 157c67f633b1b69f297869112e8141d4
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index b239d087b7b0..b3e5bf079e1f 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- makefile.orig	Mon Feb 26 13:19:04 2001
-+++ makefile	Fri Mar  2 11:43:00 2001
-@@ -10,34 +10,35 @@
+--- makefile.orig	Sun Apr 15 10:25:06 2001
++++ makefile	Tue Apr 17 14:16:28 2001
+@@ -10,34 +10,34 @@
  
  # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
  # "h@h@" is printed here when gnome-config unavailable. Seems harmless.
 -gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
-+gnomeprefix=$(PREFIX)
++gnomeprefix:=$(PREFIX)
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
 -  datadir=$(gnomeprefix)/share
@@ -29,10 +29,8 @@ $FreeBSD$
  
  #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
 -INCLUDEDIRS=-I ../../scintilla/include -I ../src
--CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -W -Wall
 +INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
-+CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -W -Wall \
-+	      $(shell $(GTK_CONFIG) --cflags)
+ CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
  
  ifdef DEBUG
 -CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
@@ -43,13 +41,13 @@ $FreeBSD$
  endif
  
  .cxx.o:
--	$(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
-+	$(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
+-	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $< -o $@
++	$(CC) $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< -o $@
  
  all: $(PROG)
  
-@@ -55,8 +56,8 @@
- 	../../scintilla/gtk/LexVB.o
+@@ -51,8 +51,8 @@
+ LEXEROBJS=$(wildcard ../../scintilla/gtk/Lex*.o)
  
  $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
 -SciTEProps.o ../../scintilla/bin/scintilla.a $(LEXEROBJS)
@@ -59,7 +57,7 @@ $FreeBSD$
  
  # SciTE-static no longer builds. Kept here in case of later need.
  SciTE-static: SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o SciTEProps.o \
-@@ -83,12 +84,12 @@
+@@ -66,12 +66,12 @@
  # This is OK - just means no SciTE in the Gnome Applications menu
  # Dead:	install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
  install:
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index a1192295d5b2..822f974468d7 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -4,6 +4,8 @@ share/gnome/pixmaps/Sci48M.png
 share/gnome/scite/Embedded.properties
 share/gnome/scite/SciTE.properties
 share/gnome/scite/SciTEGlobal.properties
+share/gnome/scite/abbrev.properties
+share/gnome/scite/ada.properties
 share/gnome/scite/ave.properties
 share/gnome/scite/conf.properties
 share/gnome/scite/cpp.properties
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index f972af31fef3..7d4071ec8692 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.36
+PORTVERSION=	1.37
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 8cb605b48339..6fc0cf5e5f24 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite136.tgz) = 037829f907809630ff77278ea63ba173
+MD5 (scite137.tgz) = 157c67f633b1b69f297869112e8141d4
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index 4c0e81776908..d99d741cb65f 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,15 +1,15 @@
 
 $FreeBSD$
 
---- makefile.orig	Thu Feb  1 10:12:22 2001
-+++ makefile	Fri Mar  2 11:12:31 2001
-@@ -5,38 +5,42 @@
+--- makefile.orig	Sun Apr 15 10:24:36 2001
++++ makefile	Tue Apr 17 14:04:58 2001
+@@ -5,10 +5,11 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
  
  .SUFFIXES: .cxx .o .h .a
 -CC = g++
 -AR = ar
-+CC ?= c++
++CC ?= g++
 +AR = $(CC) -shared
  
 -COMPLIB=../bin/scintilla.a
@@ -18,10 +18,8 @@ $FreeBSD$
  
  vpath %.h ../src ../include
  vpath %.cxx ../src
- 
- INCLUDEDIRS=-I ../include -I ../src
--CXXBASEFLAGS= -DGTK -DSCI_LEXER -W -Wall
-+CXXBASEFLAGS= -DGTK -DSCI_LEXER -W -Wall $(shell $(GTK_CONFIG) --cflags)
+@@ -17,20 +18,20 @@
+ CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS)
  
  ifdef DEBUG
 -CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
@@ -32,26 +30,28 @@ $FreeBSD$
  endif
  
  .cxx.o:
--	$(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
-+	$(CC) -DPIC -fPIC -fpic $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
+-	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
++	$(CC) -DPIC -fPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
  
- LEXOBJS	=  LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o \
- 	LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o
+ LEXOBJS	= LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o \
+ 	LexOthers.o LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o
  
  # The LEXOBJS have to be treated specially as the functions in them are not called from external code
  
 -all: $(COMPLIB) $(LEXOBJS)
 +all: $(COMPLIB) $(LEXRLIB)
  
- $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o Document.o CallTip.o \
+ clean:
+ 	rm -f *.o $(COMPLIB)
+@@ -42,7 +43,10 @@
  	ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \
  	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
- 	Style.o Indicator.o AutoComplete.o
+ 	RESearch.o Style.o Indicator.o AutoComplete.o
 -	$(AR) rc $@ $^
 +	$(AR) -o $@ $^
 +
 +$(LEXRLIB): $(LEXOBJS)
 +	$(AR) -o $@ $^
  
- AutoComplete.o: AutoComplete.cxx Platform.h AutoComplete.h
- CallTip.o: CallTip.cxx Platform.h CallTip.h
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak
diff --git a/x11-toolkits/scintilla/pkg-plist b/x11-toolkits/scintilla/pkg-plist
index d96ef82f658e..8ae2e8ebc3c6 100644
--- a/x11-toolkits/scintilla/pkg-plist
+++ b/x11-toolkits/scintilla/pkg-plist
@@ -1,7 +1,6 @@
 include/scintilla/Accessor.h
 include/scintilla/KeyWords.h
 include/scintilla/Platform.h
-include/scintilla/PosRegExp.h
 include/scintilla/PropSet.h
 include/scintilla/SString.h
 include/scintilla/SciLexer.h