8 files changed, 21 insertions, 28 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 4c6f3d7a0d77..6c1d6dd0f61e 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.49
+PORTVERSION=	1.50
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index b1cd6a1abc57..794aeefb3239 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite149.tgz) = 4a60e1ff31b5f97106a6e2b6be013d92
+MD5 (scite150.tgz) = ae1c5936acca2040dd09b42d266f1294
diff --git a/editors/scite/files/patch-SciTEGTK.cxx b/editors/scite/files/patch-SciTEGTK.cxx
deleted file mode 100644
index 7452de8ff2bc..000000000000
--- a/editors/scite/files/patch-SciTEGTK.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- SciTEGTK.cxx.orig	Tue Nov  5 17:24:05 2002
-+++ SciTEGTK.cxx	Tue Nov  5 17:24:42 2002
-@@ -1910,7 +1910,7 @@
- 	return 0;

- }

- 

--void SciTEGTK::AddToPopUp(const char *label, int cmd, bool enabled) {

-+void SciTEGTK::AddToPopUp(const char *label, int cmd=0, bool enabled=true) {

- 	SString localised = LocaliseString(label);

- 	localised.insert(0, "/");

- 	GtkItemFactoryEntry itemEntry = {

diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index d179084d9331..f7be1d89740b 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,5 +1,8 @@
---- makefile.orig	Tue Nov  5 17:36:21 2002
-+++ makefile	Tue Nov  5 17:39:53 2002
+
+$FreeBSD$
+
+--- makefile.orig	Thu Feb  6 10:52:36 2003
++++ makefile	Thu Feb  6 10:56:10 2003
 @@ -10,34 +10,34 @@
  
  # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
@@ -39,7 +42,7 @@
  
  .cxx.o:
 -	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $< -o $@
-+	$(CC) $(shell $(GTK_CONFIG) --cflags) $(shell $(GLIB_CONFIG) --libs gthread) $(CXXFLAGS) -c $< -o $@
++	$(CC) $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< -o $@
  
  all: $(PROG)
  
@@ -48,7 +51,7 @@
  
  deps:
 -	$(CC) -MM `gtk-config --cflags` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
-+	$(CC) -MM `$(GTK_CONFIG) --cflags` `$(GLIB_CONFIG) --libs gthread)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
++	$(CC) -MM `$(GTK_CONFIG) --cflags` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
  
  # make should be run in ../../scintilla/gtk to compile all the lexers.
  LEXEROBJS=$(wildcard ../../scintilla/gtk/Lex*.o)
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index a34a4f277aa9..e1196df84778 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -24,6 +24,7 @@ share/gnome/scite/baan.properties
 share/gnome/scite/bullant.properties
 share/gnome/scite/conf.properties
 share/gnome/scite/cpp.properties
+share/gnome/scite/css.properties
 share/gnome/scite/eiffel.properties
 share/gnome/scite/fortran.properties
 share/gnome/scite/html.properties
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 877cf21daacd..3a95bd9b14b0 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.49
+PORTVERSION=	1.50
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -25,9 +25,6 @@ USE_GNOME=	gtk12
 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 b1cd6a1abc57..794aeefb3239 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite149.tgz) = 4a60e1ff31b5f97106a6e2b6be013d92
+MD5 (scite150.tgz) = ae1c5936acca2040dd09b42d266f1294
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index 7911f87058f2..184d290151de 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,5 +1,8 @@
---- makefile.orig	Tue Oct  8 03:29:40 2002
-+++ makefile	Tue Nov  5 15:40:13 2002
+
+$FreeBSD$
+
+--- makefile.orig	Fri Jan 10 13:35:52 2003
++++ makefile	Thu Feb  6 10:48:09 2003
 @@ -6,8 +6,8 @@
  # To build for GTK+ 2, define GTK2 on the make command line.
  
@@ -42,7 +45,7 @@
  
  #++Autogenerated -- run src/LexGen.py to regenerate
  #**LEXOBJS=\\\n\(\*.o \)
-@@ -49,7 +50,7 @@
+@@ -50,7 +51,7 @@
  
  # The LEXOBJS have to be treated specially as the functions in them are not called from external code
  
@@ -51,15 +54,15 @@
  
  clean:
  	rm -f *.o $(COMPLIB)
-@@ -61,8 +62,10 @@
+@@ -62,8 +63,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 UniConversion.o
+ 	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
 -	$(AR) rc $@ $^
 -	$(RANLIB) $@
 +	$(AR) -o $@ $^
 +
-+$(LEXRLIB): $(LEXOBJS)
++ $(LEXRLIB): $(LEXOBJS)
 +	$(AR) -o $@ $^
  
  # Automatically generate header dependencies with "make deps"