Update to 0.8.2.

7 files changed, 24 insertions, 19 deletions

diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index cdcd3de994ac..e4d617588ee4 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gtkscintilla
-PORTVERSION=	0.7.2
+PORTVERSION=	0.8.2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.moleskine.f2s.com/files/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	moleskine
 DISTNAME=	GtkScintilla-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
diff --git a/x11-toolkits/gtkscintilla/distinfo b/x11-toolkits/gtkscintilla/distinfo
index c22f99bd3e0c..6e33a87a9412 100644
--- a/x11-toolkits/gtkscintilla/distinfo
+++ b/x11-toolkits/gtkscintilla/distinfo
@@ -1 +1 @@
-MD5 (GtkScintilla-0.7.2.tar.gz) = 6675051881b3223f7b546f317599fc5c
+MD5 (GtkScintilla-0.8.2.tar.gz) = 1747693cca775a7ece962d4501cdd349
diff --git a/x11-toolkits/gtkscintilla/files/patch-aa b/x11-toolkits/gtkscintilla/files/patch-aa
index 562dfa7dd10b..46786fd00617 100644
--- a/x11-toolkits/gtkscintilla/files/patch-aa
+++ b/x11-toolkits/gtkscintilla/files/patch-aa
@@ -1,13 +1,13 @@
 
 $FreeBSD$
 
---- Makefile.orig	Sun Jun 10 12:03:21 2001
-+++ Makefile	Sun Jun 10 15:41:45 2001
-@@ -2,18 +2,18 @@
+--- Makefile.orig	Fri Feb  8 10:15:02 2002
++++ Makefile	Mon Feb 11 15:03:03 2002
+@@ -2,20 +2,20 @@
  
  NAME = GtkScintilla
  LIB_NAME = gtkscintilla
--VERSION = 0.7.2
+-VERSION = 0.8.2
 -PREFIX = $(shell gtk-config --prefix)
 +VERSION = 0
 +PREFIX = $(shell $(GTK_CONFIG) --prefix)
@@ -18,21 +18,24 @@ $FreeBSD$
 -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
+-LDFLAGS_PRE = $(shell gtk-config --libs) -DGTK 
+-LDFLAGS_POST =  $(LEXERS)  $(SCINTILLA_LIB) -lstdc++
 +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
-+LDFLAGS = $(shell $(GTK_CONFIG) --libs) $(SCINTILLA_LIB) $(LEXERS)
++LDFLAGS_PRE = $(shell $(GTK_CONFIG) --libs) -DGTK 
++LDFLAGS_POST =  $(LEXERS)  $(SCINTILLA_LIB)
+ 
+-CC = gcc
+-LD = gcc
 +CC ?= gcc
 +LD = $(CC)
  AR = ar
  
  STATIC_LIB = lib$(LIB_NAME).a
-@@ -24,10 +24,10 @@
+@@ -26,10 +26,10 @@
  
  all: $(STATIC_LIB) $(SHARED_LIB)
  
@@ -42,10 +45,10 @@ $FreeBSD$
  
 -$(SHARED_LIB): $(SCINTILLA_LIB) gtkscintilla.o
 +$(SHARED_LIB): gtkscintilla.o
- 	$(LD) -o $@ $^ -shared $(LDFLAGS)
+ 	$(LD)  $(LDFLAGS_PRE) gtkscintilla.o -shared $(LDFLAGS_POST) -o $@
  
  gtkscintilla.o: gtkscintilla.h gtkscintilla.c
-@@ -35,8 +35,8 @@
+@@ -37,8 +37,8 @@
  $(SCINTILLA_LIB):
  	cd $(SCINTILLA_DIR)/gtk ; $(MAKE)
  
diff --git a/x11-toolkits/gtkscintilla/pkg-descr b/x11-toolkits/gtkscintilla/pkg-descr
index e7c854bca9bb..e2cae464b181 100644
--- a/x11-toolkits/gtkscintilla/pkg-descr
+++ b/x11-toolkits/gtkscintilla/pkg-descr
@@ -10,4 +10,4 @@ GtkScintilla addresses both:
  - It is a shared library
  - It is a true GtkWidget subclass with a GTK+ API
 
-WWW: http://www.moleskine.f2s.com/
+WWW: http://www.micampe.it/software/moleskine/
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index 96dfb6ceda34..668fc4de8be7 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	py-gtkscintilla
-PORTVERSION=	0.7.4
+PORTVERSION=	0.8.2
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	http://www.moleskine.f2s.com/files/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	moleskine
 DISTNAME=	PyGtkScintilla-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
diff --git a/x11-toolkits/py-gtkscintilla/distinfo b/x11-toolkits/py-gtkscintilla/distinfo
index d8063b998c67..24459275a0a8 100644
--- a/x11-toolkits/py-gtkscintilla/distinfo
+++ b/x11-toolkits/py-gtkscintilla/distinfo
@@ -1 +1 @@
-MD5 (PyGtkScintilla-0.7.4.tar.gz) = 6aa9bbc48b3e58072cf0a7f7af7f3976
+MD5 (PyGtkScintilla-0.8.2.tar.gz) = 3b6d1e7818b1ed3f59e2dbde17d87c33
diff --git a/x11-toolkits/py-gtkscintilla/pkg-descr b/x11-toolkits/py-gtkscintilla/pkg-descr
index 96be959af251..132119a823b8 100644
--- a/x11-toolkits/py-gtkscintilla/pkg-descr
+++ b/x11-toolkits/py-gtkscintilla/pkg-descr
@@ -1,3 +1,3 @@
 Python bindings for gtkscintilla library.
 
-WWW: http://www.moleskine.f2s.com/
+WWW: http://www.micampe.it/software/moleskine/