Date: Mon, 27 Jan 2014 17:48:05 +0100 (CET) From: Guido Falsi <madpilot@freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/186175: [update] x11-toolkits/scintilla editors/scite update to 3.3.7 Message-ID: <3fCcMn50SgzB3@micro.madpilot.net> Resent-Message-ID: <201401271700.s0RH01LW095029@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186175
>Category: ports
>Synopsis: [update] x11-toolkits/scintilla editors/scite update to 3.3.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 27 17:00:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
- Update to 3.3.7
- Convert to staging
>How-To-Repeat:
>Fix:
Index: editors/scite/Makefile
===================================================================
--- editors/scite/Makefile (revision 341428)
+++ editors/scite/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scite
-PORTVERSION= 3.3.5
+PORTVERSION= 3.3.7
CATEGORIES= editors gnome
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
@@ -19,14 +19,12 @@
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 @@
${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>
Index: editors/scite/distinfo
===================================================================
--- editors/scite/distinfo (revision 341428)
+++ editors/scite/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89
-SIZE (scite335.tgz) = 2099170
+SHA256 (scite337.tgz) = ad094de779572a5c1bb0f2c590acc05a8706fc2f8c8e9ba7d4d98182bb37f174
+SIZE (scite337.tgz) = 2198778
Index: editors/scite/files/patch-aa
===================================================================
--- editors/scite/files/patch-aa (revision 341428)
+++ editors/scite/files/patch-aa (working copy)
@@ -1,37 +0,0 @@
---- makefile.orig 2013-06-22 15:49:44.000000000 -0400
-+++ makefile 2013-06-22 15:53:14.000000000 -0400
-@@ -5,13 +5,6 @@
- # 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 -fsanitize=address --std=c++0x
--CCOMP = clang -fsanitize=address -Wno-empty-body
--else
--CC = g++
--CCOMP = gcc
--endif
- AR = ar
-
- ifdef GTK3
-@@ -24,7 +17,7 @@
- CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
- CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
- CONFIGTHREADS:=
--gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
-+gnomeprefix:=$(PREFIX)
- ifndef prefix
- ifdef gnomeprefix
- prefix=$(gnomeprefix)
-@@ -113,8 +106,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 \
-- 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)
-+ $(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \
-+ -o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
-
- # Automatically generate header dependencies with "make deps"
- include deps.mak
Index: editors/scite/files/patch-makefile
===================================================================
--- editors/scite/files/patch-makefile (revision 341428)
+++ editors/scite/files/patch-makefile (working copy)
@@ -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)
Index: editors/scite/pkg-plist
===================================================================
--- editors/scite/pkg-plist (revision 341428)
+++ editors/scite/pkg-plist (working copy)
@@ -1,4 +1,5 @@
bin/SciTE
+man/man1/scite.1.gz
share/applications/SciTE.desktop
share/pixmaps/Sci48M.png
%%DATADIR%%/Embedded.properties
@@ -62,6 +63,7 @@
%%DATADIR%%/r.properties
%%DATADIR%%/rebol.properties
%%DATADIR%%/ruby.properties
+%%DATADIR%%/rust.properties
%%DATADIR%%/scriptol.properties
%%DATADIR%%/smalltalk.properties
%%DATADIR%%/sorcins.properties
Index: x11-toolkits/scintilla/Makefile
===================================================================
--- x11-toolkits/scintilla/Makefile (revision 341428)
+++ x11-toolkits/scintilla/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scintilla
-PORTVERSION= 3.3.5
+PORTVERSION= 3.3.7
CATEGORIES= x11-toolkits
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= scite${PORTVERSION:S/.//g}
@@ -20,7 +20,6 @@
MAKE_ENV+= LDFLAGS="${LDFLAGS}"
CFLAGS+= -DPIC ${PICFLAG}
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
@@ -43,11 +42,11 @@
${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>
Index: x11-toolkits/scintilla/distinfo
===================================================================
--- x11-toolkits/scintilla/distinfo (revision 341428)
+++ x11-toolkits/scintilla/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89
-SIZE (scite335.tgz) = 2099170
+SHA256 (scite337.tgz) = ad094de779572a5c1bb0f2c590acc05a8706fc2f8c8e9ba7d4d98182bb37f174
+SIZE (scite337.tgz) = 2198778
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3fCcMn50SgzB3>