diff --git a/editors/scite/Makefile b/editors/scite/Makefile index d6be91364af8..9241fa10a4d0 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -1,55 +1,55 @@ # New ports collection makefile for: scite # Date created: 27 November 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= scite -PORTVERSION= 2.27 +PORTVERSION= 2.28 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} EXTRACT_SUFX= .tgz MAINTAINER= cyberbotx@cyberbotx.com COMMENT= A full-featured SCIntilla based Text Editor for GTK/GNOME LIB_DEPENDS= scintilla.2:${PORTSDIR}/x11-toolkits/scintilla RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USE_GMAKE= yes USE_GNOME= gtk20 MAKEFILE= makefile MAKE_JOBS_SAFE= yes MAN1= scite.1 post-patch: @${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g ; \ s| -Os||g' ${WRKSRC}/makefile .if defined(WITH_FULL_BUFFER_MENU) @${REINPLACE_CMD} -e 's|30, "/Buffers|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers|g' ${WRKSRC}/SciTEGTK.cxx .endif @${REINPLACE_CMD} -e 's|netscape "file://$$(SciteDefaultHome)|xdg-open "file://${DOCSDIR}|' \ ${WRKSRC}/../src/SciTEGlobal.properties do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${MANPREFIX}/man/man1 @${MKDIR} ${PREFIX}/share/applications @${MKDIR} ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/pixmaps @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DOCSDIR} .endif .include diff --git a/editors/scite/distinfo b/editors/scite/distinfo index 679cea05e63c..719985ebb35d 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite227.tgz) = 9bf6e3515022cc12a3b24b158f54ae1a4730f104b65a6fcdb997f4f7a84b2c0c -SIZE (scite227.tgz) = 1883989 +SHA256 (scite228.tgz) = a4fa35a2babdfdc25d41474ea8133e6f1fbffaf411ebfc260740e728505acaf7 +SIZE (scite228.tgz) = 1875473 diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa index e4f3aab38b5f..ae7318997dc8 100644 --- a/editors/scite/files/patch-aa +++ b/editors/scite/files/patch-aa @@ -1,61 +1,44 @@ ---- makefile.orig 2011-06-13 20:55:05.000000000 -0400 -+++ makefile 2011-07-03 21:16:59.000000000 -0400 +--- makefile.orig 2011-07-31 22:49:29.000000000 -0400 ++++ makefile 2011-09-03 16:25:52.000000000 -0400 @@ -5,13 +5,13 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. .SUFFIXES: .cxx .o .h .a .c -ifdef CLANG -CC = clang -CCOMP = clang -else -CC = g++ -CCOMP = gcc -endif +#ifdef CLANG +#CC = clang +#CCOMP = clang +#else +#CC = g++ +#CCOMP = gcc +#endif AR = ar ifdef GTK3 @@ -24,7 +24,7 @@ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0) CONFIGTHREADS:= -gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null) +gnomeprefix:=$(PREFIX) ifndef prefix ifdef gnomeprefix prefix=$(gnomeprefix) -@@ -70,12 +70,12 @@ - - INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include - $(LUA_CORE_OBJS): ../lua/src/*.c -- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c -+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c - $(LUA_LIB_OBJS): ../lua/src/lib/*.c -- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c --CXXFLAGS=$(CXXTFLAGS) -+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c -+CXXFLAGS+=$(CXXTFLAGS) - else --CXXFLAGS=$(CXXTFLAGS) -DNO_LUA -+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA - endif - - CXXFLAGS:=$(CXXFLAGS) -Wno-long-long -@@ -99,8 +99,9 @@ +@@ -102,8 +102,9 @@ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \ - JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) -- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++ +- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++ + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) + $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \ + -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ # Automatically generate header dependencies with "make deps" include deps.mak