Update to 1.44.

8 files changed, 40 insertions, 29 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index a4234732b4b1..1b5222d0baf6 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.42
+PORTVERSION=	1.44
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index d1b045c53cc8..a6bca76a65e6 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite142.tgz) = 7160ceeebb433c28ada28189823f9280
+MD5 (scite144.tgz) = 88199f52c4a337a938fff64d0eb470b0
diff --git a/editors/scite/files/patch-SciTEGTK.cxx b/editors/scite/files/patch-SciTEGTK.cxx
deleted file mode 100644
index 3a80630bf90e..000000000000
--- a/editors/scite/files/patch-SciTEGTK.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- SciTEGTK.cxx	2002/01/04 12:53:45	1.1
-+++ SciTEGTK.cxx	2002/01/04 12:54:45
-@@ -2429,7 +2429,7 @@
- 	                   GtkSignalFunc(MousePress), gthis);

- 

- 	gtk_window_set_title(GTK_WINDOW(PWidget(wSciTE)), appName);

--	const int useDefault = 0x100000000;

-+	const int useDefault = 0x10000000;

- 	int left = props.GetInt("position.left", useDefault);

- 	int top = props.GetInt("position.top", useDefault);

- 	int width = props.GetInt("position.width", useDefault);

diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index e35f7d466744..ac5044b3b747 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- makefile.orig	Thu Oct 18 18:29:34 2001
-+++ makefile	Thu Oct 18 18:32:28 2001
+--- makefile.orig	Mon Feb 11 12:01:37 2002
++++ makefile	Mon Feb 11 12:06:45 2002
 @@ -10,34 +10,34 @@
  
  # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
@@ -57,16 +57,22 @@ $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 \
-@@ -66,12 +66,12 @@
+@@ -66,15 +66,15 @@
  # This is OK - just means no SciTE in the Gnome Applications menu
  # Dead:	install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
  install:
 -	install -s $(PROG) $(bindir)
 -	install -d $(SYSCONF_PATH)
 -	install -D ../src/*.properties $(SYSCONF_PATH)
+-	install ../doc/*.html $(SYSCONF_PATH)
+-	install ../doc/SciTEIco.png $(SYSCONF_PATH)
+-	install ../doc/PrintHi.png $(SYSCONF_PATH)
 +	$(BSD_INSTALL_PROGRAM) $(PROG) $(bindir)
 +	$(MKDIR) $(SYSCONF_PATH)
 +	$(BSD_INSTALL_DATA) ../src/*.properties $(SYSCONF_PATH)
++	$(BSD_INSTALL_DATA) ../doc/*.html $(SYSCONF_PATH)
++	$(BSD_INSTALL_DATA) ../doc/SciTEIco.png $(SYSCONF_PATH)
++	$(BSD_INSTALL_DATA) ../doc/PrintHi.png $(SYSCONF_PATH)
  ifdef gnomeprefix
 -	install SciTE.desktop $(datadir)/gnome/apps/Applications
 -	install Sci48M.png $(pixmapdir)
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index e028924dc5c1..22ef243b9903 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -2,8 +2,20 @@ bin/SciTE
 share/gnome/apps/Applications/SciTE.desktop
 share/gnome/pixmaps/Sci48M.png
 share/gnome/scite/Embedded.properties
+share/gnome/scite/PrintHi.png
+share/gnome/scite/SciTE.html
 share/gnome/scite/SciTE.properties
+share/gnome/scite/SciTEDirector.html
+share/gnome/scite/SciTEDoc.html
+share/gnome/scite/SciTEDownload.html
+share/gnome/scite/SciTEExtension.html
+share/gnome/scite/SciTEExtras.html
 share/gnome/scite/SciTEGlobal.properties
+share/gnome/scite/SciTEIco.png
+share/gnome/scite/SciTEImage.html
+share/gnome/scite/SciTELexer.html
+share/gnome/scite/SciTERegEx.html
+share/gnome/scite/SciTETranslation.html
 share/gnome/scite/abbrev.properties
 share/gnome/scite/ada.properties
 share/gnome/scite/ave.properties
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 50cea90abb06..d64d7d309f62 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.42
+PORTVERSION=	1.44
 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 d1b045c53cc8..a6bca76a65e6 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite142.tgz) = 7160ceeebb433c28ada28189823f9280
+MD5 (scite144.tgz) = 88199f52c4a337a938fff64d0eb470b0
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index f46b1bbb3d6a..e371d87add73 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- makefile.orig	Wed Sep 19 16:33:24 2001
-+++ makefile	Thu Oct 18 18:15:16 2001
-@@ -5,10 +5,11 @@
+--- makefile.orig	Fri Jan 25 02:52:32 2002
++++ makefile	Mon Feb 11 11:40:38 2002
+@@ -5,8 +5,8 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
  
  .SUFFIXES: .cxx .o .h .a
@@ -11,6 +11,12 @@ $FreeBSD$
 -AR = ar
 +CC ?= g++
 +AR = $(CC) -shared
+ RANLIB = touch
+ 
+ ifeq ($(OSTYPE),darwin)
+@@ -15,7 +15,8 @@
+ RANLIB = ranlib
+ endif
  
 -COMPLIB=../bin/scintilla.a
 +COMPLIB=../bin/libscintilla.so.1
@@ -18,7 +24,7 @@ $FreeBSD$
  
  vpath %.h ../src ../include
  vpath %.cxx ../src
-@@ -17,13 +18,13 @@
+@@ -24,13 +25,13 @@
  CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS)
  
  ifdef DEBUG
@@ -33,9 +39,9 @@ $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 LexCrontab.o LexEiffel.o LexHTML.o \
- 	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
-@@ -31,7 +32,7 @@
+ LEXOBJS=LexAda.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \
+ 	LexCrontab.o LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexOthers.o \
+@@ -38,7 +39,7 @@
  
  # The LEXOBJS have to be treated specially as the functions in them are not called from external code
  
@@ -44,11 +50,12 @@ $FreeBSD$
  
  clean:
  	rm -f *.o $(COMPLIB)
-@@ -43,7 +44,10 @@
+@@ -50,8 +51,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
 -	$(AR) rc $@ $^
+-	$(RANLIB) $@
 +	$(AR) -o $@ $^
 +
 +$(LEXRLIB): $(LEXOBJS)