diff -Naru scintilla.orig/Makefile scintilla/Makefile
--- scintilla.orig/Makefile	Wed Apr 14 11:43:31 2004
+++ scintilla/Makefile	Fri Jul  9 02:50:26 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.59
+PORTVERSION=	1.61
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff -Naru scintilla.orig/distinfo scintilla/distinfo
--- scintilla.orig/distinfo	Sun Feb 22 15:21:40 2004
+++ scintilla/distinfo	Fri Jul  9 02:50:44 2004
@@ -1,2 +1,2 @@
-MD5 (scite159.tgz) = 91e33588270ee9b3f5d629f085a4a200
-SIZE (scite159.tgz) = 922148
+MD5 (scite161.tgz) = 13a08edea3103e4c72d66dee69342120
+SIZE (scite161.tgz) = 1109244
diff -Naru scintilla.orig/files/aa scintilla/files/aa
--- scintilla.orig/files/aa	Thu Jan  1 01:00:00 1970
+++ scintilla/files/aa	Fri Jul  9 03:09:12 2004
@@ -0,0 +1,84 @@
+--- makefile.orig	Wed Dec 24 08:45:12 2003
++++ makefile	Sun Jan 11 19:50:44 2004
+@@ -8,15 +8,16 @@
+ # To force GTK+ 1 build, define GTK1 on the make command line.
+ 
+ .SUFFIXES: .cxx .o .h .a
+-CC = g++
+-AR = ar
++CC ?= g++
++AR = $(CC) -shared
+ RANLIB = touch
+ 
+ ifeq ($(shell uname),Darwin)
+ RANLIB = ranlib
+ endif
+ 
+-COMPLIB=../bin/scintilla.a
++COMPLIB=../bin/libscintilla.so.1
++LEXRLIB=../bin/libscintilla_lexers.so.1
+ 
+ vpath %.h ../src ../include
+ vpath %.cxx ../src
+@@ -31,29 +32,29 @@
+ endif
+ 
+ ifdef DEBUG
+-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
+ else
+-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
+ endif
+ 
+ # If explicit setting of GTK1 or GTK2 then use that else look for
+ # pkg-config which is an OK indication that GTK2 is available
+ ifdef GTK2
+-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
++CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
+ else
+ ifdef GTK1
+-CONFIGFLAGS=gtk-config --cflags
++CONFIGFLAGS=pkg-config --cflags gtk+ gthread
+ else
+ ifneq (,$(findstring /,$(shell whereis pkg-config)))
+-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
++CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
+ else
+-CONFIGFLAGS=gtk-config --cflags
++CONFIGFLAGS=gtk-config --cflags gtk+ gthread
+ endif
+ endif
+ endif
+ 
+ .cxx.o:
+-	$(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
++	$(CC) -DPIC -fpic `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+ 
+ #++Autogenerated -- run src/LexGen.py to regenerate
+ #**LEXOBJS=\\\n\(\*.o \)
+@@ -66,7 +67,7 @@
+ LexYAML.o
+ #--Autogenerated -- end of automatically generated section
+ 
+-all: $(COMPLIB)
++all: $(COMPLIB) $(LEXRLIB)
+ 
+ clean:
+ 	rm -f *.o $(COMPLIB)
+@@ -77,10 +78,11 @@
+ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
+ 	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
+ 	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
+-	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+-	$(LEXOBJS)
+-	$(AR) rc $@ $^
+-	$(RANLIB) $@
++	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
++	$(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
++
++$(LEXRLIB): $(LEXOBJS)
++	$(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
+ 
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak
diff -Naru scintilla.orig/files/patch-aa scintilla/files/patch-aa
--- scintilla.orig/files/patch-aa	Tue Jan 13 01:29:36 2004
+++ scintilla/files/patch-aa	Fri Jul  9 03:09:37 2004
@@ -1,12 +1,13 @@
---- makefile.orig	Wed Dec 24 08:45:12 2003
-+++ makefile	Sun Jan 11 19:50:44 2004
-@@ -8,15 +8,16 @@
+--- makefile.orig	Fri Jul  9 02:56:56 2004
++++ makefile	Fri Jul  9 03:08:57 2004
+@@ -8,16 +8,17 @@
  # To force GTK+ 1 build, define GTK1 on the make command line.
  
- .SUFFIXES: .cxx .o .h .a
+ .SUFFIXES: .cxx .c .o .h .a
 -CC = g++
--AR = ar
 +CC ?= g++
+ CCOMP = gcc
+-AR = ar
 +AR = $(CC) -shared
  RANLIB = touch
  
@@ -20,7 +21,7 @@
  
  vpath %.h ../src ../include
  vpath %.cxx ../src
-@@ -31,29 +32,29 @@
+@@ -32,31 +33,31 @@
  endif
  
  ifdef DEBUG
@@ -36,6 +37,7 @@
  ifdef GTK2
 -CONFIGFLAGS=pkg-config --cflags gtk+-2.0
 +CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
+ MARSHALLER=scintilla-marshal.o
  else
  ifdef GTK1
 -CONFIGFLAGS=gtk-config --cflags
@@ -44,6 +46,7 @@
  ifneq (,$(findstring /,$(shell whereis pkg-config)))
 -CONFIGFLAGS=pkg-config --cflags gtk+-2.0
 +CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
+ MARSHALLER=scintilla-marshal.o
  else
 -CONFIGFLAGS=gtk-config --cflags
 +CONFIGFLAGS=gtk-config --cflags gtk+ gthread
@@ -54,11 +57,11 @@
  .cxx.o:
 -	$(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
 +	$(CC) -DPIC -fpic `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+ .c.o:
+ 	$(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
  
- #++Autogenerated -- run src/LexGen.py to regenerate
- #**LEXOBJS=\\\n\(\*.o \)
-@@ -66,7 +67,7 @@
- LexYAML.o
+@@ -72,7 +73,7 @@
+ LexVerilog.o LexYAML.o
  #--Autogenerated -- end of automatically generated section
  
 -all: $(COMPLIB)
@@ -66,12 +69,12 @@
  
  clean:
  	rm -f *.o $(COMPLIB)
-@@ -77,10 +78,11 @@
+@@ -83,10 +84,11 @@
  $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
  	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
  	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 -	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
--	$(LEXOBJS)
+-	$(MARSHALLER) $(LEXOBJS)
 -	$(AR) rc $@ $^
 -	$(RANLIB) $@
 +	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o