These diffs update textproc/scintilla and textproc/scite from 1.74 to
1.76. The major change are the addition of 5 new lexers. The full list
of changes is available at:
http://scintilla.sourceforge.net/ScintillaHistory.html.
Tested on i386. Please test and commit.
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 16 Sep 2007 00:44:00 -0000 1.10
+++ Makefile 21 Mar 2008 22:53:51 -0000
@@ -2,13 +2,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 1.74
+VERSION= 1.76
DISTNAME= scintilla${VERSION:S/.//}
PKGNAME= scintilla-${VERSION}
CATEGORIES= editors x11
-SHARED_LIBS= scintilla 5.0 \
- scintilla_lexers 5.0
+SHARED_LIBS= scintilla 6.0 \
+ scintilla_lexers 6.0
HOMEPAGE= http://www.scintilla.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 1 Aug 2007 09:21:06 -0000 1.5
+++ distinfo 21 Mar 2008 22:53:51 -0000
@@ -1,5 +1,5 @@
-MD5 (scintilla174.tgz) = /FHUrgfRk5T+fN43Oio10Q==
-RMD160 (scintilla174.tgz) = 7cUEui3DEGk4sP4mddv/7yX/XkM=
-SHA1 (scintilla174.tgz) = V3CdGpQpUhtI/tCWpruddgWhJbk=
-SHA256 (scintilla174.tgz) = MY/bGdsH2tzV3vU9scS1OL5Wtei7LqSNViFiVYvZcmo=
-SIZE (scintilla174.tgz) = 744822
+MD5 (scintilla176.tgz) = mnHizOVIRZcuGVWT+csb8g==
+RMD160 (scintilla176.tgz) = 5Nv5Ak5OGEAUHd2gB2Y5qG1UeO0=
+SHA1 (scintilla176.tgz) = dfBFdiYK1BJZbS4tq8nafE4lW6Q=
+SHA256 (scintilla176.tgz) = lsFfalDyUOU8G/Xlxoz+g4JDFUcSOmOdaVLpL0FjMJo=
+SIZE (scintilla176.tgz) = 766081
Index: patches/patch-src_KeyWords_cxx
===================================================================
RCS file: /cvs/ports/editors/scintilla/patches/patch-src_KeyWords_cxx,v
retrieving revision 1.2
diff -u -r1.2 patch-src_KeyWords_cxx
--- patches/patch-src_KeyWords_cxx 1 Aug 2007 09:21:07 -0000 1.2
+++ patches/patch-src_KeyWords_cxx 21 Mar 2008 22:53:51 -0000
@@ -7,7 +7,7 @@
const LexerModule *lm = base;
- while (lm) {
+ int i;
-+ for(i=0; lm && i < 83; i++) {
++ for(i=0; lm && i < 88; i++) {
if (lm->language == language) {
return lm;
}
@@ -17,7 +17,7 @@
const LexerModule *lm = base;
- while (lm) {
+ int i;
-+ for(i=0; lm && i < 83; i++) {
++ for(i=0; lm && i < 88; i++) {
if (lm->languageName && 0 == strcmp(lm->languageName,
languageName)) {
return lm;
}
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 13 Nov 2007 14:06:22 -0000 1.9
+++ Makefile 21 Mar 2008 23:13:12 -0000
@@ -2,9 +2,9 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 1.74
+VERSION= 1.76
DISTNAME= scite${VERSION:S/.//}
-PKGNAME= scite-${VERSION}p0
+PKGNAME= scite-${VERSION}
CATEGORIES= editors x11
HOMEPAGE= http://www.scintilla.org/SciTE.html
@@ -30,7 +30,7 @@
MODULES= devel/gettext
LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
- scintilla.>=5,scintilla_lexers.>=5::editors/scintilla
+ scintilla.>=6,scintilla_lexers.>=6::editors/scintilla
USE_GMAKE= Yes
USE_X11= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 1 Aug 2007 09:21:07 -0000 1.5
+++ distinfo 21 Mar 2008 23:13:12 -0000
@@ -1,5 +1,5 @@
-MD5 (scite174.tgz) = Ca0l8fptqz/uxB26JIAEfw==
-RMD160 (scite174.tgz) = pFR4Zb8ohBCPv7yOquHH0SAN3Uc=
-SHA1 (scite174.tgz) = ZAZu1VfBWCGlCVW4as3aDTLgpHI=
-SHA256 (scite174.tgz) = EGQKHEveSx9XJghclfehOaBEhTkR6+r/pY9CqiY1ngE=
-SIZE (scite174.tgz) = 1460459
+MD5 (scite176.tgz) = wzRhZDxiyAQgN23jcSUJKw==
+RMD160 (scite176.tgz) = PoK7bEJarqqd2TLheeg34fzOnXE=
+SHA1 (scite176.tgz) = Ru9sfV8xLtaMrIQx6rF++g5hjV4=
+SHA256 (scite176.tgz) = zqH5Ms6jPpPwGKxpKfHRjt1s/o/crHOwXaTnIZhyhaA=
+SIZE (scite176.tgz) = 1497197
Index: patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-gtk_makefile
--- patches/patch-gtk_makefile 1 Aug 2007 09:21:07 -0000 1.3
+++ patches/patch-gtk_makefile 21 Mar 2008 23:13:12 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-gtk_makefile,v 1.3 2007/08/01 09:21:07 steven Exp $
---- gtk/makefile.orig Thu Jun 14 17:37:56 2007
-+++ gtk/makefile Wed Jun 20 11:14:35 2007
+--- gtk/makefile.orig Fri Nov 30 16:27:26 2007
++++ gtk/makefile Fri Mar 21 15:42:27 2008
@@ -26,26 +26,26 @@ ifdef GTK2
CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
@@ -18,7 +18,7 @@
prefix=$(gnomeprefix)
else
- prefix=/usr
-+ prefix=$(PREFIX)
++ prefix=${PREFIX}
endif
endif
datadir=$(prefix)/share
@@ -27,8 +27,8 @@
SYSCONF_PATH=$(prefix)/share/scite
+DOC_PATH=$(prefix)/share/doc/scite
--INSTALL=install -o root -g root
-+INSTALL=install -o root -g bin
+-INSTALL=install
++INSTALL=install -o root -g bin
PROG = ../bin/SciTE
@@ -37,9 +37,9 @@
#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
-Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
--CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
-+INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src -I $(prefix)/include
-+CXXBASEFLAGS=-W -Wall -pedantic -Dunix -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+-CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Os -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
++INCLUDEDIRS=-I ${prefix}/include/scintilla -I ../src -I ${prefix}/include
++CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Dunix -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -91,11 +91,13 @@
-# make should be run in ../../scintilla/gtk to compile all the lexers.
-COMPLIB=../../scintilla/bin/scintilla.a
-
- $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o
Exporters.o \
- MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
- $(COMPLIB) $(LUA_OBJS)
-- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
-+ $(CXX) $(CONFIGTHREADS) $(LIBS) -DGTK $^ -o $@ $(CONFIGLIB)
+ $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o
StringList.o Exporters.o \
+-PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o
\
+- JobQueue.o GTKMutex.o $(COMPLIB) $(LUA_OBJS)
+- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK
$^ -o $@ $(CONFIGLIB)
++ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
Utf8_16.o \
++ JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
++ $(CXX) $(CONFIGTHREADS) $(LIBS) -rdynamic -Wl,--version-script lua.vers
-DGTK $^ -o $@ $(CONFIGLIB)
# Automatically generate header dependencies with "make deps"
include deps.mak
Index: patches/patch-src_Embedded_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_Embedded_properties,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Embedded_properties
--- patches/patch-src_Embedded_properties 1 Aug 2007 09:21:07 -0000
1.2
+++ patches/patch-src_Embedded_properties 21 Mar 2008 23:13:12 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Embedded_properties,v 1.2 2007/08/01 09:21:07 steven Exp $
---- src/Embedded.properties.orig Fri Jun 8 16:42:52 2007
-+++ src/Embedded.properties Wed Jun 20 08:23:23 2007
+--- src/Embedded.properties.orig Fri Jun 8 17:42:52 2007
++++ src/Embedded.properties Fri Mar 21 15:42:32 2008
@@ -79,7 +79,7 @@ if PLAT_WIN
command.scite.help.subsystem=2
if PLAT_GTK
Index: patches/patch-src_SciTEGlobal_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_SciTEGlobal_properties,v
retrieving revision 1.2
diff -u -r1.2 patch-src_SciTEGlobal_properties
--- patches/patch-src_SciTEGlobal_properties 1 Aug 2007 09:21:07 -0000
1.2
+++ patches/patch-src_SciTEGlobal_properties 21 Mar 2008 23:13:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_SciTEGlobal_properties,v 1.2 2007/08/01 09:21:07 steven
Exp $
---- src/SciTEGlobal.properties.orig Wed Apr 18 22:32:24 2007
-+++ src/SciTEGlobal.properties Wed Jun 20 08:23:23 2007
-@@ -210,7 +210,7 @@ if PLAT_WIN
+--- src/SciTEGlobal.properties.orig Wed Mar 5 16:31:07 2008
++++ src/SciTEGlobal.properties Fri Mar 21 15:42:32 2008
+@@ -220,7 +220,7 @@ if PLAT_WIN
command.scite.help.subsystem=2
if PLAT_GTK
command.print.*=a2ps "$(FileNameExt)"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scite/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 1 Aug 2007 09:21:07 -0000 1.4
+++ pkg/PLIST 21 Mar 2008 23:13:12 -0000
@@ -20,6 +20,7 @@
share/scite/Embedded.properties
share/scite/SciTE.properties
share/scite/SciTEGlobal.properties
+share/scite/abaqus.properties
share/scite/abbrev.properties
share/scite/ada.properties
share/scite/asm.properties
@@ -62,9 +63,11 @@
share/scite/pascal.properties
share/scite/perl.properties
share/scite/pov.properties
+share/scite/powershell.properties
share/scite/ps.properties
share/scite/purebasic.properties
share/scite/python.properties
+share/scite/r.properties
share/scite/rebol.properties
share/scite/ruby.properties
share/scite/scriptol.properties
