- Update to 3.3.7 - Convert to staging
Maintainer of x11-toolkits/scintilla, Please note that PR ports/186175 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186175 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-ports-bugs->madpilot I'll take it.
Hi, Have you had time to look at this PR? It contains an update for both scintilla and scite, can you approve it? Thanks in advance. -- Guido Falsi <madpilot@FreeBSD.org>
Hi again, Attaching a revised patch which updates both scintilla and scite to version 3.3.9, and also converts both ports to support staging. Can you approve this patch? Please reply using "reply all" so your answer will be tracked by gnats. Thanks. -- Guido Falsi <madpilot@FreeBSD.org>
Hi, sorry I didn't notice this until now. The patches are acceptable to me. Thanks, Naram Qashat On 03/01/14 04:31, Guido Falsi wrote: > Hi again, > > Attaching a revised patch which updates both scintilla and scite to > version 3.3.9, and also converts both ports to support staging. > > Can you approve this patch? > > Please reply using "reply all" so your answer will be tracked by gnats. > > Thanks. >
State Changed From-To: feedback->closed Committed. Thanks!
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 <cyberbotx@cyberbotx.com> (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 <bsd.port.options.mk> 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 <bsd.port.mk> 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 <bsd.port.pre.mk> .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 <bsd.port.post.mk> 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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"