Update to 1.38.

6 files changed, 15 insertions, 11 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index e6680c1fc03d..19a9f0740635 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.37
+PORTVERSION=	1.38
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 6fc0cf5e5f24..9103d39af721 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite137.tgz) = 157c67f633b1b69f297869112e8141d4
+MD5 (scite138.tgz) = 2dccbb7fe727f6b101a57a8211e846ff
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 822f974468d7..e7d4410e8b00 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -9,13 +9,16 @@ share/gnome/scite/ada.properties
 share/gnome/scite/ave.properties
 share/gnome/scite/conf.properties
 share/gnome/scite/cpp.properties
+share/gnome/scite/eiffel.properties
 share/gnome/scite/html.properties
 share/gnome/scite/latex.properties
+share/gnome/scite/lisp.properties
 share/gnome/scite/lua.properties
 share/gnome/scite/others.properties
 share/gnome/scite/pascal.properties
 share/gnome/scite/perl.properties
 share/gnome/scite/python.properties
+share/gnome/scite/ruby.properties
 share/gnome/scite/sql.properties
 share/gnome/scite/vb.properties
 @dirrm share/gnome/scite
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 6c6e0e69e8fe..d4407e2919cb 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.37
+PORTVERSION=	1.38
 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 6fc0cf5e5f24..9103d39af721 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite137.tgz) = 157c67f633b1b69f297869112e8141d4
+MD5 (scite138.tgz) = 2dccbb7fe727f6b101a57a8211e846ff
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index d99d741cb65f..f4eebfe915ea 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- makefile.orig	Sun Apr 15 10:24:36 2001
-+++ makefile	Tue Apr 17 14:04:58 2001
+--- makefile.orig	Sat May 19 01:57:10 2001
++++ makefile	Thu Jun  7 11:19:46 2001
 @@ -5,10 +5,11 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
  
@@ -18,7 +18,7 @@ $FreeBSD$
  
  vpath %.h ../src ../include
  vpath %.cxx ../src
-@@ -17,20 +18,20 @@
+@@ -17,13 +18,13 @@
  CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS)
  
  ifdef DEBUG
@@ -31,10 +31,11 @@ $FreeBSD$
  
  .cxx.o:
 -	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
-+	$(CC) -DPIC -fPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
++	$(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
  
- 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
+ LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexEiffel.o LexHTML.o \
+ 	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
+@@ -31,7 +32,7 @@
  
  # The LEXOBJS have to be treated specially as the functions in them are not called from external code
  
@@ -43,7 +44,7 @@ $FreeBSD$
  
  clean:
  	rm -f *.o $(COMPLIB)
-@@ -42,7 +43,10 @@
+@@ -43,7 +44,10 @@
  	ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \
  	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
  	RESearch.o Style.o Indicator.o AutoComplete.o