Update to 0.7.0.

4 files changed, 40 insertions, 34 deletions

diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index 24d44e8bac7c..b07a157d9a9d 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkscintilla
-PORTVERSION=	0.3.1
+PORTVERSION=	0.7.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.moleskine.f2s.com/files/
 DISTNAME=	GtkScintilla-${PORTVERSION}
diff --git a/x11-toolkits/gtkscintilla/distinfo b/x11-toolkits/gtkscintilla/distinfo
index 881042d3c293..86d9a42726c0 100644
--- a/x11-toolkits/gtkscintilla/distinfo
+++ b/x11-toolkits/gtkscintilla/distinfo
@@ -1 +1 @@
-MD5 (GtkScintilla-0.3.1.tar.gz) = c3932924e967a3d9d89135a9968225f7
+MD5 (GtkScintilla-0.7.0.tar.gz) = a1ebb9865c8e2ae808777d0fad5116d0
diff --git a/x11-toolkits/gtkscintilla/files/patch-aa b/x11-toolkits/gtkscintilla/files/patch-aa
index e02967c21f6f..7df30804a31e 100644
--- a/x11-toolkits/gtkscintilla/files/patch-aa
+++ b/x11-toolkits/gtkscintilla/files/patch-aa
@@ -1,52 +1,58 @@
 
 $FreeBSD$
 
---- Makefile.orig	Mon Mar 26 11:40:47 2001
-+++ Makefile	Tue Apr 17 14:31:13 2001
-@@ -2,28 +2,18 @@
+--- Makefile.orig	Mon May 14 11:45:35 2001
++++ Makefile	Tue May 15 15:32:34 2001
+@@ -2,18 +2,18 @@
  
  NAME = GtkScintilla
  LIB_NAME = gtkscintilla
--VERSION = 0.3.1
+-VERSION = 0.7.0
 -PREFIX = $(shell gtk-config --prefix)
 +VERSION = 0
 +PREFIX = $(shell $(GTK_CONFIG) --prefix)
  
  SCINTILLA_DIR = ./scintilla
 -SCINTILLA_INCLUDE = $(SCINTILLA_DIR)/include
-+SCINTILLA_INCLUDE = $(X11BASE)/include/scintilla
- SCINTILLA_SOURCE = $(SCINTILLA_DIR)/src
 -SCINTILLA_LIB = $(SCINTILLA_DIR)/bin/scintilla.a
--LEXERS = \
--	$(SCINTILLA_DIR)/gtk/LexCPP.o \
--	$(SCINTILLA_DIR)/gtk/LexConf.o \
--	$(SCINTILLA_DIR)/gtk/LexHTML.o \
--	$(SCINTILLA_DIR)/gtk/LexLua.o \
--	$(SCINTILLA_DIR)/gtk/LexOthers.o \
--	$(SCINTILLA_DIR)/gtk/LexPascal.o \
--	$(SCINTILLA_DIR)/gtk/LexPerl.o \
--	$(SCINTILLA_DIR)/gtk/LexPython.o \
--	$(SCINTILLA_DIR)/gtk/LexSQL.o \
--	$(SCINTILLA_DIR)/gtk/LexVB.o
+-SCINTILLA_IFACE = $(SCINTILLA_INCLUDE)/Scintilla.iface
+-LEXERS = $(wildcard $(SCINTILLA_DIR)/gtk/Lex*.o)
 -CFLAGS = $(shell gtk-config --cflags) -g -Wall -DGTK -DSCI_LEXER
 -LDFLAGS = $(shell gtk-config --libs) $(SCINTILLA_LIB) $(LEXERS)
 -CC = gcc
 -LD = gcc
++SCINTILLA_INCLUDE = $(X11BASE)/include/scintilla
 +SCINTILLA_LIB = -lscintilla
++SCINTILLA_IFACE = scintilla/include/Scintilla.iface
 +LEXERS = -lscintilla_lexers
-+CFLAGS = $(shell $(GTK_CONFIG) --cflags) -Wall -DGTK -DSCI_LEXER -I$(SCINTILLA_INCLUDE)
++CFLAGS += $(shell $(GTK_CONFIG) --cflags) -Wall -DGTK -DSCI_LEXER
 +LDFLAGS = $(shell $(GTK_CONFIG) --libs) $(SCINTILLA_LIB) $(LEXERS)
 +CC ?= gcc
 +LD = $(CC)
  AR = ar
  
- SOURCES = $(wildcard *.c)
-@@ -36,7 +26,7 @@
- LIB_DIR = $(PREFIX)/lib/
- INCLUDE_DIR = $(PREFIX)/include/
+ STATIC_LIB = lib$(LIB_NAME).a
+@@ -24,10 +24,10 @@
+ 
+ all: $(STATIC_LIB) $(SHARED_LIB)
+ 
+-$(STATIC_LIB): $(SCINTILLA_LIB) gtkscintilla.o
++$(STATIC_LIB): gtkscintilla.o
+ 	$(AR) -rs $@ $^
+ 
+-$(SHARED_LIB): $(SCINTILLA_LIB) gtkscintilla.o
++$(SHARED_LIB): gtkscintilla.o
+ 	$(LD) -o $@ $^ -shared $(LDFLAGS)
  
--all: ./$(SCINTILLA_LIB) $(STATIC_LIB) $(SHARED_LIB)
-+all: $(STATIC_LIB) $(SHARED_LIB)
+ gtkscintilla.o: gtkscintilla.h gtkscintilla.c
+@@ -35,8 +35,8 @@
+ $(SCINTILLA_LIB):
+ 	cd $(SCINTILLA_DIR)/gtk ; $(MAKE)
  
- scintilla: ./$(SCINTILLA_LIB)
+-gtkscintilla.h gtkscintilla.c: scigen.py $(SCINTILLA_IFACE)
+-	python scigen.py
++#gtkscintilla.h gtkscintilla.c: scigen.py $(SCINTILLA_IFACE)
++#	python scigen.py
  
+ install: all
+ 	install -D --mode=755 $(SHARED_LIB) $(DESTDIR)/$(LIB_DIR)/$(SHARED_LIB)
diff --git a/x11-toolkits/gtkscintilla/files/patch-ab b/x11-toolkits/gtkscintilla/files/patch-ab
index 2ca7824a8b90..1f149e701fb0 100644
--- a/x11-toolkits/gtkscintilla/files/patch-ab
+++ b/x11-toolkits/gtkscintilla/files/patch-ab
@@ -1,16 +1,16 @@
 
 $FreeBSD$
 
---- gtkscintilla.c.orig	Mon Mar 26 11:40:47 2001
-+++ gtkscintilla.c	Tue Apr 17 14:33:01 2001
-@@ -21,8 +21,8 @@
+--- gtkscintilla.c.orig	Mon May 14 11:45:35 2001
++++ gtkscintilla.c	Tue May 15 15:30:16 2001
+@@ -20,8 +20,8 @@
+ #include "gtkscintilla.h"
  
- /*#include "scintilla/include/Platform.h"*/
  #define PLAT_GTK 1
--#include "scintilla/include/ScintillaWidget.h"
 -#include "scintilla/include/Scintilla.h"
-+#include <Scintilla.h>
-+#include <ScintillaWidget.h>
+-#include "scintilla/include/ScintillaWidget.h"
++#include "scintilla/Scintilla.h"
++#include "scintilla/ScintillaWidget.h"
  
  static void gtk_scintilla_class_init(GtkScintillaClass *klass);
  static void gtk_scintilla_init(GtkScintilla *sci);