4 files changed, 19 insertions, 29 deletions

diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 9fa7dbe15bcd..43116a0c65d3 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,11 +6,9 @@
 #    $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
 
 PORTNAME=	scintilla
-PORTVERSION=	1.79
+PORTVERSION=	2.00
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF \
-		http://www.scintilla.org/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SFP/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
@@ -23,14 +21,7 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
-
-.if defined(WITH_GTK2)
 USE_GNOME=	gtk20
-PKGNAMESUFFIX:=	-gtk2
-.else
-USE_GNOME=	gtk12
-MAKE_ARGS+=	GTK1=yes
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -47,9 +38,9 @@ post-patch:
 do-install:
 	${MKDIR} ${PREFIX}/include/scintilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.1 ${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libscintilla.so.1 ${PREFIX}/lib/libscintilla.so
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.1 ${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.1 ${PREFIX}/lib/libscintilla_lexers.so
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libscintilla.so.2 ${PREFIX}/lib/libscintilla.so
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.2 ${PREFIX}/lib/libscintilla_lexers.so
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 0488c72e95ef..b1044b541143 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1,3 +1,3 @@
-MD5 (scite179.tgz) = 02a0d68f0c33c01c9a2c9d69c295acea
-SHA256 (scite179.tgz) = ebd7105b892b68ec4f9190ffcd4a98226e84a73d2e9cbd29653d52692de3cbf9
-SIZE (scite179.tgz) = 1719588
+MD5 (scite200.tgz) = fe6ba62eaf86ec0a49e03d2a03c3e048
+SHA256 (scite200.tgz) = 56be771b4aaf9a0e0b601dea374f12926fc1c2eb1b91ab8783165143c8d7b210
+SIZE (scite200.tgz) = 1810957
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index d5ba37ddbfa0..8faf765f9163 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.orig	2007-06-11 22:57:30.000000000 -0500
-+++ makefile	2007-08-21 17:21:51.000000000 -0500
+--- makefile.orig	2009-07-03 01:48:46.000000000 -0400
++++ makefile	2009-08-11 12:37:37.000000000 -0400
 @@ -8,16 +8,17 @@
  # To force GTK+ 1 build, define GTK1 on the make command line.
  
@@ -17,8 +17,8 @@
  endif
  
 -COMPLIB=../bin/scintilla.a
-+COMPLIB=../bin/libscintilla.so.1
-+LEXRLIB=../bin/libscintilla_lexers.so.1
++COMPLIB=../bin/libscintilla.so.2
++LEXRLIB=../bin/libscintilla_lexers.so.2
  
  vpath %.h ../src ../include
  vpath %.cxx ../src
@@ -64,8 +64,8 @@
  
  #++Autogenerated -- run src/LexGen.py to regenerate
  #**LEXOBJS=\\\n\(\*.o \)
-@@ -75,7 +76,7 @@
- LexVHDL.o LexYAML.o
+@@ -76,7 +77,7 @@
+ LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
  #--Autogenerated -- end of automatically generated section
  
 -all: $(COMPLIB)
@@ -73,10 +73,10 @@
  
  clean:
  	rm -f *.o $(COMPLIB)
-@@ -88,9 +89,11 @@
+@@ -89,9 +90,11 @@
  	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
  	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
- 	RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+ 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
 -	$(MARSHALLER) $(LEXOBJS)
 -	$(AR) rc $@ $^
 -	$(RANLIB) $@
diff --git a/x11-toolkits/scintilla/pkg-plist b/x11-toolkits/scintilla/pkg-plist
index d96935c51c4c..8f7a0990c602 100644
--- a/x11-toolkits/scintilla/pkg-plist
+++ b/x11-toolkits/scintilla/pkg-plist
@@ -2,13 +2,12 @@ include/scintilla/Accessor.h
 include/scintilla/KeyWords.h
 include/scintilla/Platform.h
 include/scintilla/PropSet.h
-include/scintilla/SString.h
 include/scintilla/SciLexer.h
 include/scintilla/Scintilla.h
 include/scintilla/ScintillaWidget.h
 include/scintilla/WindowAccessor.h
 lib/libscintilla.so
-lib/libscintilla.so.1
+lib/libscintilla.so.2
 lib/libscintilla_lexers.so
-lib/libscintilla_lexers.so.1
+lib/libscintilla_lexers.so.2
 @dirrm include/scintilla