summaryrefslogtreecommitdiffstats
path: root/x11-toolkits/scintilla
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2002-11-06 01:37:47 +0000
committermarcus <marcus@FreeBSD.org>2002-11-06 01:37:47 +0000
commite30c57a2542b848007f11744bee7572aff660f75 (patch)
tree3124728d17dd4d27172909d701a70215b051213d /x11-toolkits/scintilla
parente33a3e0c67b64721187a8fe6db420a3fb75f43eb (diff)
downloadFreeBSD-ports-e30c57a2542b848007f11744bee7572aff660f75.zip
FreeBSD-ports-e30c57a2542b848007f11744bee7572aff660f75.tar.gz
Update to 1.49.
Reviewed by: sobomax Approved by: sobomax (scite update)
Diffstat (limited to 'x11-toolkits/scintilla')
-rw-r--r--x11-toolkits/scintilla/Makefile2
-rw-r--r--x11-toolkits/scintilla/distinfo2
-rw-r--r--x11-toolkits/scintilla/files/patch-aa33
3 files changed, 19 insertions, 18 deletions
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 8149eae..877cf21 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 a6bca76..b1cd6a1 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 e371d87..7911f87 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 $@ $^
OpenPOWER on IntegriCloud