diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-06 01:37:47 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-06 01:37:47 +0000 |
| commit | 220e97ebb2a711b89490bfed31ad27db8f64291d (patch) | |
| tree | 14abf5c2ff50a2eaf04272a9757ef214337b0a8d /editors/scite/files | |
| parent | 4d0a09d7af804943c3623159e334be235e5b85ba (diff) | |
| download | ports-220e97ebb2a711b89490bfed31ad27db8f64291d.tar.gz ports-220e97ebb2a711b89490bfed31ad27db8f64291d.zip | |
Notes
Diffstat (limited to 'editors/scite/files')
| -rw-r--r-- | editors/scite/files/patch-SciTEGTK.cxx | 13 | ||||
| -rw-r--r-- | editors/scite/files/patch-aa | 31 |
2 files changed, 23 insertions, 21 deletions
diff --git a/editors/scite/files/patch-SciTEGTK.cxx b/editors/scite/files/patch-SciTEGTK.cxx index 7f7d45b0dc13..7452de8ff2bc 100644 --- a/editors/scite/files/patch-SciTEGTK.cxx +++ b/editors/scite/files/patch-SciTEGTK.cxx @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- SciTEGTK.cxx 2002/08/19 16:01:39 1.1 -+++ SciTEGTK.cxx 2002/08/19 16:02:02 -@@ -1882,7 +1882,7 @@ +--- SciTEGTK.cxx.orig Tue Nov 5 17:24:05 2002 ++++ SciTEGTK.cxx Tue Nov 5 17:24:42 2002 +@@ -1910,7 +1910,7 @@ return 0;
}
--void SciTEGTK::AddToPopUp(const char *label, int cmd=0, bool enabled=true) {
-+void SciTEGTK::AddToPopUp(const char *label, int cmd, bool enabled) {
+-void SciTEGTK::AddToPopUp(const char *label, int cmd, bool enabled) {
++void SciTEGTK::AddToPopUp(const char *label, int cmd=0, bool enabled=true) {
SString localised = LocaliseString(label);
localised.insert(0, "/");
GtkItemFactoryEntry itemEntry = {
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa index ac5044b3b747..d179084d9331 100644 --- a/editors/scite/files/patch-aa +++ b/editors/scite/files/patch-aa @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- makefile.orig Mon Feb 11 12:01:37 2002 -+++ makefile Mon Feb 11 12:06:45 2002 +--- makefile.orig Tue Nov 5 17:36:21 2002 ++++ makefile Tue Nov 5 17:39:53 2002 @@ -10,34 +10,34 @@ # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. @@ -36,24 +33,32 @@ $FreeBSD$ -CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) +CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) else --CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS) +-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) endif .cxx.o: - $(CC) `gtk-config --cflags` $(CXXFLAGS) -c $< -o $@ -+ $(CC) $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< -o $@ ++ $(CC) $(shell $(GTK_CONFIG) --cflags) $(shell $(GLIB_CONFIG) --libs gthread) $(CXXFLAGS) -c $< -o $@ all: $(PROG) -@@ -51,8 +51,8 @@ +@@ -45,14 +45,14 @@ + rm -f *.o $(PROG) + + deps: +- $(CC) -MM `gtk-config --cflags` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak ++ $(CC) -MM `$(GTK_CONFIG) --cflags` `$(GLIB_CONFIG) --libs gthread)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak + + # make should be run in ../../scintilla/gtk to compile all the lexers. LEXEROBJS=$(wildcard ../../scintilla/gtk/Lex*.o) - $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o DirectorExtension.o \ --SciTEProps.o $(LEXEROBJS) ../../scintilla/bin/scintilla.a -- $(CC) `gtk-config --libs` -DGTK $^ -o $@ +-$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o DirectorExtension.o \ +-SciTEProps.o Utf8_16.o $(LEXEROBJS) ../../scintilla/bin/scintilla.a +- $(CC) `gtk-config --libs` `glib-config --libs gthread` -DGTK $^ -o $@ ++$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o DirectorExtension.o Utf8_16.o \ +SciTEProps.o # $(LEXEROBJS) ../../scintilla/bin/scintilla.a -+ $(CC) $(shell $(GTK_CONFIG) --libs) -DGTK $^ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers -o $@ ++ $(CC) $(shell $(GTK_CONFIG) --libs) $(shell $(GLIB_CONFIG) --libs gthread) -DGTK $^ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers -o $@ # SciTE-static no longer builds. Kept here in case of later need. SciTE-static: SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o SciTEProps.o \ @@ -63,7 +68,7 @@ $FreeBSD$ install: - install -s $(PROG) $(bindir) - install -d $(SYSCONF_PATH) -- install -D ../src/*.properties $(SYSCONF_PATH) +- install ../src/*.properties $(SYSCONF_PATH) - install ../doc/*.html $(SYSCONF_PATH) - install ../doc/SciTEIco.png $(SYSCONF_PATH) - install ../doc/PrintHi.png $(SYSCONF_PATH) |