cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fairly simple version update, lots of new features, see

Browse Source 
http://www.scintilla.org/ScintillaHistory.html.

OK landry@
This commit is contained in:
jeremy 2010-10-03 18:09:01 +00:00
parent 8f0919645b
commit 8e05e9c87a
12 changed files with 100 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editors/scintilla/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.11 2008/03/22 11:44:42 steven Exp $ # $OpenBSD: Makefile,v 1.12 2010/10/03 18:09:01 jeremy Exp $
COMMENT= source code editing component for GTK+ COMMENT= source code editing component for GTK+
VERSION= 1.76 VERSION= 2.21
DISTNAME= scintilla${VERSION:S/.//} DISTNAME= scintilla${VERSION:S/.//}
PKGNAME= scintilla-${VERSION} PKGNAME= scintilla-${VERSION}
CATEGORIES= editors x11 CATEGORIES= editors x11
SHARED_LIBS= scintilla 6.0 \ SHARED_LIBS= scintilla 7.0 \
scintilla_lexers 6.0 scintilla_lexers 7.0
HOMEPAGE= http://www.scintilla.org/ HOMEPAGE= http://www.scintilla.org/
MAINTAINER= Jeremy Evans <openbsd@jeremyevans.net> MAINTAINER= Jeremy Evans <jeremy@openbsd.org>
# old Python license # old Python license
PERMIT_PACKAGE_CDROM= may not sell PERMIT_PACKAGE_CDROM= may not sell
@ -30,7 +30,8 @@ MAKE_FILE= makefile
MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' \ MAKE_ENV= CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' \
NO_SHARED_LIBS='${NO_SHARED_LIBS:L}' 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} .for n v in ${SHARED_LIBS}
MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION} MAKE_ENV+= LIB$n_VERSION=${LIB$n_VERSION}

10
editors/scintilla/distinfo
View File

@ -1,5 +1,5 @@
MD5 (scintilla176.tgz) = mnHizOVIRZcuGVWT+csb8g== MD5 (scintilla221.tgz) = l8h5/AgjR+jHY2tOZZ35Sw==
RMD160 (scintilla176.tgz) = 5Nv5Ak5OGEAUHd2gB2Y5qG1UeO0= RMD160 (scintilla221.tgz) = bwGEWdn+Xfjxwq/YdNe7g3Ym/PU=
SHA1 (scintilla176.tgz) = dfBFdiYK1BJZbS4tq8nafE4lW6Q= SHA1 (scintilla221.tgz) = t5ELBeQ4ZoiZXvVw0kDYgEickVU=
SHA256 (scintilla176.tgz) = lsFfalDyUOU8G/Xlxoz+g4JDFUcSOmOdaVLpL0FjMJo= SHA256 (scintilla221.tgz) = A1wKtWrFSgwvnUX27vIXb3V6nPn/o2KakkCnQC1LUQg=
SIZE (scintilla176.tgz) = 766081 SIZE (scintilla221.tgz) = 999005

59
editors/scintilla/patches/patch-gtk_makefile
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42 steven Exp $ $OpenBSD: patch-gtk_makefile,v 1.8 2010/10/03 18:09:01 jeremy Exp $
--- gtk/makefile.orig Fri Jan 18 23:18:13 2008 --- gtk/makefile.orig Tue Aug 17 20:03:30 2010
+++ gtk/makefile Sat Mar 22 12:30:08 2008 +++ gtk/makefile Sat Oct 2 20:04:57 2010
@@ -7,7 +7,7 @@ @@ -6,7 +6,7 @@
# To force GTK+ 2 build, define GTK2 on the make command line. # Builds for GTK+ 2 and no longer supports GTK+ 1.
# To force GTK+ 1 build, define GTK1 on the make command line. # Also works with ming32-make on Windows.
-.SUFFIXES: .cxx .c .o .h .a -.SUFFIXES: .cxx .c .o .h .a
+.SUFFIXES: .cxx .c .o .h .a .so +.SUFFIXES: .cxx .c .o .h .a .so
CC = g++ ifdef CLANG
CCOMP = gcc CC = clang
AR = ar CCOMP = clang
@@ -17,13 +17,16 @@ ifeq ($(shell uname),Darwin) @@ -23,14 +23,17 @@ RANLIB = ranlib
RANLIB = ranlib endif
endif endif
-COMPLIB=../bin/scintilla.a -COMPLIB=../bin/scintilla.a
@ -20,17 +20,18 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42 steven Exp $
+SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION} +SHAREDLIB=../bin/libscintilla.so.${LIBscintilla_VERSION}
+SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION} +SHAREDLEXER=../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION}
vpath %.h ../src ../include vpath %.h ../src ../include ../lexlib
vpath %.cxx ../src vpath %.cxx ../src ../lexlib ../lexers
-INCLUDEDIRS=-I ../include -I ../src -INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -Os -DGTK -DSCI_LEXER $(INCLUDEDIRS) +INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -I /usr/local/include
+INCLUDEDIRS=-I ../include -I ../src -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 -pedantic -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) -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 ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE THREADFLAGS=-DG_THREADS_IMPL_NONE
@@ -34,7 +37,7 @@ endif @@ -41,35 +44,70 @@ endif
ifdef DEBUG ifdef DEBUG
CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else else
@ -38,9 +39,8 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42 steven Exp $
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS) +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif endif
# If explicit setting of GTK1 or GTK2 then use that else look for CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
@@ -56,9 +59,13 @@ endif MARSHALLER=scintilla-marshal.o
endif
.cxx.o: .cxx.o:
- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< - $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
@ -52,11 +52,7 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42 steven Exp $
+.c.so: +.c.so:
+ $(CCOMP) -fPIC $(CONFIGFLAGS) $(CXXFLAGS) -w -o $@ -c $< + $(CCOMP) -fPIC $(CONFIGFLAGS) $(CXXFLAGS) -w -o $@ -c $<
#++Autogenerated -- run src/LexGen.py to regenerate LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
#**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
-all: $(COMPLIB) -all: $(COMPLIB)
+ifeq (${NO_SHARED_LIBS},"yes") +ifeq (${NO_SHARED_LIBS},"yes")
@ -87,18 +83,19 @@ $OpenBSD: patch-gtk_makefile,v 1.7 2008/03/22 11:44:42 steven Exp $
- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak - $(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 + $(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 \ -$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
+LIBOBJS = DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \ +LIBOBJS = Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
CharClassify.o Decoration.o Document.o CallTip.o \ CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o \
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.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 \ 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) $(MARSHALLER) $(LEXOBJS)
+ +
+$(COMPLIB): $(LIBOBJS) +$(COMPLIB): $(LIBOBJS)
$(AR) rc $@ $^ $(AR) rc $@ $^
$(RANLIB) $@ $(RANLIB) $@
+ +
+
+$(LEXERLIB): $(LEXOBJS) +$(LEXERLIB): $(LEXOBJS)
+ $(AR) rc $@ $^ + $(AR) rc $@ $^
+ $(RANLIB) $@ + $(RANLIB) $@

23
editors/scintilla/patches/patch-src_KeyWords_cxx
View File

@ -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;
}

8
editors/scintilla/pkg/PLIST
View File

@ -1,14 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:01:07 espie Exp $ @comment $OpenBSD: PLIST,v 1.3 2010/10/03 18:09:01 jeremy Exp $
include/scintilla/ include/scintilla/
include/scintilla/Accessor.h include/scintilla/ILexer.h
include/scintilla/KeyWords.h
include/scintilla/Platform.h include/scintilla/Platform.h
include/scintilla/PropSet.h
include/scintilla/SString.h
include/scintilla/SciLexer.h include/scintilla/SciLexer.h
include/scintilla/Scintilla.h include/scintilla/Scintilla.h
include/scintilla/ScintillaWidget.h include/scintilla/ScintillaWidget.h
include/scintilla/WindowAccessor.h
lib/libscintilla.a lib/libscintilla.a
lib/libscintilla_lexers.a lib/libscintilla_lexers.a
%%SHARED%% %%SHARED%%

16
editors/scite/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.14 2010/09/30 07:21:18 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.15 2010/10/03 18:09:01 jeremy Exp $
COMMENT= flexible and small GTK+ editor COMMENT= flexible and small GTK+ editor
VERSION= 1.76 VERSION= 2.21
DISTNAME= scite${VERSION:S/.//} DISTNAME= scite${VERSION:S/.//}
PKGNAME= scite-${VERSION} PKGNAME= scite-${VERSION}
CATEGORIES= editors x11 CATEGORIES= editors x11
REVISION= 3
HOMEPAGE= http://www.scintilla.org/SciTE.html HOMEPAGE= http://www.scintilla.org/SciTE.html
MAINTAINER= Jeremy Evans <openbsd@jeremyevans.net> MAINTAINER= Jeremy Evans <jeremy@openbsd.org>
# old Python license # old Python license
PERMIT_PACKAGE_CDROM= may not sell PERMIT_PACKAGE_CDROM= may not sell
@ -23,15 +21,17 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig 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 += 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 += 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/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
EXTRACT_SUFX= .tgz EXTRACT_SUFX= .tgz
MODULES= devel/gettext MODULES= devel/gettext
LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \ LIB_DEPENDS= ::x11/gtk+2 \
scintilla.>=6,scintilla_lexers.>=6::editors/scintilla ::editors/scintilla
USE_GMAKE= Yes USE_GMAKE= Yes
USE_X11= Yes USE_X11= Yes

10
editors/scite/distinfo
View File

@ -1,5 +1,5 @@
MD5 (scite176.tgz) = wzRhZDxiyAQgN23jcSUJKw== MD5 (scite221.tgz) = ayka+nC9/9k/eM32AhueSA==
RMD160 (scite176.tgz) = PoK7bEJarqqd2TLheeg34fzOnXE= RMD160 (scite221.tgz) = lik0kx9LXoISoTRLbLlJTgxo1gw=
SHA1 (scite176.tgz) = Ru9sfV8xLtaMrIQx6rF++g5hjV4= SHA1 (scite221.tgz) = WAiHswjguExvcJr/qXJXLtqldh8=
SHA256 (scite176.tgz) = zqH5Ms6jPpPwGKxpKfHRjt1s/o/crHOwXaTnIZhyhaA= SHA256 (scite221.tgz) = uoZSG+PqsctVVy1bcX5HF6PuxW742dYsDc3e0jnpz6c=
SIZE (scite176.tgz) = 1497197 SIZE (scite221.tgz) = 1920326

62
editors/scite/patches/patch-gtk_makefile
View File

@ -1,18 +1,12 @@
$OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42 steven Exp $ $OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
--- gtk/makefile.orig Fri Nov 30 16:27:26 2007 --- gtk/makefile.orig Sun Aug 29 05:55:22 2010
+++ gtk/makefile Fri Mar 21 15:42:27 2008 +++ gtk/makefile Sat Oct 2 19:46:19 2010
@@ -26,26 +26,26 @@ ifdef GTK2 @@ -18,20 +18,21 @@ AR = ar
CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0) CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0) CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
CONFIGTHREADS= 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 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 ifndef prefix
ifdef gnomeprefix ifdef gnomeprefix
prefix=$(gnomeprefix) prefix=$(gnomeprefix)
@ -32,14 +26,15 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42 steven Exp $
PROG = ../bin/SciTE 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 vpath %.cxx ../src
#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src -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 +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 ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@ -56,16 +51,16 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42 steven Exp $
LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ 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 \ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
ltable.o ltm.o lundump.o lvm.o lzio.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 ../../scintilla/include -I ../src -I../lua/include
+INCLUDEDIRS+=-I../lua/include +INCLUDEDIRS+=-I../lua/include
$(LUA_CORE_OBJS): ../lua/src/*.c $(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 $(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)
+CXXFLAGS+=$(CXXTFLAGS) +CXXFLAGS+=$(CXXTFLAGS)
else else
@ -74,7 +69,7 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42 steven Exp $
endif endif
ifeq ($(shell uname), Darwin) ifeq ($(shell uname), Darwin)
@@ -89,21 +91,18 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix @@ -75,22 +78,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
endif endif
.cxx.o: .cxx.o:
@ -91,17 +86,18 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42 steven Exp $
-# make should be run in ../../scintilla/gtk to compile all the lexers. -# make should be run in ../../scintilla/gtk to compile all the lexers.
-COMPLIB=../../scintilla/bin/scintilla.a -COMPLIB=../../scintilla/bin/scintilla.a
- -
$(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
-PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \ -FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
- JobQueue.o GTKMutex.o $(COMPLIB) $(LUA_OBJS) -PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) + FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \ + PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
+ JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
+ $(CXX) $(CONFIGTHREADS) $(LIBS) -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) - $(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" # Automatically generate header dependencies with "make deps"
include deps.mak 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 # This is OK - just means no SciTE in the Gnome Applications menu
# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties # Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
install: install:
@ -110,7 +106,7 @@ $OpenBSD: patch-gtk_makefile,v 1.4 2008/03/22 11:44:42 steven Exp $
- $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir) - $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
+ $(INSTALL) -m 755 $(PROG) $(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 ../src/*.properties $(SYSCONF_PATH)
+ $(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png $(DOC_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 steven Exp $
- done - done
- -
ifdef gnomeprefix ifdef gnomeprefix
ifdef GTK2
$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop $(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 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ $(INSTALL) -m 444 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png + $(INSTALL) -m 444 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
endif endif

17
editors/scite/patches/patch-src_Embedded_properties
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Embedded_properties,v 1.3 2008/03/22 11:44:42 steven Exp $ $OpenBSD: patch-src_Embedded_properties,v 1.4 2010/10/03 18:09:01 jeremy Exp $
--- src/Embedded.properties.orig Fri Jun 8 17:42:52 2007 --- src/Embedded.properties.orig Fri Jul 23 03:46:19 2010
+++ src/Embedded.properties Fri Mar 21 15:42:32 2008 +++ src/Embedded.properties Sat Oct 2 19:38:57 2010
@@ -79,7 +79,7 @@ if PLAT_WIN @@ -85,7 +85,7 @@ if PLAT_WIN
command.scite.help.subsystem=2 command.scite.help.subsystem=2
if PLAT_GTK if PLAT_GTK
command.print.*=a2ps "$(FileNameExt)" command.print.*=a2ps "$(FileNameExt)"
@ -9,13 +9,4 @@ $OpenBSD: patch-src_Embedded_properties,v 1.3 2008/03/22 11:44:42 steven Exp $
+ command.scite.help=firefox "file://__DOCDIR__/SciTEDoc.html" + command.scite.help=firefox "file://__DOCDIR__/SciTEDoc.html"
code.page=0 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 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)"

8
editors/scite/patches/patch-src_SciTEGlobal_properties
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_SciTEGlobal_properties,v 1.3 2008/03/22 11:44:42 steven Exp $ $OpenBSD: patch-src_SciTEGlobal_properties,v 1.4 2010/10/03 18:09:01 jeremy Exp $
--- src/SciTEGlobal.properties.orig Wed Mar 5 16:31:07 2008 --- src/SciTEGlobal.properties.orig Fri Jul 30 19:56:35 2010
+++ src/SciTEGlobal.properties Fri Mar 21 15:42:32 2008 +++ src/SciTEGlobal.properties Sat Oct 2 19:38:57 2010
@@ -220,7 +220,7 @@ if PLAT_WIN @@ -239,7 +239,7 @@ if PLAT_WIN
command.scite.help.subsystem=2 command.scite.help.subsystem=2
if PLAT_GTK if PLAT_GTK
command.print.*=a2ps "$(FileNameExt)" command.print.*=a2ps "$(FileNameExt)"

12
editors/scite/patches/patch-src_html_properties
View File

@ -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)"

12
editors/scite/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.5 2008/03/22 11:44:42 steven Exp $ @comment $OpenBSD: PLIST,v 1.6 2010/10/03 18:09:01 jeremy Exp $
bin/SciTE @bin bin/SciTE
share/doc/scite/ share/doc/scite/
share/doc/scite/CommandValues.html share/doc/scite/CommandValues.html
share/doc/scite/PrintHi.png share/doc/scite/PrintHi.png
@ -16,6 +16,7 @@ share/doc/scite/SciTEImage.html
share/doc/scite/SciTELexer.html share/doc/scite/SciTELexer.html
share/doc/scite/SciTELua.html share/doc/scite/SciTELua.html
share/doc/scite/SciTERegEx.html share/doc/scite/SciTERegEx.html
share/doc/scite/ScriptLexer.html
share/scite/ share/scite/
share/scite/Embedded.properties share/scite/Embedded.properties
share/scite/SciTE.properties share/scite/SciTE.properties
@ -32,6 +33,7 @@ share/scite/blitzbasic.properties
share/scite/bullant.properties share/scite/bullant.properties
share/scite/caml.properties share/scite/caml.properties
share/scite/cmake.properties share/scite/cmake.properties
share/scite/cobol.properties
share/scite/conf.properties share/scite/conf.properties
share/scite/cpp.properties share/scite/cpp.properties
share/scite/csound.properties share/scite/csound.properties
@ -56,6 +58,7 @@ share/scite/lua.properties
share/scite/matlab.properties share/scite/matlab.properties
share/scite/metapost.properties share/scite/metapost.properties
share/scite/mmixal.properties share/scite/mmixal.properties
share/scite/nimrod.properties
share/scite/nncrontab.properties share/scite/nncrontab.properties
share/scite/nsis.properties share/scite/nsis.properties
share/scite/opal.properties share/scite/opal.properties
@ -63,6 +66,7 @@ share/scite/others.properties
share/scite/pascal.properties share/scite/pascal.properties
share/scite/perl.properties share/scite/perl.properties
share/scite/pov.properties share/scite/pov.properties
share/scite/powerpro.properties
share/scite/powershell.properties share/scite/powershell.properties
share/scite/ps.properties share/scite/ps.properties
share/scite/purebasic.properties share/scite/purebasic.properties
@ -72,11 +76,15 @@ share/scite/rebol.properties
share/scite/ruby.properties share/scite/ruby.properties
share/scite/scriptol.properties share/scite/scriptol.properties
share/scite/smalltalk.properties share/scite/smalltalk.properties
share/scite/sorcins.properties
share/scite/specman.properties share/scite/specman.properties
share/scite/spice.properties share/scite/spice.properties
share/scite/sql.properties share/scite/sql.properties
share/scite/tacl.properties
share/scite/tal.properties
share/scite/tcl.properties share/scite/tcl.properties
share/scite/tex.properties share/scite/tex.properties
share/scite/txt2tags.properties
share/scite/vb.properties share/scite/vb.properties
share/scite/verilog.properties share/scite/verilog.properties
share/scite/vhdl.properties share/scite/vhdl.properties