Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Sep 2016 16:39:18 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421512 - in head/editors/scite: . files
Message-ID:  <201609071639.u87GdID8071670@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Sep  7 16:39:18 2016
New Revision: 421512
URL: https://svnweb.freebsd.org/changeset/ports/421512

Log:
  - Update to 3.6.7
  
  PR:		212404
  Submitted by:	lightside@gmx.com
  Approved by:	cyberbotx@cyberbotx.com (maintainer)

Modified:
  head/editors/scite/Makefile
  head/editors/scite/distinfo
  head/editors/scite/files/patch-makefile

Modified: head/editors/scite/Makefile
==============================================================================
--- head/editors/scite/Makefile	Wed Sep  7 16:38:51 2016	(r421511)
+++ head/editors/scite/Makefile	Wed Sep  7 16:39:18 2016	(r421512)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scite
-PORTVERSION=	3.6.6
+PORTVERSION=	3.6.7
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}

Modified: head/editors/scite/distinfo
==============================================================================
--- head/editors/scite/distinfo	Wed Sep  7 16:38:51 2016	(r421511)
+++ head/editors/scite/distinfo	Wed Sep  7 16:39:18 2016	(r421512)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464048149
-SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa
-SIZE (scite366.tgz) = 2371062
+TIMESTAMP = 1472947347
+SHA256 (scite367.tgz) = 851a681d2fefe02770d318c4c25401f423b6ea686f6cae3eed5257e27c86c49f
+SIZE (scite367.tgz) = 2331985

Modified: head/editors/scite/files/patch-makefile
==============================================================================
--- head/editors/scite/files/patch-makefile	Wed Sep  7 16:38:51 2016	(r421511)
+++ head/editors/scite/files/patch-makefile	Wed Sep  7 16:39:18 2016	(r421512)
@@ -1,7 +1,7 @@
---- makefile.orig	2015-09-22 01:37:15 UTC
+--- makefile.orig	2016-08-30 04:39:12 UTC
 +++ makefile
-@@ -5,14 +5,6 @@
- # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
+@@ -7,16 +7,6 @@
+ srcdir ?= .
  
  .SUFFIXES: .cxx .o .h .a .c
 -ifdef CLANG
@@ -11,11 +11,13 @@
 -#SANITIZE = undefined
 -CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
 -CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
+-else
+-MISLEADING=-Wno-misleading-indentation
 -endif
  
  ifdef GTK3
  GTKVERSION=gtk+-3.0
-@@ -24,7 +16,7 @@ endif
+@@ -28,7 +18,7 @@ endif
  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
  CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
  CONFIGTHREADS:=
@@ -24,14 +26,14 @@
  ifndef prefix
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
-@@ -114,8 +106,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
+@@ -119,8 +109,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
  ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
  MatchMarker.o StringHelpers.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)
--	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
+-	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
 +	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
-+	$(CXX) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
++	$(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
 +	$(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
  
  # Automatically generate header dependencies with "make deps"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609071639.u87GdID8071670>