aboutsummaryrefslogtreecommitdiffstats
path: root/editors/scite
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-01-30 18:07:10 +0800
committersobomax <sobomax@FreeBSD.org>2001-01-30 18:07:10 +0800
commit6c4dd9b2442bd9543f144733de5bbb5fc2ed201b (patch)
tree6375e57f5c3ae292149e128c337380552d589abe /editors/scite
parent99eec8809a3821407dc0935416a5ec841194febd (diff)
downloadfreebsd-ports-gnome-6c4dd9b2442bd9543f144733de5bbb5fc2ed201b.tar.gz
freebsd-ports-gnome-6c4dd9b2442bd9543f144733de5bbb5fc2ed201b.tar.zst
freebsd-ports-gnome-6c4dd9b2442bd9543f144733de5bbb5fc2ed201b.zip
Update to 1.35.
Diffstat (limited to 'editors/scite')
-rw-r--r--editors/scite/Makefile2
-rw-r--r--editors/scite/distinfo2
-rw-r--r--editors/scite/files/patch-aa24
3 files changed, 17 insertions, 11 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 3fb1f8047c06..57dd8342967e 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= scite
-PORTVERSION= 1.34
+PORTVERSION= 1.35
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 93ccc6c35ac4..baf2f3ad7d12 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1 +1 @@
-MD5 (scite134.tgz) = e23ddd779fef4d715d066611027beaba
+MD5 (scite135.tgz) = fd5ec4ad8893d1d545aed0aea908a89f
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index 771f0bf574ad..93e97f1594a4 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,9 +1,9 @@
$FreeBSD$
---- makefile.orig Sun Nov 12 09:51:48 2000
-+++ makefile Wed Jan 10 15:11:52 2001
-@@ -10,27 +10,27 @@
+--- makefile.orig Tue Jan 30 02:53:22 2001
++++ makefile Tue Jan 30 11:24:28 2001
+@@ -10,37 +10,38 @@
# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
# "h@h@" is printed here when gnome-config unavailable. Seems harmless.
@@ -32,31 +32,37 @@ $FreeBSD$
#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
+-CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(SINGLEINSTANCE) -W -Wall
+INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
- CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(SINGLEINSTANCE) -W -Wall
++CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" \
++ $(SINGLEINSTANCE) -W -Wall $(shell $(GTK_CONFIG) --cflags)
ifdef DEBUG
-@@ -40,7 +40,7 @@
+-CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
++CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS)
+ else
+-CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
++CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
endif
.cxx.o:
- $(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
-+ $(CC) `$(GTK_CONFIG) --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
++ $(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
all: $(PROG)
-@@ -57,8 +57,8 @@
+@@ -57,8 +58,8 @@
../../scintilla/gtk/LexVB.o
$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
-SciTEProps.o ../../scintilla/bin/scintilla.a $(LEXEROBJS)
- $(CC) `gtk-config --libs` -DGTK $^ -o $@
+SciTEProps.o # ../../scintilla/bin/scintilla.a $(LEXEROBJS)
-+ $(CC) `$(GTK_CONFIG) --libs` -DGTK $^ -o $@ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers
++ $(CC) $(shell $(GTK_CONFIG) --libs) -DGTK $^ -o $@ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers
# 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 \
-@@ -85,12 +85,12 @@
+@@ -85,12 +86,12 @@
# This is OK - just means no SciTE in the Gnome Applications menu
# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
install: