7 files changed, 21 insertions, 23 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 858b3a2812cf..c239f41c8ec6 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.35
+PORTVERSION=	1.36
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index baf2f3ad7d12..8cb605b48339 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite135.tgz) = fd5ec4ad8893d1d545aed0aea908a89f
+MD5 (scite136.tgz) = 037829f907809630ff77278ea63ba173
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index 93e97f1594a4..b239d087b7b0 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- makefile.orig	Tue Jan 30 02:53:22 2001
-+++ makefile	Tue Jan 30 11:24:28 2001
-@@ -10,37 +10,38 @@
+--- makefile.orig	Mon Feb 26 13:19:04 2001
++++ makefile	Fri Mar  2 11:43:00 2001
+@@ -10,34 +10,35 @@
  
  # 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.
@@ -27,15 +27,12 @@ $FreeBSD$
 +vpath %.h ../src $(X11BASE)/include/scintilla
  vpath %.cxx ../src
  
- #Comment / Uncomment the next line out if you want GTK single instance support
- SINGLEINSTANCE= -DSINGLE_INSTANCE
- 
- #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)\" $(SINGLEINSTANCE) -W -Wall
-+INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src 
-+CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" \
-+	      $(SINGLEINSTANCE) -W -Wall $(shell $(GTK_CONFIG) --cflags)
+ #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)
  
  ifdef DEBUG
 -CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
@@ -51,7 +48,7 @@ $FreeBSD$
  
  all: $(PROG)
  
-@@ -57,8 +58,8 @@
+@@ -55,8 +56,8 @@
  	../../scintilla/gtk/LexVB.o
  
  $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
@@ -62,7 +59,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 \
-@@ -85,12 +86,12 @@
+@@ -83,12 +84,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 158bc69fcbc9..a1192295d5b2 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -4,6 +4,7 @@ share/gnome/pixmaps/Sci48M.png
 share/gnome/scite/Embedded.properties
 share/gnome/scite/SciTE.properties
 share/gnome/scite/SciTEGlobal.properties
+share/gnome/scite/ave.properties
 share/gnome/scite/conf.properties
 share/gnome/scite/cpp.properties
 share/gnome/scite/html.properties
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index acd144685950..f972af31fef3 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.35
+PORTVERSION=	1.36
 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 baf2f3ad7d12..8cb605b48339 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite135.tgz) = fd5ec4ad8893d1d545aed0aea908a89f
+MD5 (scite136.tgz) = 037829f907809630ff77278ea63ba173
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index 0850ae0dce25..4c0e81776908 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,15 +1,15 @@
 
 $FreeBSD$
 
---- makefile.orig	Tue Jan 30 02:52:54 2001
-+++ makefile	Tue Jan 30 11:14:12 2001
+--- makefile.orig	Thu Feb  1 10:12:22 2001
++++ makefile	Fri Mar  2 11:12:31 2001
 @@ -5,38 +5,42 @@
  # 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 ?= c++
 +AR = $(CC) -shared
  
 -COMPLIB=../bin/scintilla.a
@@ -35,8 +35,8 @@ $FreeBSD$
 -	$(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
 +	$(CC) -DPIC -fPIC -fpic $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
  
- LEXOBJS	=  LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPascal.o \
- 	LexPerl.o LexPython.o LexSQL.o LexVB.o
+ LEXOBJS	=  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