Fairly simple update. SciTE 3.0.0 can now use either GTK+2 or GTK+3,
and I'm choosing to switch it to GTK+3. Many lexer fixes among other
changes, see http://www.scintilla.org/ScintillaHistory.html for details.
Tested on i386.
Jeremy
Index: editors/scintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- editors/scintilla/Makefile 16 Sep 2011 09:48:09 -0000 1.15
+++ editors/scintilla/Makefile 15 Nov 2011 01:48:25 -0000
@@ -2,14 +2,13 @@
COMMENT= source code editing component for GTK+
-VERSION= 2.22
-DISTNAME= scintilla${VERSION:S/.//}
+VERSION= 3.0.0
+DISTNAME= scintilla${VERSION:S/.//g}
PKGNAME= scintilla-${VERSION}
-REVISION= 0
CATEGORIES= editors x11
-SHARED_LIBS= scintilla 7.0 \
- scintilla_lexers 7.0
+SHARED_LIBS= scintilla 8.0 \
+ scintilla_lexers 8.0
HOMEPAGE= http://www.scintilla.org/
@@ -29,10 +28,11 @@ NO_REGRESS= Yes
MAKE_FILE= makefile
MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' \
- NO_SHARED_LIBS='${NO_SHARED_LIBS:L}'
+ NO_SHARED_LIBS='${NO_SHARED_LIBS:L}' \
+ GTK3=1
-WANTLIB= m stdc++ gtk-x11-2.0 gdk-x11-2.0
-LIB_DEPENDS= x11/gtk+2
+WANTLIB= m stdc++
+LIB_DEPENDS= x11/gtk+3
.for n v in ${SHARED_LIBS}
MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION}
Index: editors/scintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/scintilla/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- editors/scintilla/distinfo 2 Dec 2010 21:24:39 -0000 1.8
+++ editors/scintilla/distinfo 15 Nov 2011 01:48:25 -0000
@@ -1,5 +1,5 @@
-MD5 (scintilla222.tgz) = B/NBPxNOraEXAedpWnPXZw==
-RMD160 (scintilla222.tgz) = XZSke3JlGxTjiHDq1ogHRI8iMa8=
-SHA1 (scintilla222.tgz) = YkwZPdRKGB4q5pXIr0bAdDJ/Vgk=
-SHA256 (scintilla222.tgz) = XPKT/GdVwZoHmKlsZc+0ltyFD4mnRMjA08nOqem9DRg=
-SIZE (scintilla222.tgz) = 1009848
+MD5 (scintilla300.tgz) = nbe52Jt1TFDtMv0qdy8nXw==
+RMD160 (scintilla300.tgz) = easWsivZFm96Zz1fW5LoY50pGqg=
+SHA1 (scintilla300.tgz) = cv+QQptD26+J1dpqR352+Unip1Q=
+SHA256 (scintilla300.tgz) = E7r1xM0jVkwdVPnseIy4VAXyZm+0MX9NMqZ+ngsGQWs=
+SIZE (scintilla300.tgz) = 969138
Index: editors/scintilla/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scintilla/patches/patch-gtk_makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-gtk_makefile
--- editors/scintilla/patches/patch-gtk_makefile 3 Oct 2010 18:09:01
-0000 1.8
+++ editors/scintilla/patches/patch-gtk_makefile 15 Nov 2011 01:48:25
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-gtk_makefile,v 1.8 2010/10/03 18:09:01 jeremy Exp $
---- gtk/makefile.orig Tue Aug 17 20:03:30 2010
-+++ gtk/makefile Sat Oct 2 20:04:57 2010
+--- gtk/makefile.orig Mon Aug 1 04:49:04 2011
++++ gtk/makefile Tue Nov 15 02:05:09 2011
@@ -6,7 +6,7 @@
# Builds for GTK+ 2 and no longer supports GTK+ 1.
# Also works with ming32-make on Windows.
@@ -10,36 +10,40 @@ $OpenBSD: patch-gtk_makefile,v 1.8 2010/
ifdef CLANG
CC = clang
CCOMP = clang
-@@ -23,14 +23,17 @@ RANLIB = ranlib
- endif
- endif
-
+@@ -36,17 +36,20 @@ DEL = del /q
+ COMPLIB=..\bin\scintilla.a
+ else
+ DEL = rm -f
-COMPLIB=../bin/scintilla.a
+COMPLIB=../bin/libscintilla.a
+LEXERLIB=../bin/libscintilla_lexers.a
+SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION}
+SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
+ endif
vpath %.h ../src ../include ../lexlib
vpath %.cxx ../src ../lexlib ../lexers
-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
++INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I${LOCALBASE}/include
+ ifdef CHECK_DEPRECATED
+ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
+ endif
-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
-@@ -41,35 +44,70 @@ endif
+@@ -57,7 +60,7 @@ endif
ifdef DEBUG
CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+ CFLAGS:=$(CXXFLAGS)
+@@ -66,28 +69,62 @@ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)
MARSHALLER=scintilla-marshal.o
.cxx.o:
@@ -48,7 +52,7 @@ $OpenBSD: patch-gtk_makefile,v 1.8 2010/
+.cxx.so:
+ $(CXX) -fPIC $(CONFIGFLAGS) $(CXXFLAGS) -o $@ -c $<
.c.o:
- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
+ $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+.c.so:
+ $(CCOMP) -fPIC $(CONFIGFLAGS) $(CXXFLAGS) -w -o $@ -c $<
@@ -77,7 +81,7 @@ $OpenBSD: patch-gtk_makefile,v 1.8 2010/
+endif
+
clean:
- rm -f *.o $(COMPLIB)
+ $(DEL) *.o $(COMPLIB)
deps:
- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
@@ -94,7 +98,6 @@ $OpenBSD: patch-gtk_makefile,v 1.8 2010/
+$(COMPLIB): $(LIBOBJS)
$(AR) rc $@ $^
$(RANLIB) $@
-+
+
+$(LEXERLIB): $(LEXOBJS)
+ $(AR) rc $@ $^
Index: editors/scite/Makefile
===================================================================
RCS file: /cvs/ports/editors/scite/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- editors/scite/Makefile 16 Sep 2011 09:48:09 -0000 1.21
+++ editors/scite/Makefile 15 Nov 2011 01:48:25 -0000
@@ -2,10 +2,9 @@
COMMENT= flexible and small GTK+ editor
-VERSION= 2.22
-DISTNAME= scite${VERSION:S/.//}
+VERSION= 3.0.0
+DISTNAME= scite${VERSION:S/.//g}
PKGNAME= scite-${VERSION}
-REVISION= 1
CATEGORIES= editors x11
HOMEPAGE= http://www.scintilla.org/SciTE.html
@@ -18,20 +17,15 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= may not sell
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gio-2.0 glib-2.0 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
-WANTLIB += gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += scintilla>=7 scintilla_lexers>=7
+WANTLIB += c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gthread-2.0
+WANTLIB += gtk-3 pthread scintilla scintilla_lexers stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
EXTRACT_SUFX= .tgz
MODULES= devel/gettext
-LIB_DEPENDS= x11/gtk+2 \
+LIB_DEPENDS= x11/gtk+3 \
editors/scintilla
USE_GMAKE= Yes
@@ -39,7 +33,7 @@ NO_REGRESS= Yes
WRKDIST= ${WRKDIR}/scite
WRKSRC= ${WRKDIST}/gtk
MAKE_FILE= makefile
-MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" GTK3=1
post-extract:
perl -pi -e 's|\x0d||' ${WRKSRC}/*.cxx ${WRKDIST}/src/*.cxx
Index: editors/scite/distinfo
===================================================================
RCS file: /cvs/ports/editors/scite/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- editors/scite/distinfo 2 Dec 2010 21:25:05 -0000 1.8
+++ editors/scite/distinfo 15 Nov 2011 01:48:25 -0000
@@ -1,5 +1,5 @@
-MD5 (scite222.tgz) = +MxSD+LZ//hZiQduK4tznA==
-RMD160 (scite222.tgz) = gSsb52qi6yTsXmei2mT0zt9FBnM=
-SHA1 (scite222.tgz) = CbH8L2k8GTT5AodnG6Xw6bQlhiA=
-SHA256 (scite222.tgz) = lbkEMYQUxZEKHhyMDGMbdhVj24PMdc1akkTaFWtZKo4=
-SIZE (scite222.tgz) = 1816710
+MD5 (scite300.tgz) = Ni+eXcn1wLiWoxNXn6TZNg==
+RMD160 (scite300.tgz) = iuS4OgOZsrm2MiIQVkBIF/6IYxc=
+SHA1 (scite300.tgz) = l7Jhb32Ao6zOmE3upbi1G4+7+Vg=
+SHA256 (scite300.tgz) = Wy9wVYRVpTIp3Y1qKE0ddWg5nvNOE1Kx8a9CRQ+ZzhE=
+SIZE (scite300.tgz) = 1811007
Index: editors/scite/patches/patch-gtk_makefile
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-gtk_makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-gtk_makefile
--- editors/scite/patches/patch-gtk_makefile 3 Oct 2010 18:09:01 -0000
1.5
+++ editors/scite/patches/patch-gtk_makefile 15 Nov 2011 01:48:25 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
---- 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)
+--- gtk/makefile.orig Fri Sep 16 11:14:07 2011
++++ gtk/makefile Tue Nov 15 02:30:56 2011
+@@ -24,20 +24,21 @@ endif
+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+ CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) 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)
+-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
++#gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
ifndef prefix
ifdef gnomeprefix
prefix=$(gnomeprefix)
@@ -26,13 +26,15 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/
PROG = ../bin/SciTE
-@@ -40,17 +41,19 @@ all: $(PROG)
+@@ -46,19 +47,21 @@ all: $(PROG)
vpath %.h ../src ../../scintilla/include
vpath %.cxx ../src
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
+INCLUDEDIRS=-I ${prefix}/include/scintilla -I ../src -I ${prefix}/include
- #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
+ ifdef CHECK_DEPRECATED
+ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
+ endif
-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)
@@ -51,25 +53,16 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/
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
-@@ -60,14 +63,14 @@ LUA_LIB_OBJS = lauxlib.o lbaselib.o ldblib.o liolib.o
+@@ -70,7 +73,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_O
- LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+ vpath %.c ../lua/src ../lua/src/lib
-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
+INCLUDEDIRS+=-I../lua/include
- $(LUA_CORE_OBJS): ../lua/src/*.c
- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
- $(LUA_LIB_OBJS): ../lua/src/lib/*.c
- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c
../lua/src/lib/*.c
--CXXFLAGS=$(CXXTFLAGS)
-+CXXFLAGS+=$(CXXTFLAGS)
- else
--CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
-+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
- endif
- ifeq ($(shell uname), Darwin)
-@@ -75,22 +78,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
+ .c.o:
+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o
$@
+@@ -90,22 +93,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
endif
.cxx.o:
@@ -87,17 +80,17 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/
-COMPLIB=../../scintilla/bin/scintilla.a
-
$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
--FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o
StringHelpers.o \
+-FilePath.o SciTEBase.o Credits.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 \
++ FilePath.o SciTEBase.o Credits.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++
+- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script
lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
++ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed
-Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
# Automatically generate header dependencies with "make deps"
include deps.mak
-@@ -99,18 +99,16 @@ include deps.mak
+@@ -114,19 +114,18 @@ 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:
@@ -114,11 +107,12 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/
- do \
- $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
- done
--
+
ifdef gnomeprefix
- $(INSTALL) -m 755 -D SciTE.desktop
$(DESTDIR)$(datadir)/applications/SciTE.desktop
-- $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+ $(INSTALL) -m 444 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications
$(DESTDIR)$(pixmapdir)
+ $(INSTALL) -m 755 SciTE.desktop
$(DESTDIR)$(datadir)/applications/SciTE.desktop
+- $(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++ $(INSTALL) -m 444 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
endif
uninstall:
Index: editors/scite/patches/patch-src_Embedded_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_Embedded_properties,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_Embedded_properties
--- editors/scite/patches/patch-src_Embedded_properties 3 Oct 2010 18:09:01
-0000 1.4
+++ editors/scite/patches/patch-src_Embedded_properties 15 Nov 2011 01:48:25
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_Embedded_properties,v 1.4 2010/10/03 18:09:01 jeremy Exp $
---- 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
+--- src/Embedded.properties.orig Tue Nov 1 10:44:35 2011
++++ src/Embedded.properties Tue Nov 15 02:33:40 2011
+@@ -89,7 +89,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=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
++ command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
code.page=0
if PLAT_GTK
Index: editors/scite/patches/patch-src_SciTEGlobal_properties
===================================================================
RCS file: /cvs/ports/editors/scite/patches/patch-src_SciTEGlobal_properties,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_SciTEGlobal_properties
--- editors/scite/patches/patch-src_SciTEGlobal_properties 3 Oct 2010
18:09:01 -0000 1.4
+++ editors/scite/patches/patch-src_SciTEGlobal_properties 15 Nov 2011
01:48:25 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_SciTEGlobal_properties,v 1.4 2010/10/03 18:09:01 jeremy
Exp $
---- 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
+--- src/SciTEGlobal.properties.orig Tue Nov 15 02:37:08 2011
++++ src/SciTEGlobal.properties Tue Nov 15 02:37:24 2011
+@@ -253,7 +253,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=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
++ command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
# Internationalisation
# Japanese input code page 932 and ShiftJIS character set 128
Index: editors/scite/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/scite/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- editors/scite/pkg/PLIST 3 Oct 2010 18:09:01 -0000 1.6
+++ editors/scite/pkg/PLIST 15 Nov 2011 01:48:25 -0000
@@ -47,6 +47,7 @@ share/scite/forth.properties
share/scite/fortran.properties
share/scite/freebasic.properties
share/scite/gap.properties
+share/scite/haskell.properties
share/scite/html.properties
share/scite/inno.properties
share/scite/kix.properties
@@ -58,6 +59,7 @@ share/scite/lua.properties
share/scite/matlab.properties
share/scite/metapost.properties
share/scite/mmixal.properties
+share/scite/modula3.properties
share/scite/nimrod.properties
share/scite/nncrontab.properties
share/scite/nsis.properties
