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 -0000 1.11
+++ scintilla/Makefile 3 Oct 2010 03:13:01 -0000
@@ -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_lexers 6.0
+SHARED_LIBS= scintilla 7.0 \
+ scintilla_lexers 7.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 -0000 1.6
+++ scintilla/distinfo 3 Oct 2010 03:13:01 -0000
@@ -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_makefile 22 Mar 2008 11:44:42 -0000
1.7
+++ scintilla/patches/patch-gtk_makefile 3 Oct 2010 03:13:01 -0000
@@ -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 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- # If explicit setting of GTK1 or GTK2 then use that else look for
-@@ -56,9 +59,13 @@ endif
- endif
+ CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+ MARSHALLER=scintilla-marshal.o
.cxx.o:
- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
@@ -52,11 +52,7 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42
+.c.so:
+ $(CCOMP) -fPIC $(CONFIGFLAGS) $(CXXFLAGS) -w -o $@ -c $<
- #++Autogenerated -- run src/LexGen.py to regenerate
- #**LEXOBJS=\\\n\(\*.o \)
-@@ -75,22 +82,52 @@ LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o Le
- LexTADS3.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
- #--Autogenerated -- end of automatically generated section
+ LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
-all: $(COMPLIB)
+ifeq (${NO_SHARED_LIBS},"yes")
@@ -87,17 +83,18 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42
- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ $(CXX) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
--$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
-+LIBOBJS = DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
- CharClassify.o Decoration.o Document.o CallTip.o \
- ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o
PlatGTK.o \
+-$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o
StyleContext.o WordList.o \
++LIBOBJS = Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o
StyleContext.o WordList.o \
+ CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o \
+ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o
PropSetSimple.o PlatGTK.o \
KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o
ViewStyle.o \
- RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o
UniConversion.o XPM.o \
+ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o
UniConversion.o XPM.o \
$(MARSHALLER) $(LEXOBJS)
+
+$(COMPLIB): $(LIBOBJS)
$(AR) rc $@ $^
$(RANLIB) $@
++
+
+$(LEXERLIB): $(LEXOBJS)
+ $(AR) rc $@ $^
Index: scintilla/patches/patch-src_KeyWords_cxx
===================================================================
RCS file: /cvs/ports/editors/scintilla/patches/patch-src_KeyWords_cxx,v
retrieving revision 1.3
diff -N -u -p scintilla/patches/patch-src_KeyWords_cxx
--- scintilla/patches/patch-src_KeyWords_cxx 22 Mar 2008 11:44:42 -0000
1.3
+++ /dev/null 3 Oct 2010 02:31:01 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_KeyWords_cxx,v 1.3 2008/03/22 11:44:42 steven Exp $
---- src/KeyWords.cxx.orig Tue Jun 19 16:12:16 2007
-+++ src/KeyWords.cxx Tue Jun 19 16:14:30 2007
-@@ -77,7 +77,8 @@ int LexerModule::GetStyleBitsNeeded() const {
-
- const LexerModule *LexerModule::Find(int language) {
- const LexerModule *lm = base;
-- while (lm) {
-+ int i;
-+ for(i=0; lm && i < 88; i++) {
- if (lm->language == language) {
- return lm;
- }
-@@ -89,7 +90,8 @@ const LexerModule *LexerModule::Find(int language) {
- const LexerModule *LexerModule::Find(const char *languageName) {
- if (languageName) {
- const LexerModule *lm = base;
-- while (lm) {
-+ int i;
-+ for(i=0; lm && i < 88; i++) {
- if (lm->languageName && 0 == strcmp(lm->languageName,
languageName)) {
- return lm;
- }
Index: scintilla/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scintilla/pkg/PLIST,v
retrieving revision 1.2
diff -N -u -p scintilla/pkg/PLIST
--- scintilla/pkg/PLIST 15 Sep 2004 18:01:07 -0000 1.2
+++ scintilla/pkg/PLIST 3 Oct 2010 03:13:01 -0000
@@ -1,14 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:01:07 espie Exp $
include/scintilla/
-include/scintilla/Accessor.h
-include/scintilla/KeyWords.h
+include/scintilla/ILexer.h
include/scintilla/Platform.h
-include/scintilla/PropSet.h
-include/scintilla/SString.h
include/scintilla/SciLexer.h
include/scintilla/Scintilla.h
include/scintilla/ScintillaWidget.h
-include/scintilla/WindowAccessor.h
lib/libscintilla.a
lib/libscintilla_lexers.a
%%SHARED%%
Index: scite/Makefile
===================================================================
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.14
diff -N -u -p scite/Makefile
--- scite/Makefile 30 Sep 2010 07:21:18 -0000 1.14
+++ scite/Makefile 3 Oct 2010 03:13:01 -0000
@@ -2,16 +2,14 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 1.76
+VERSION= 2.21
DISTNAME= scite${VERSION:S/.//}
PKGNAME= scite-${VERSION}
CATEGORIES= editors x11
-REVISION= 3
-
HOMEPAGE= http://www.scintilla.org/SciTE.html
-MAINTAINER= Jeremy Evans <open...@jeremyevans.net>
+MAINTAINER= Jeremy Evans <jer...@openbsd.org>
# old Python license
PERMIT_PACKAGE_CDROM= may not sell
@@ -23,15 +21,17 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xe
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png pthread pthread-stubs stdc++ xcb z gdk_pixbuf-2.0
+WANTLIB += pixman-1 png pthread pthread-stubs stdc++ xcb z
+WANTLIB += gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += scintilla.>=7 scintilla_lexers.>=7
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
EXTRACT_SUFX= .tgz
MODULES= devel/gettext
-LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \
- scintilla.>=6,scintilla_lexers.>=6::editors/scintilla
+LIB_DEPENDS= ::x11/gtk+2 \
+ ::editors/scintilla
USE_GMAKE= Yes
USE_X11= Yes
Index: scite/distinfo
===================================================================
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.6
diff -N -u -p scite/distinfo
--- scite/distinfo 22 Mar 2008 11:44:42 -0000 1.6
+++ scite/distinfo 3 Oct 2010 03:13:01 -0000
@@ -1,5 +1,5 @@
-MD5 (scite176.tgz) = wzRhZDxiyAQgN23jcSUJKw==
-RMD160 (scite176.tgz) = PoK7bEJarqqd2TLheeg34fzOnXE=
-SHA1 (scite176.tgz) = Ru9sfV8xLtaMrIQx6rF++g5hjV4=
-SHA256 (scite176.tgz) = zqH5Ms6jPpPwGKxpKfHRjt1s/o/crHOwXaTnIZhyhaA=
-SIZE (scite176.tgz) = 1497197
+MD5 (scite221.tgz) = ayka+nC9/9k/eM32AhueSA==
+RMD160 (scite221.tgz) = lik0kx9LXoISoTRLbLlJTgxo1gw=
+SHA1 (scite221.tgz) = WAiHswjguExvcJr/qXJXLtqldh8=
+SHA256 (scite221.tgz) = uoZSG+PqsctVVy1bcX5HF6PuxW742dYsDc3e0jnpz6c=
+SIZE (scite221.tgz) = 1920326
Index: scite/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.4
diff -N -u -p scite/patches/patch-gtk_makefile
--- scite/patches/patch-gtk_makefile 22 Mar 2008 11:44:42 -0000 1.4
+++ scite/patches/patch-gtk_makefile 3 Oct 2010 03:13:01 -0000
@@ -1,18 +1,12 @@
$OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42 steven Exp $
---- 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)
- CONFIGTHREADS=
+--- gtk/makefile.orig Sun Aug 29 05:55:22 2010
++++ gtk/makefile Sat Oct 2 19:46:19 2010
+@@ -18,20 +18,21 @@ AR = ar
+ CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+ CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
+ CONFIGTHREADS:=
-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
+#gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
- else
- CONFIGFLAGS=$(shell gtk-config --cflags)
- CONFIGLIB=$(shell gtk-config --libs)
- CONFIGTHREADS=$(shell glib-config --libs gthread)
--gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
- endif
ifndef prefix
ifdef gnomeprefix
prefix=$(gnomeprefix)
@@ -32,14 +26,15 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42
PROG = ../bin/SciTE
-@@ -55,16 +55,18 @@ vpath %.h ../src ../../scintilla/include
+@@ -40,17 +41,19 @@ all: $(PROG)
+ vpath %.h ../src ../../scintilla/include
vpath %.cxx ../src
- #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
-Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
--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)
+ #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
+-CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Dunix -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS) $(DEPRECATED)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -56,16 +51,16 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42
LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
ltable.o ltm.o lundump.o lvm.o lzio.o
-@@ -74,14 +76,14 @@ LUA_LIB_OBJS = lauxlib.o lbaselib.o ldblib.o liolib.o
+@@ -60,14 +63,14 @@ LUA_LIB_OBJS = lauxlib.o lbaselib.o ldblib.o liolib.o
- LUA_OBJS = LuaExtension.o IFaceTable.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
+INCLUDEDIRS+=-I../lua/include
$(LUA_CORE_OBJS): ../lua/src/*.c
- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
+ $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
$(LUA_LIB_OBJS): ../lua/src/lib/*.c
- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
+ $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c
../lua/src/lib/*.c
-CXXFLAGS=$(CXXTFLAGS)
+CXXFLAGS+=$(CXXTFLAGS)
else
@@ -74,7 +69,7 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42
endif
ifeq ($(shell uname), Darwin)
-@@ -89,21 +91,18 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
+@@ -75,22 +78,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
endif
.cxx.o:
@@ -91,17 +86,18 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42
-# 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
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)
+ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
+-FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o
StringHelpers.o \
+-PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleWriter.o Utf8_16.o \
++ FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o
Exporters.o StringHelpers.o \
++ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o
StyleWriter.o Utf8_16.o \
+ JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
+- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script
lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
++ $(CXX) $(CONFIGTHREADS) $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -lstdc++
# Automatically generate header dependencies with "make deps"
include deps.mak
-@@ -112,22 +111,20 @@ include deps.mak
+@@ -99,18 +99,16 @@ include deps.mak
# This is OK - just means no SciTE in the Gnome Applications menu
# Dead: install -D SciTEGTK.properties
$(SYSCONF_PATH)/SciTEGlobal.properties
install:
@@ -110,7 +106,7 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42
- $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
+ $(INSTALL) -m 755 $(PROG) $(bindir)
-+ $(INSTALL) -m 755 -d $(SYSCONF_PATH) $(DOC_PATH)
++ $(INSTALL) -m 755 -d $(SYSCONF_PATH) $(DOC_PATH)
+ $(INSTALL) -m 444 ../src/*.properties $(SYSCONF_PATH)
+ $(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png
$(DOC_PATH)
@@ -120,11 +116,7 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42
- done
-
ifdef gnomeprefix
- ifdef GTK2
$(INSTALL) -m 755 -D SciTE.desktop
$(DESTDIR)$(datadir)/applications/SciTE.desktop
- else
- $(INSTALL) -m 755 -D SciTE.desktop
$(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
- endif
- $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ $(INSTALL) -m 444 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
endif
Index: scite/patches/patch-src_Embedded_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_Embedded_properties,v
retrieving revision 1.3
diff -N -u -p scite/patches/patch-src_Embedded_properties
--- scite/patches/patch-src_Embedded_properties 22 Mar 2008 11:44:42 -0000
1.3
+++ scite/patches/patch-src_Embedded_properties 3 Oct 2010 03:13:01 -0000
@@ -1,21 +1,12 @@
$OpenBSD: patch-src_Embedded_properties,v 1.3 2008/03/22 11:44:42 steven Exp $
---- 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
+--- src/Embedded.properties.orig Fri Jul 23 03:46:19 2010
++++ src/Embedded.properties Sat Oct 2 19:38:57 2010
+@@ -85,7 +85,7 @@ if PLAT_WIN
command.scite.help.subsystem=2
if PLAT_GTK
command.print.*=a2ps "$(FileNameExt)"
- command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
-+ command.scite.help=firefox "file://__DOCDIR__/SciTEDoc.html"
++ command.scite.help=firefox
"file:///usr/local/share/doc/scite/SciTEDoc.html"
code.page=0
-
-@@ -3209,7 +3209,7 @@ if PLAT_WIN
- command.go.$(file.patterns.web)="file://$(FilePath)"
- command.go.subsystem.$(file.patterns.web)=2
if PLAT_GTK
-- command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+ command.go.$(file.patterns.web)=firefox "file://$(FilePath)"
-
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
Index: scite/patches/patch-src_SciTEGlobal_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_SciTEGlobal_properties,v
retrieving revision 1.3
diff -N -u -p scite/patches/patch-src_SciTEGlobal_properties
--- scite/patches/patch-src_SciTEGlobal_properties 22 Mar 2008 11:44:42
-0000 1.3
+++ scite/patches/patch-src_SciTEGlobal_properties 3 Oct 2010 03:13:01
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_SciTEGlobal_properties,v 1.3 2008/03/22 11:44:42 steven
Exp $
---- 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
+--- src/SciTEGlobal.properties.orig Fri Jul 30 19:56:35 2010
++++ src/SciTEGlobal.properties Sat Oct 2 19:38:57 2010
+@@ -239,7 +239,7 @@ if PLAT_WIN
command.scite.help.subsystem=2
if PLAT_GTK
command.print.*=a2ps "$(FileNameExt)"
- command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
-+ command.scite.help=firefox "file://__DOCDIR__/SciTEDoc.html"
++ command.scite.help=firefox
"file:///usr/local/share/doc/scite/SciTEDoc.html"
# Internationalisation
# Japanese input code page 932 and ShiftJIS character set 128
Index: scite/patches/patch-src_html_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_html_properties,v
retrieving revision 1.1
diff -N -u -p scite/patches/patch-src_html_properties
--- scite/patches/patch-src_html_properties 18 Jan 2007 10:56:27 -0000
1.1
+++ /dev/null 3 Oct 2010 02:31:01 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_html_properties,v 1.1 2007/01/18 10:56:27 steven Exp $
---- src/html.properties.orig Thu Jan 18 08:09:15 2007
-+++ src/html.properties Thu Jan 18 08:10:37 2007
-@@ -516,7 +516,7 @@ if PLAT_WIN
- command.go.$(file.patterns.web)="file://$(FilePath)"
- command.go.subsystem.$(file.patterns.web)=2
- if PLAT_GTK
-- command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+ command.go.$(file.patterns.web)=firefox "file://$(FilePath)"
-
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
Index: scite/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scite/pkg/PLIST,v
retrieving revision 1.5
diff -N -u -p scite/pkg/PLIST
--- scite/pkg/PLIST 22 Mar 2008 11:44:42 -0000 1.5
+++ scite/pkg/PLIST 3 Oct 2010 03:13:01 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.5 2008/03/22 11:44:42 steven Exp $
-bin/SciTE
+...@bin bin/SciTE
share/doc/scite/
share/doc/scite/CommandValues.html
share/doc/scite/PrintHi.png
@@ -16,6 +16,7 @@ share/doc/scite/SciTEImage.html
share/doc/scite/SciTELexer.html
share/doc/scite/SciTELua.html
share/doc/scite/SciTERegEx.html
+share/doc/scite/ScriptLexer.html
share/scite/
share/scite/Embedded.properties
share/scite/SciTE.properties
@@ -32,6 +33,7 @@ share/scite/blitzbasic.properties
share/scite/bullant.properties
share/scite/caml.properties
share/scite/cmake.properties
+share/scite/cobol.properties
share/scite/conf.properties
share/scite/cpp.properties
share/scite/csound.properties
@@ -56,6 +58,7 @@ share/scite/lua.properties
share/scite/matlab.properties
share/scite/metapost.properties
share/scite/mmixal.properties
+share/scite/nimrod.properties
share/scite/nncrontab.properties
share/scite/nsis.properties
share/scite/opal.properties
@@ -63,6 +66,7 @@ share/scite/others.properties
share/scite/pascal.properties
share/scite/perl.properties
share/scite/pov.properties
+share/scite/powerpro.properties
share/scite/powershell.properties
share/scite/ps.properties
share/scite/purebasic.properties
@@ -72,11 +76,15 @@ share/scite/rebol.properties
share/scite/ruby.properties
share/scite/scriptol.properties
share/scite/smalltalk.properties
+share/scite/sorcins.properties
share/scite/specman.properties
share/scite/spice.properties
share/scite/sql.properties
+share/scite/tacl.properties
+share/scite/tal.properties
share/scite/tcl.properties
share/scite/tex.properties
+share/scite/txt2tags.properties
share/scite/vb.properties
share/scite/verilog.properties
share/scite/vhdl.properties
