8 files changed, 25 insertions, 18 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 19a9f0740635..b98deab32429 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.38
+PORTVERSION=	1.40
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -26,4 +26,7 @@ USE_GNOME=	yes
 MAKEFILE=	makefile
 MAKE_ENV=	MKDIR="${MKDIR}"
 
+post-extract:
+	@${PERL} -pi -e  's|\x0d||' ${WRKSRC}/makefile
+
 .include <bsd.port.mk>
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 9103d39af721..85386d7403ed 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite138.tgz) = 2dccbb7fe727f6b101a57a8211e846ff
+MD5 (scite140.tgz) = 8d29ec3145b68e26b403558fc70037c1
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index b3e5bf079e1f..e35f7d466744 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- makefile.orig	Sun Apr 15 10:25:06 2001
-+++ makefile	Tue Apr 17 14:16:28 2001
+--- makefile.orig	Thu Oct 18 18:29:34 2001
++++ makefile	Thu Oct 18 18:32:28 2001
 @@ -10,34 +10,34 @@
  
  # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
@@ -33,8 +33,8 @@ $FreeBSD$
  CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
  
  ifdef DEBUG
--CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
-+CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS)
+-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
++CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
  else
 -CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
 +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
@@ -49,11 +49,11 @@ $FreeBSD$
 @@ -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)
+ $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o DirectorExtension.o \
+-SciTEProps.o $(LEXEROBJS) ../../scintilla/bin/scintilla.a
 -	$(CC) `gtk-config --libs` -DGTK $^ -o $@
-+SciTEProps.o # ../../scintilla/bin/scintilla.a $(LEXEROBJS)
-+	$(CC) $(shell $(GTK_CONFIG) --libs) -DGTK $^ -o $@ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers
++SciTEProps.o # $(LEXEROBJS) ../../scintilla/bin/scintilla.a
++	$(CC) $(shell $(GTK_CONFIG) --libs) -DGTK $^ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers -o $@
  
  # 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 \
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index e7d4410e8b00..3b2b520ab5fb 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -14,11 +14,13 @@ share/gnome/scite/html.properties
 share/gnome/scite/latex.properties
 share/gnome/scite/lisp.properties
 share/gnome/scite/lua.properties
+share/gnome/scite/nncrontab.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/tcl.properties
 share/gnome/scite/vb.properties
 @dirrm share/gnome/scite
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index d4407e2919cb..14b01215034b 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.38
+PORTVERSION=	1.40
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -24,6 +24,9 @@ USE_GTK=	yes
 INSTALLS_SHLIB=	yes
 MAKEFILE=	makefile
 
+post-extract:
+	@${PERL} -pi -e  's|\x0d||' ${WRKSRC}/../include/*.h
+
 do-install:
 	${MKDIR} ${PREFIX}/include/scintilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 9103d39af721..85386d7403ed 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite138.tgz) = 2dccbb7fe727f6b101a57a8211e846ff
+MD5 (scite140.tgz) = 8d29ec3145b68e26b403558fc70037c1
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index f4eebfe915ea..f46b1bbb3d6a 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- makefile.orig	Sat May 19 01:57:10 2001
-+++ makefile	Thu Jun  7 11:19:46 2001
+--- makefile.orig	Wed Sep 19 16:33:24 2001
++++ makefile	Thu Oct 18 18:15:16 2001
 @@ -5,10 +5,11 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
  
@@ -22,8 +22,8 @@ $FreeBSD$
  CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS)
  
  ifdef DEBUG
--CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
-+CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS)
+-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
++CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
  else
 -CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
 +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
@@ -33,7 +33,7 @@ $FreeBSD$
 -	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
 +	$(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
  
- LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexEiffel.o LexHTML.o \
+ LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexCrontab.o LexEiffel.o LexHTML.o \
  	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
 @@ -31,7 +32,7 @@
  
diff --git a/x11-toolkits/scintilla/pkg-plist b/x11-toolkits/scintilla/pkg-plist
index 8ae2e8ebc3c6..d96935c51c4c 100644
--- a/x11-toolkits/scintilla/pkg-plist
+++ b/x11-toolkits/scintilla/pkg-plist
@@ -6,7 +6,6 @@ include/scintilla/SString.h
 include/scintilla/SciLexer.h
 include/scintilla/Scintilla.h
 include/scintilla/ScintillaWidget.h
-include/scintilla/WinDefs.h
 include/scintilla/WindowAccessor.h
 lib/libscintilla.so
 lib/libscintilla.so.1