Fairly simple version update, lots of new features, see
http://www.scintilla.org/ScintillaHistory.html.
Tested on amd64. Looking for OKs.
Jeremy
Index: scintilla/Makefile
===
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.11
diff -N -u -p scintilla/Makefile
--- scintilla/Makefile 22 Mar 2008 11:44:42 - 1.11
+++ scintilla/Makefile 3 Oct 2010 03:13:01 -
@@ -2,17 +2,17 @@
COMMENT= source code editing component for GTK+
-VERSION= 1.76
+VERSION= 2.21
DISTNAME= scintilla${VERSION:S/.//}
PKGNAME= scintilla-${VERSION}
CATEGORIES=editors x11
-SHARED_LIBS= scintilla 6.0 \
- scintilla_lexers6.0
+SHARED_LIBS= scintilla 7.0 \
+ scintilla_lexers7.0
HOMEPAGE= http://www.scintilla.org/
-MAINTAINER=Jeremy Evans open...@jeremyevans.net
+MAINTAINER=Jeremy Evans jer...@openbsd.org
# old Python license
PERMIT_PACKAGE_CDROM= may not sell
@@ -30,7 +30,8 @@ MAKE_FILE=makefile
MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' \
NO_SHARED_LIBS='${NO_SHARED_LIBS:L}'
-LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+WANTLIB= m stdc++ gtk-x11-2.0 gdk-x11-2.0
+LIB_DEPENDS= ::x11/gtk+2
.for n v in ${SHARED_LIBS}
MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION}
Index: scintilla/distinfo
===
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.6
diff -N -u -p scintilla/distinfo
--- scintilla/distinfo 22 Mar 2008 11:44:42 - 1.6
+++ scintilla/distinfo 3 Oct 2010 03:13:01 -
@@ -1,5 +1,5 @@
-MD5 (scintilla176.tgz) = mnHizOVIRZcuGVWT+csb8g==
-RMD160 (scintilla176.tgz) = 5Nv5Ak5OGEAUHd2gB2Y5qG1UeO0=
-SHA1 (scintilla176.tgz) = dfBFdiYK1BJZbS4tq8nafE4lW6Q=
-SHA256 (scintilla176.tgz) = lsFfalDyUOU8G/Xlxoz+g4JDFUcSOmOdaVLpL0FjMJo=
-SIZE (scintilla176.tgz) = 766081
+MD5 (scintilla221.tgz) = l8h5/AgjR+jHY2tOZZ35Sw==
+RMD160 (scintilla221.tgz) = bwGEWdn+Xfjxwq/YdNe7g3Ym/PU=
+SHA1 (scintilla221.tgz) = t5ELBeQ4ZoiZXvVw0kDYgEickVU=
+SHA256 (scintilla221.tgz) = A1wKtWrFSgwvnUX27vIXb3V6nPn/o2KakkCnQC1LUQg=
+SIZE (scintilla221.tgz) = 999005
Index: scintilla/patches/patch-gtk_makefile
===
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.7
diff -N -u -p scintilla/patches/patch-gtk_makefile
--- scintilla/patches/patch-gtk_makefile22 Mar 2008 11:44:42 -
1.7
+++ scintilla/patches/patch-gtk_makefile3 Oct 2010 03:13:01 -
@@ -1,18 +1,18 @@
-$OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42 steven Exp $
gtk/makefile.orig Fri Jan 18 23:18:13 2008
-+++ gtk/makefile Sat Mar 22 12:30:08 2008
-@@ -7,7 +7,7 @@
- # To force GTK+ 2 build, define GTK2 on the make command line.
- # To force GTK+ 1 build, define GTK1 on the make command line.
+$OpenBSD$
+--- gtk/makefile.orig Tue Aug 17 20:03:30 2010
gtk/makefile Sat Oct 2 20:04:57 2010
+@@ -6,7 +6,7 @@
+ # Builds for GTK+ 2 and no longer supports GTK+ 1.
+ # Also works with ming32-make on Windows.
-.SUFFIXES: .cxx .c .o .h .a
+.SUFFIXES: .cxx .c .o .h .a .so
- CC = g++
- CCOMP = gcc
- AR = ar
-@@ -17,13 +17,16 @@ ifeq ($(shell uname),Darwin)
- RANLIB = ranlib
+ ifdef CLANG
+ CC = clang
+ CCOMP = clang
+@@ -23,14 +23,17 @@ RANLIB = ranlib
endif
+ endif
-COMPLIB=../bin/scintilla.a
+COMPLIB=../bin/libscintilla.a
@@ -20,17 +20,18 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42
+SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION}
+SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
- vpath %.h ../src ../include
- vpath %.cxx ../src
+ vpath %.h ../src ../include ../lexlib
+ vpath %.cxx ../src ../lexlib ../lexers
--INCLUDEDIRS=-I ../include -I ../src
--CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -Os
-DGTK -DSCI_LEXER $(INCLUDEDIRS)
-+INCLUDEDIRS=-I ../include -I ../src -I /usr/local/include
-+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK
-DSCI_LEXER -Dunix $(INCLUDEDIRS)
+-INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
++INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I /usr/local/include
+ #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
+-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long
-pedantic -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
-@@ -34,7 +37,7 @@ endif
+@@ -41,35 +44,70 @@ endif
ifdef DEBUG
CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
@@ -38,9 +39,8 @@
