From owner-svn-ports-all@FreeBSD.ORG Wed Mar 5 01:23:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D4E3F78; Wed, 5 Mar 2014 01:23:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4E84D8BA; Wed, 5 Mar 2014 01:23:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s251NIbr020064; Wed, 5 Mar 2014 01:23:18 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s251NHms020051; Wed, 5 Mar 2014 01:23:17 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201403050123.s251NHms020051@svn.freebsd.org> From: Guido Falsi Date: Wed, 5 Mar 2014 01:23:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347091 - in head: editors/scite editors/scite/files x11-toolkits/scintilla X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 01:23:18 -0000 Author: madpilot Date: Wed Mar 5 01:23:16 2014 New Revision: 347091 URL: http://svnweb.freebsd.org/changeset/ports/347091 QAT: https://qat.redports.org/buildarchive/r347091/ Log: - Update to 3.3.9 - Convert to staging PR: ports/186175 Submitted by: me Approved by: Naram Qashat (maintainer) Added: head/editors/scite/files/patch-makefile - copied, changed from r347090, head/editors/scite/files/patch-aa Deleted: head/editors/scite/files/patch-aa Modified: head/editors/scite/Makefile head/editors/scite/distinfo head/editors/scite/pkg-plist head/x11-toolkits/scintilla/Makefile head/x11-toolkits/scintilla/distinfo Modified: head/editors/scite/Makefile ============================================================================== --- head/editors/scite/Makefile Wed Mar 5 00:20:15 2014 (r347090) +++ head/editors/scite/Makefile Wed Mar 5 01:23:16 2014 (r347091) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scite -PORTVERSION= 3.3.5 +PORTVERSION= 3.3.9 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} @@ -19,14 +19,12 @@ FULL_BUFFER_MENU_DESC= Show all files in WRKSRC= ${WRKDIR}/${PORTNAME}/gtk -USES= gmake pkgconfig +USES= desktop-file-utils gmake pkgconfig USE_GNOME= gtk20 MAKEFILE= makefile -MAN1= scite.1 PORTDOCS= * -NO_STAGE= yes .include post-patch: @@ -39,17 +37,17 @@ post-patch: ${WRKSRC}/../src/SciTEGlobal.properties do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/pixmaps - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/editors/scite/distinfo ============================================================================== --- head/editors/scite/distinfo Wed Mar 5 00:20:15 2014 (r347090) +++ head/editors/scite/distinfo Wed Mar 5 01:23:16 2014 (r347091) @@ -1,2 +1,2 @@ -SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 -SIZE (scite335.tgz) = 2099170 +SHA256 (scite339.tgz) = cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775 +SIZE (scite339.tgz) = 2229269 Copied and modified: head/editors/scite/files/patch-makefile (from r347090, head/editors/scite/files/patch-aa) ============================================================================== --- head/editors/scite/files/patch-aa Wed Mar 5 00:20:15 2014 (r347090, copy source) +++ head/editors/scite/files/patch-makefile Wed Mar 5 01:23:16 2014 (r347091) @@ -1,5 +1,5 @@ ---- makefile.orig 2013-06-22 15:49:44.000000000 -0400 -+++ makefile 2013-06-22 15:53:14.000000000 -0400 +--- makefile.orig 2013-10-13 23:38:06.000000000 +0200 ++++ makefile 2014-01-27 15:50:05.858185668 +0100 @@ -5,13 +5,6 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. @@ -23,10 +23,10 @@ ifndef prefix ifdef gnomeprefix prefix=$(gnomeprefix) -@@ -113,8 +106,9 @@ +@@ -116,8 +109,9 @@ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ FilePath.o SciTEBase.o FileWorker.o Cookie.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 \ + PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.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) $(LIBDL) -lm -lstdc++ + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) Modified: head/editors/scite/pkg-plist ============================================================================== --- head/editors/scite/pkg-plist Wed Mar 5 00:20:15 2014 (r347090) +++ head/editors/scite/pkg-plist Wed Mar 5 01:23:16 2014 (r347091) @@ -1,4 +1,5 @@ bin/SciTE +man/man1/scite.1.gz share/applications/SciTE.desktop share/pixmaps/Sci48M.png %%DATADIR%%/Embedded.properties @@ -7,6 +8,7 @@ share/pixmaps/Sci48M.png %%DATADIR%%/abaqus.properties %%DATADIR%%/abbrev.properties %%DATADIR%%/ada.properties +%%DATADIR%%/asl.properties %%DATADIR%%/asm.properties %%DATADIR%%/asn1.properties %%DATADIR%%/au3.properties @@ -62,6 +64,7 @@ share/pixmaps/Sci48M.png %%DATADIR%%/r.properties %%DATADIR%%/rebol.properties %%DATADIR%%/ruby.properties +%%DATADIR%%/rust.properties %%DATADIR%%/scriptol.properties %%DATADIR%%/smalltalk.properties %%DATADIR%%/sorcins.properties Modified: head/x11-toolkits/scintilla/Makefile ============================================================================== --- head/x11-toolkits/scintilla/Makefile Wed Mar 5 00:20:15 2014 (r347090) +++ head/x11-toolkits/scintilla/Makefile Wed Mar 5 01:23:16 2014 (r347091) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -PORTVERSION= 3.3.5 +PORTVERSION= 3.3.9 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} @@ -20,7 +20,6 @@ USE_GNOME= gtk20 MAKE_ENV+= LDFLAGS="${LDFLAGS}" CFLAGS+= -DPIC ${PICFLAG} -NO_STAGE= yes .include .if ${ARCH} == "sparc64" @@ -43,11 +42,11 @@ post-patch: ${WRKSRC}/makefile do-install: - ${MKDIR} ${PREFIX}/include/scintilla - ${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla - ${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/libscintilla.so.2 ${PREFIX}/lib/libscintilla.so - ${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.2 ${PREFIX}/lib/libscintilla_lexers.so + ${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla + ${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla + ${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${STAGEDIR}${PREFIX}/lib + (cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla.so.2 libscintilla.so) + ${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${STAGEDIR}${PREFIX}/lib + (cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla_lexers.so.2 libscintilla_lexers.so) .include Modified: head/x11-toolkits/scintilla/distinfo ============================================================================== --- head/x11-toolkits/scintilla/distinfo Wed Mar 5 00:20:15 2014 (r347090) +++ head/x11-toolkits/scintilla/distinfo Wed Mar 5 01:23:16 2014 (r347091) @@ -1,2 +1,2 @@ -SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 -SIZE (scite335.tgz) = 2099170 +SHA256 (scite339.tgz) = cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775 +SIZE (scite339.tgz) = 2229269