diff options
| -rw-r--r-- | editors/scite/Makefile | 4 | ||||
| -rw-r--r-- | editors/scite/distinfo | 6 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/distinfo | 6 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-makefile | 20 |
5 files changed, 21 insertions, 19 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile index 5cd72b9e6f6a..3fe5a227a823 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.6.5 +PORTVERSION= 3.6.6 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DOCS WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USES= compiler:c++11-lib desktop-file-utils gmake pkgconfig tar:tgz -USE_GNOME= gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk20 MAKEFILE= makefile PORTDATA= *.properties diff --git a/editors/scite/distinfo b/editors/scite/distinfo index 7ac1e7327ed3..5f80697c0717 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463151691 -SHA256 (scite365.tgz) = dde62ebebbd4c36afd81ab0e745ff04839f4cfc911496f2d0463aade1374b9d1 -SIZE (scite365.tgz) = 2391190 +TIMESTAMP = 1464048149 +SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa +SIZE (scite366.tgz) = 2371062 diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index dab6cb9b8c1e..7f5b7fb7c9be 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.6.5 +PORTVERSION= 3.6.6 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} @@ -17,7 +17,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept WRKSRC= ${WRKDIR}/${PORTNAME}/gtk -USES= gmake iconv pkgconfig tar:tgz +USES= compiler:c++11-lib gmake iconv pkgconfig tar:tgz MAKEFILE= makefile USE_LDCONFIG= yes USE_GNOME= gtk20 diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo index d08485816a86..5f80697c0717 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463151644 -SHA256 (scite365.tgz) = dde62ebebbd4c36afd81ab0e745ff04839f4cfc911496f2d0463aade1374b9d1 -SIZE (scite365.tgz) = 2391190 +TIMESTAMP = 1464048149 +SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa +SIZE (scite366.tgz) = 2371062 diff --git a/x11-toolkits/scintilla/files/patch-makefile b/x11-toolkits/scintilla/files/patch-makefile index 45c625340a85..fe0d1ca27461 100644 --- a/x11-toolkits/scintilla/files/patch-makefile +++ b/x11-toolkits/scintilla/files/patch-makefile @@ -1,9 +1,9 @@ ---- makefile.orig 2014-11-27 20:47:24 UTC +--- makefile.orig 2016-05-17 23:50:39 UTC +++ makefile @@ -7,14 +7,6 @@ # Also works with ming32-make on Windows. - .SUFFIXES: .cxx .c .o .h .a + .SUFFIXES: .cxx .c .o .h .a .list -ifdef CLANG -CXX = clang++ -Wno-deprecated-register -CC = clang @@ -15,7 +15,7 @@ RANLIB = touch ifdef GTK3 -@@ -36,7 +28,8 @@ +@@ -42,7 +34,8 @@ DEL = del /q COMPLIB=..\bin\scintilla.a else DEL = rm -f @@ -25,23 +25,25 @@ endif vpath %.h ../src ../include ../lexlib -@@ -77,8 +70,7 @@ +@@ -74,7 +67,6 @@ else CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif -CFLAGS:=$(CTFLAGS) --CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS) -+CXXTFLAGS:=$(CTFLAGS) $(REFLAGS) + CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) - MARSHALLER=scintilla-marshal.o -@@ -77,11 +69,11 @@ +@@ -83,7 +75,7 @@ MARSHALLER=scintilla-marshal.o .cxx.o: $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $< .c.o: - $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $< + $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $< + GLIB_GENMARSHAL = glib-genmarshal + GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal +@@ -95,7 +87,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil + LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) -all: $(COMPLIB) @@ -49,7 +51,7 @@ clean: $(DEL) *.o $(COMPLIB) *.plist -@@ -98,9 +90,11 @@ +@@ -112,9 +104,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le PropSetSimple.o PlatGTK.o \ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ |