summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editors/scite/Makefile2
-rw-r--r--editors/scite/distinfo2
-rw-r--r--editors/scite/files/patch-SciTEGTK.cxx13
-rw-r--r--editors/scite/files/patch-aa31
-rw-r--r--editors/scite/pkg-plist3
-rw-r--r--x11-toolkits/scintilla/Makefile2
-rw-r--r--x11-toolkits/scintilla/distinfo2
-rw-r--r--x11-toolkits/scintilla/files/patch-aa33
8 files changed, 47 insertions, 41 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index c4f30173a0f6..4c6f3d7a0d77 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= scite
-PORTVERSION= 1.44
+PORTVERSION= 1.49
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index a6bca76a65e6..b1cd6a1abc57 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite144.tgz) = 88199f52c4a337a938fff64d0eb470b0
+MD5 (scite149.tgz) = 4a60e1ff31b5f97106a6e2b6be013d92
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)
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 22ef243b9903..a34a4f277aa9 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -18,16 +18,19 @@ share/gnome/scite/SciTERegEx.html
share/gnome/scite/SciTETranslation.html
share/gnome/scite/abbrev.properties
share/gnome/scite/ada.properties
+share/gnome/scite/asm.properties
share/gnome/scite/ave.properties
share/gnome/scite/baan.properties
share/gnome/scite/bullant.properties
share/gnome/scite/conf.properties
share/gnome/scite/cpp.properties
share/gnome/scite/eiffel.properties
+share/gnome/scite/fortran.properties
share/gnome/scite/html.properties
share/gnome/scite/latex.properties
share/gnome/scite/lisp.properties
share/gnome/scite/lua.properties
+share/gnome/scite/matlab.properties
share/gnome/scite/nncrontab.properties
share/gnome/scite/others.properties
share/gnome/scite/pascal.properties
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 8149eae5cca8..877cf21daacd 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= scintilla
-PORTVERSION= 1.44
+PORTVERSION= 1.49
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index a6bca76a65e6..b1cd6a1abc57 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite144.tgz) = 88199f52c4a337a938fff64d0eb470b0
+MD5 (scite149.tgz) = 4a60e1ff31b5f97106a6e2b6be013d92
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index e371d87add73..7911f87058f2 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,10 +1,7 @@
-
-$FreeBSD$
-
---- makefile.orig Fri Jan 25 02:52:32 2002
-+++ makefile Mon Feb 11 11:40:38 2002
-@@ -5,8 +5,8 @@
- # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
+--- makefile.orig Tue Oct 8 03:29:40 2002
++++ makefile Tue Nov 5 15:40:13 2002
+@@ -6,8 +6,8 @@
+ # To build for GTK+ 2, define GTK2 on the make command line.
.SUFFIXES: .cxx .o .h .a
-CC = g++
@@ -14,7 +11,7 @@ $FreeBSD$
RANLIB = touch
ifeq ($(OSTYPE),darwin)
-@@ -15,7 +15,8 @@
+@@ -16,7 +16,8 @@
RANLIB = ranlib
endif
@@ -24,24 +21,28 @@ $FreeBSD$
vpath %.h ../src ../include
vpath %.cxx ../src
-@@ -24,13 +25,13 @@
+@@ -25,9 +26,9 @@
CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS)
ifdef DEBUG
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
else
--CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
+-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
endif
+ ifdef GTK2
+@@ -37,7 +38,7 @@
+ endif
+
.cxx.o:
-- $(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
+- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+ $(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
- LEXOBJS=LexAda.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \
- LexCrontab.o LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexOthers.o \
-@@ -38,7 +39,7 @@
+ #++Autogenerated -- run src/LexGen.py to regenerate
+ #**LEXOBJS=\\\n\(\*.o \)
+@@ -49,7 +50,7 @@
# The LEXOBJS have to be treated specially as the functions in them are not called from external code
@@ -50,10 +51,10 @@ $FreeBSD$
clean:
rm -f *.o $(COMPLIB)
-@@ -50,8 +51,10 @@
+@@ -61,8 +62,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
+ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o
- $(AR) rc $@ $^
- $(RANLIB) $@
+ $(AR) -o $@ $^
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 20:07:06 +0000