diff options
| author | Dennis Herrmann <dhn@FreeBSD.org> | 2011-07-04 18:25:04 +0000 |
|---|---|---|
| committer | Dennis Herrmann <dhn@FreeBSD.org> | 2011-07-04 18:25:04 +0000 |
| commit | 770bd0971825a2ea30b106a143b25bdf0febcb3e (patch) | |
| tree | 3e365985c94707764ed94afdcb5c31c3860c320e /x11-toolkits/scintilla | |
| parent | e7abcc4e4ee262b2727f97644e3f430fe30c0063 (diff) | |
| download | ports-770bd0971825a2ea30b106a143b25bdf0febcb3e.tar.gz ports-770bd0971825a2ea30b106a143b25bdf0febcb3e.zip | |
Notes
Diffstat (limited to 'x11-toolkits/scintilla')
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 20 |
3 files changed, 14 insertions, 12 deletions
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index d035fdb2c395..93a6c7854dcf 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $ PORTNAME= scintilla -PORTVERSION= 2.25 +PORTVERSION= 2.27 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo index 22d24ccaf674..679cea05e63c 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite225.tgz) = e9f1c7d5909fca359cb2993eb82a07b3323d53bcd0d4ba1e8ff181a8d471061f -SIZE (scite225.tgz) = 1843570 +SHA256 (scite227.tgz) = 9bf6e3515022cc12a3b24b158f54ae1a4730f104b65a6fcdb997f4f7a84b2c0c +SIZE (scite227.tgz) = 1883989 diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 9b3bb463809f..953d0a27599b 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -1,5 +1,5 @@ ---- makefile.orig 2011-03-17 18:41:24.000000000 -0400 -+++ makefile 2011-05-01 19:57:17.000000000 -0400 +--- makefile.orig 2011-05-02 05:11:17.000000000 -0400 ++++ makefile 2011-07-03 21:09:17.000000000 -0400 @@ -7,14 +7,14 @@ # Also works with ming32-make on Windows. @@ -22,8 +22,8 @@ +AR = $(CXX) -shared RANLIB = touch - # Environment variable windir always defined on Win32 -@@ -30,7 +30,8 @@ + ifdef GTK3 +@@ -36,7 +36,8 @@ COMPLIB=..\bin\scintilla.a else DEL = rm -f @@ -33,7 +33,7 @@ endif vpath %.h ../src ../include ../lexlib -@@ -47,22 +48,22 @@ +@@ -55,24 +56,24 @@ endif ifdef DEBUG @@ -44,7 +44,9 @@ +CXXFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif --CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) + CFLAGS:=$(CXXFLAGS) + +-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) +CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0) MARSHALLER=scintilla-marshal.o @@ -52,8 +54,8 @@ - $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< + $(CC) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -c $< .c.o: -- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $< -+ $(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $< +- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $< ++ $(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CFLAGS) -w -c $< LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) @@ -62,7 +64,7 @@ clean: $(DEL) *.o $(COMPLIB) -@@ -75,9 +76,11 @@ +@@ -85,9 +86,11 @@ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ |