Index: head/editors/scite/Makefile
===================================================================
--- head/editors/scite/Makefile	(revision 48904)
+++ head/editors/scite/Makefile	(revision 48905)
@@ -1,29 +1,32 @@
 # New ports collection makefile for:	skite
 # Date created:				27 November 2000
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.38
+PORTVERSION=	1.40
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
 MASTER_SITE_SUBDIR=	scintilla
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 MAKEFILE=	makefile
 MAKE_ENV=	MKDIR="${MKDIR}"
+
+post-extract:
+	@${PERL} -pi -e  's|\x0d||' ${WRKSRC}/makefile
 
 .include <bsd.port.mk>

Property changes on: head/editors/scite/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/editors/scite/distinfo
===================================================================
--- head/editors/scite/distinfo	(revision 48904)
+++ head/editors/scite/distinfo	(revision 48905)
@@ -1 +1 @@
-MD5 (scite138.tgz) = 2dccbb7fe727f6b101a57a8211e846ff
+MD5 (scite140.tgz) = 8d29ec3145b68e26b403558fc70037c1

Property changes on: head/editors/scite/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/editors/scite/files/patch-aa
===================================================================
--- head/editors/scite/files/patch-aa	(revision 48904)
+++ head/editors/scite/files/patch-aa	(revision 48905)
@@ -1,77 +1,77 @@
 
 $FreeBSD$
 
---- makefile.orig	Sun Apr 15 10:25:06 2001
-+++ makefile	Tue Apr 17 14:16:28 2001
+--- makefile.orig	Thu Oct 18 18:29:34 2001
++++ makefile	Thu Oct 18 18:32:28 2001
 @@ -10,34 +10,34 @@
  
  # 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.
 -gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
 +gnomeprefix:=$(PREFIX)
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
 -  datadir=$(gnomeprefix)/share
 +  datadir=$(gnomeprefix)/share/gnome
    pixmapdir=$(datadir)/pixmaps
  else
    prefix=/usr/local
  endif
  bindir=$(prefix)/bin
 -SYSCONF_PATH=$(prefix)/share/scite
 +SYSCONF_PATH=$(prefix)/share/gnome/scite
  
  PROG	= ../bin/SciTE
  
 -vpath %.h ../src ../../scintilla/include
 +vpath %.h ../src $(X11BASE)/include/scintilla
  vpath %.cxx ../src
  
  #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
 -INCLUDEDIRS=-I ../../scintilla/include -I ../src
 +INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
  CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
  
  ifdef DEBUG
--CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
-+CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS)
+-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
++CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
  else
 -CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
 +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
  endif
  
  .cxx.o:
 -	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $< -o $@
 +	$(CC) $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< -o $@
  
  all: $(PROG)
  
 @@ -51,8 +51,8 @@
  LEXEROBJS=$(wildcard ../../scintilla/gtk/Lex*.o)
  
- $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
--SciTEProps.o ../../scintilla/bin/scintilla.a $(LEXEROBJS)
+ $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o DirectorExtension.o \
+-SciTEProps.o $(LEXEROBJS) ../../scintilla/bin/scintilla.a
 -	$(CC) `gtk-config --libs` -DGTK $^ -o $@
-+SciTEProps.o # ../../scintilla/bin/scintilla.a $(LEXEROBJS)
-+	$(CC) $(shell $(GTK_CONFIG) --libs) -DGTK $^ -o $@ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers
++SciTEProps.o # $(LEXEROBJS) ../../scintilla/bin/scintilla.a
++	$(CC) $(shell $(GTK_CONFIG) --libs) -DGTK $^ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers -o $@
  
  # 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 @@
  # 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)
 +	$(BSD_INSTALL_PROGRAM) $(PROG) $(bindir)
 +	$(MKDIR) $(SYSCONF_PATH)
 +	$(BSD_INSTALL_DATA) ../src/*.properties $(SYSCONF_PATH)
  ifdef gnomeprefix
 -	install SciTE.desktop $(datadir)/gnome/apps/Applications
 -	install Sci48M.png $(pixmapdir)
 +	$(BSD_INSTALL_DATA) SciTE.desktop $(datadir)/apps/Applications
 +	$(BSD_INSTALL_DATA) Sci48M.png $(pixmapdir)
  endif
  
  uninstall:

Property changes on: head/editors/scite/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/editors/scite/pkg-plist
===================================================================
--- head/editors/scite/pkg-plist	(revision 48904)
+++ head/editors/scite/pkg-plist	(revision 48905)
@@ -1,24 +1,26 @@
 bin/SciTE
 share/gnome/apps/Applications/SciTE.desktop
 share/gnome/pixmaps/Sci48M.png
 share/gnome/scite/Embedded.properties
 share/gnome/scite/SciTE.properties
 share/gnome/scite/SciTEGlobal.properties
 share/gnome/scite/abbrev.properties
 share/gnome/scite/ada.properties
 share/gnome/scite/ave.properties
 share/gnome/scite/conf.properties
 share/gnome/scite/cpp.properties
 share/gnome/scite/eiffel.properties
 share/gnome/scite/html.properties
 share/gnome/scite/latex.properties
 share/gnome/scite/lisp.properties
 share/gnome/scite/lua.properties
+share/gnome/scite/nncrontab.properties
 share/gnome/scite/others.properties
 share/gnome/scite/pascal.properties
 share/gnome/scite/perl.properties
 share/gnome/scite/python.properties
 share/gnome/scite/ruby.properties
 share/gnome/scite/sql.properties
+share/gnome/scite/tcl.properties
 share/gnome/scite/vb.properties
 @dirrm share/gnome/scite

Property changes on: head/editors/scite/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/x11-toolkits/scintilla/Makefile
===================================================================
--- head/x11-toolkits/scintilla/Makefile	(revision 48904)
+++ head/x11-toolkits/scintilla/Makefile	(revision 48905)
@@ -1,35 +1,38 @@
 # New ports collection makefile for:	scintilla
 # Date created:				27 November 2000
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.38
+PORTVERSION=	1.40
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	scite${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gnome@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 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
 	${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
 
 .include <bsd.port.mk>

Property changes on: head/x11-toolkits/scintilla/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/x11-toolkits/scintilla/distinfo
===================================================================
--- head/x11-toolkits/scintilla/distinfo	(revision 48904)
+++ head/x11-toolkits/scintilla/distinfo	(revision 48905)
@@ -1 +1 @@
-MD5 (scite138.tgz) = 2dccbb7fe727f6b101a57a8211e846ff
+MD5 (scite140.tgz) = 8d29ec3145b68e26b403558fc70037c1

Property changes on: head/x11-toolkits/scintilla/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/x11-toolkits/scintilla/files/patch-aa
===================================================================
--- head/x11-toolkits/scintilla/files/patch-aa	(revision 48904)
+++ head/x11-toolkits/scintilla/files/patch-aa	(revision 48905)
@@ -1,58 +1,58 @@
 
 $FreeBSD$
 
---- makefile.orig	Sat May 19 01:57:10 2001
-+++ makefile	Thu Jun  7 11:19:46 2001
+--- makefile.orig	Wed Sep 19 16:33:24 2001
++++ makefile	Thu Oct 18 18:15:16 2001
 @@ -5,10 +5,11 @@
  # 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 ?= g++
 +AR = $(CC) -shared
  
 -COMPLIB=../bin/scintilla.a
 +COMPLIB=../bin/libscintilla.so.1
 +LEXRLIB=../bin/libscintilla_lexers.so.1
  
  vpath %.h ../src ../include
  vpath %.cxx ../src
 @@ -17,13 +18,13 @@
  CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS)
  
  ifdef DEBUG
--CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
-+CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS)
+-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
++CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
  else
 -CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
 +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
  endif
  
  .cxx.o:
 -	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
 +	$(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
  
- LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexEiffel.o LexHTML.o \
+ 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 @@
  
  # The LEXOBJS have to be treated specially as the functions in them are not called from external code
  
 -all: $(COMPLIB) $(LEXOBJS)
 +all: $(COMPLIB) $(LEXRLIB)
  
  clean:
  	rm -f *.o $(COMPLIB)
 @@ -43,7 +44,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 $@ $^
 +	$(AR) -o $@ $^
 +
 +$(LEXRLIB): $(LEXOBJS)
 +	$(AR) -o $@ $^
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak

Property changes on: head/x11-toolkits/scintilla/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/x11-toolkits/scintilla/pkg-plist
===================================================================
--- head/x11-toolkits/scintilla/pkg-plist	(revision 48904)
+++ head/x11-toolkits/scintilla/pkg-plist	(revision 48905)
@@ -1,15 +1,14 @@
 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/WinDefs.h
 include/scintilla/WindowAccessor.h
 lib/libscintilla.so
 lib/libscintilla.so.1
 lib/libscintilla_lexers.so
 lib/libscintilla_lexers.so.1
 @dirrm include/scintilla

Property changes on: head/x11-toolkits/scintilla/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property