From cdf43cb66199cee9f2135087dcbb3a9ed1745d56 Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Thu, 18 Oct 2001 15:39:23 +0000
Subject: Update to 1.40.

---
 x11-toolkits/scintilla/Makefile       |  5 ++++-
 x11-toolkits/scintilla/distinfo       |  2 +-
 x11-toolkits/scintilla/files/patch-aa | 10 +++++-----
 x11-toolkits/scintilla/pkg-plist      |  1 -
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'x11-toolkits/scintilla')

diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index d4407e2919cb..14b01215034b 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.38
+PORTVERSION=	1.40
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -24,6 +24,9 @@ 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
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 9103d39af721..85386d7403ed 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite138.tgz) = 2dccbb7fe727f6b101a57a8211e846ff
+MD5 (scite140.tgz) = 8d29ec3145b68e26b403558fc70037c1
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index f4eebfe915ea..f46b1bbb3d6a 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,8 +1,8 @@
 
 $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.
  
@@ -22,8 +22,8 @@ $FreeBSD$
  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)
@@ -33,7 +33,7 @@ $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 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 @@
  
diff --git a/x11-toolkits/scintilla/pkg-plist b/x11-toolkits/scintilla/pkg-plist
index 8ae2e8ebc3c6..d96935c51c4c 100644
--- a/x11-toolkits/scintilla/pkg-plist
+++ b/x11-toolkits/scintilla/pkg-plist
@@ -6,7 +6,6 @@ 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
-- 
cgit v1.2.3