Update to 1.50.

This commit is contained in:
Maxim Sobolev 2003-02-06 09:04:20 +00:00
parent d99af149f8
commit efaf7def87
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=74957
8 changed files with 21 additions and 28 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= scite
PORTVERSION= 1.49
PORTVERSION= 1.50
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/

View File

@ -1 +1 @@
MD5 (scite149.tgz) = 4a60e1ff31b5f97106a6e2b6be013d92
MD5 (scite150.tgz) = ae1c5936acca2040dd09b42d266f1294

View File

@ -1,11 +0,0 @@
--- 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, bool enabled) {
+void SciTEGTK::AddToPopUp(const char *label, int cmd=0, bool enabled=true) {
SString localised = LocaliseString(label);
localised.insert(0, "/");
GtkItemFactoryEntry itemEntry = {

View File

@ -1,5 +1,8 @@
--- makefile.orig Tue Nov 5 17:36:21 2002
+++ makefile Tue Nov 5 17:39:53 2002
$FreeBSD$
--- makefile.orig Thu Feb 6 10:52:36 2003
+++ makefile Thu Feb 6 10:56:10 2003
@@ -10,34 +10,34 @@
# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
@ -39,7 +42,7 @@
.cxx.o:
- $(CC) `gtk-config --cflags` $(CXXFLAGS) -c $< -o $@
+ $(CC) $(shell $(GTK_CONFIG) --cflags) $(shell $(GLIB_CONFIG) --libs gthread) $(CXXFLAGS) -c $< -o $@
+ $(CC) $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< -o $@
all: $(PROG)
@ -48,7 +51,7 @@
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
+ $(CC) -MM `$(GTK_CONFIG) --cflags` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
# make should be run in ../../scintilla/gtk to compile all the lexers.
LEXEROBJS=$(wildcard ../../scintilla/gtk/Lex*.o)

View File

@ -24,6 +24,7 @@ share/gnome/scite/baan.properties
share/gnome/scite/bullant.properties
share/gnome/scite/conf.properties
share/gnome/scite/cpp.properties
share/gnome/scite/css.properties
share/gnome/scite/eiffel.properties
share/gnome/scite/fortran.properties
share/gnome/scite/html.properties

View File

@ -6,7 +6,7 @@
#
PORTNAME= scintilla
PORTVERSION= 1.49
PORTVERSION= 1.50
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
@ -25,9 +25,6 @@ USE_GNOME= gtk12
INSTALLS_SHLIB= yes
MAKEFILE= makefile
post-extract:
@${PERL} -pi -e 's|\x0d||' ${WRKSRC}/../include/*.h
do-install:
${MKDIR} ${PREFIX}/include/scintilla
${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla

View File

@ -1 +1 @@
MD5 (scite149.tgz) = 4a60e1ff31b5f97106a6e2b6be013d92
MD5 (scite150.tgz) = ae1c5936acca2040dd09b42d266f1294

View File

@ -1,5 +1,8 @@
--- makefile.orig Tue Oct 8 03:29:40 2002
+++ makefile Tue Nov 5 15:40:13 2002
$FreeBSD$
--- makefile.orig Fri Jan 10 13:35:52 2003
+++ makefile Thu Feb 6 10:48:09 2003
@@ -6,8 +6,8 @@
# To build for GTK+ 2, define GTK2 on the make command line.
@ -42,7 +45,7 @@
#++Autogenerated -- run src/LexGen.py to regenerate
#**LEXOBJS=\\\n\(\*.o \)
@@ -49,7 +50,7 @@
@@ -50,7 +51,7 @@
# The LEXOBJS have to be treated specially as the functions in them are not called from external code
@ -51,15 +54,15 @@
clean:
rm -f *.o $(COMPLIB)
@@ -61,8 +62,10 @@
@@ -62,8 +63,10 @@
ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \
KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o
RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
- $(AR) rc $@ $^
- $(RANLIB) $@
+ $(AR) -o $@ $^
+
+$(LEXRLIB): $(LEXOBJS)
+ $(LEXRLIB): $(LEXOBJS)
+ $(AR) -o $@ $^
# Automatically generate header dependencies with "make deps"