Updated SciTE to version 3.7.2 Removed overwriting of the default compiler

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Updated SciTE to version 3.7.2 Removed overwriting of the default compiler
From: Daniel Oelschlegel <amoibos%gmail.com@localhost>
Date: Tue, 03 Jan 2017 23:23:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Tue Jan 3 23:23:11 2017 +0000
Changeset:	b417e192c0bc01b6072e1e70c76d76f721b0792c

Modified Files:
	scintilla/Makefile
	scintilla/distinfo
	scintilla/patches/patch-aa
	scite/Makefile
	scite/distinfo

Log Message:
Updated SciTE to version 3.7.2
Removed overwriting of the default compiler

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b417e192c0bc01b6072e1e70c76d76f721b0792c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 scintilla/Makefile         |  4 ++--
 scintilla/distinfo         | 10 +++++-----
 scintilla/patches/patch-aa | 36 ++++++++++++++++++++----------------
 scite/Makefile             |  6 +++---
 scite/distinfo             |  8 ++++----
 5 files changed, 34 insertions(+), 30 deletions(-)

diffs:
diff --git a/scintilla/Makefile b/scintilla/Makefile
index 5863947..dde8f4f 100644
--- a/scintilla/Makefile
+++ b/scintilla/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.23 2015/04/25 14:20:40 tnn Exp $
 #
 
-DISTNAME=	scintilla370
-PKGNAME=	scintilla-3.7.0
+DISTNAME=	scintilla372
+PKGNAME=	scintilla-3.7.2
 #PKGREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
diff --git a/scintilla/distinfo b/scintilla/distinfo
index 1361672..383f508 100644
--- a/scintilla/distinfo
+++ b/scintilla/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.6 2015/11/03 03:29:32 agc Exp $
 
-SHA1 (scintilla370.tgz) = 26293d8fc480be0944d44725ae145bc3bd886d3e
-RMD160 (scintilla370.tgz) = db7d16ccc4718dcb0769270c55f1fe0409003f47
-SHA512 (scintilla370.tgz) = 08747264695c439a5a3e04709562aac1867520e80e98c572c77fcd76f3788dad6dc72c794d4ee5cfd7de20131117b88ffcb2398d96ffb7025e59128bbaddd106
-Size (scintilla370.tgz) = 1370149 bytes
-SHA1 (patch-aa) = c98d15b0764cef95961f3e0beb091a7693d5a94a
+SHA1 (scintilla372.tgz) = 6b4fe5977e6f5b3a3ed4f5a615fc3a5e3f833f0e
+RMD160 (scintilla372.tgz) = c4cb21fce1a04f39eb36be1effca6a19feda212d
+SHA512 (scintilla372.tgz) = b28cd1bafbbf68962cddefd59137394ddb5f16faebb2e6e5f2f9f85962247fd8cd132a3193356ec9ee0f431aa0a489c5bf7c1e1045618516eef1a8ae14914ca1
+Size (scintilla372.tgz) = 1377448 bytes
+SHA1 (patch-aa) = f63a03876b3e4684c7bcdd6b1abf1278e5b8a5b8
diff --git a/scintilla/patches/patch-aa b/scintilla/patches/patch-aa
index 3774ad6..c29f7f4 100644
--- a/scintilla/patches/patch-aa
+++ b/scintilla/patches/patch-aa
@@ -1,16 +1,22 @@
-$NetBSD$
-Overwrite paths and defaults, patch inspired by OpenBSD ports version 3.5.2
---- gtk/makefile.orig	2016-08-30 04:39:06.000000000 +0000
-+++ gtk/makefile	2016-10-16 20:17:20.234493124 +0000
-@@ -17,6 +17,7 @@
- SANITIZE = address
- #SANITIZE = undefined
- endif
-+AR= ar
+--- gtk/makefile.orig	2016-12-01 09:53:41.000000000 +0000
++++ gtk/makefile	2017-01-03 23:11:02.512337723 +0000
+@@ -9,14 +9,7 @@
+ srcdir ?= .
+ 
+ .SUFFIXES: .cxx .c .o .h .a .list
+-ifdef CLANG
+-CXX = clang++ -Wno-deprecated-register
+-CC = clang
+-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
+-# thread also need to create Position Independent Executable -> search online documentation
+-SANITIZE = address
+-#SANITIZE = undefined
+-endif
++AR = ar
  ARFLAGS = rc
  RANLIB = touch
  
-@@ -45,7 +46,8 @@
+@@ -45,7 +38,8 @@
  COMPLIB=$(srcdir)\..\bin\scintilla.a
  else
  DEL = rm -f
@@ -20,7 +26,7 @@ Overwrite paths and defaults, patch inspired by OpenBSD ports version 3.5.2
  endif
  
  vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
-@@ -98,7 +100,7 @@
+@@ -98,7 +92,7 @@
  
  LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))
  
@@ -29,16 +35,16 @@ Overwrite paths and defaults, patch inspired by OpenBSD ports version 3.5.2
  
  clean:
  	$(DEL) *.o $(COMPLIB) *.plist
-@@ -110,15 +112,22 @@
+@@ -113,14 +107,20 @@
  deps.mak:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx $(srcdir)/../lexlib/*.cxx $(srcdir)/../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] > $@
+ 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.* //' | grep [a-zA-Z] > $@
  
 -$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
 +LIBOBJS= Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
  	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \
  	ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o ExternalLexer.o MarginView.o \
  	PropSetSimple.o PlatGTK.o \
- 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
+ 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
  	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
  	$(MARSHALLER) $(LEXOBJS)
 -	$(AR) $(ARFLAGS) $@ $^
@@ -51,6 +57,4 @@ Overwrite paths and defaults, patch inspired by OpenBSD ports version 3.5.2
 +	$(AR) rc $@ $^
  	$(RANLIB) $@
  
-+
  # Automatically generate header dependencies with "make deps"
- include deps.mak
diff --git a/scite/Makefile b/scite/Makefile
index 9c8e42a..4281c7b 100644
--- a/scite/Makefile
+++ b/scite/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/02/25 08:27:03 jperkin Exp $
 #
-DISTNAME=	scite370
-PKGNAME=	scite-3.7.0
+DISTNAME=	scite372
+PKGNAME=	scite-3.7.2
 #PKGREVISION=	0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
@@ -29,7 +29,7 @@ post-extract:
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.scintilla+= scintilla>=3.2.4
+BUILDLINK_API_DEPENDS.scintilla+= scintilla>=3.7.2
 .include "../../devel/scintilla/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/scite/distinfo b/scite/distinfo
index 242add8..3e1ebc6 100644
--- a/scite/distinfo
+++ b/scite/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.8 2015/11/03 03:32:21 agc Exp $
 
-SHA1 (scite370.tgz) = 6d4d8759e5a1d778f8528e203ec5ce5929fb8d01
-RMD160 (scite370.tgz) = fee0da1ab7c642d713539904f3401d3d7ff0057b
-SHA512 (scite370.tgz) = e398abcd35e244478d797ae7bde6cae137dea7e77c6e42cc378fde6953cccffc9aa634a262522b063c701e39069dd4cd64c05c4e8bdd806b87f61f3d3ee0a189
-Size (scite370.tgz) = 2352677 bytes
+SHA1 (scite372.tgz) = 5665e82edcc9a40405bbc72ad8c7cb2fc6539ca2
+RMD160 (scite372.tgz) = 1d5b87dd23f5246d353968a0be80ef9f83c7eb33
+SHA512 (scite372.tgz) = a38202fa3bbf06bd5efd076cbed00e588654f3fba37332743403e2a5efd670371bbbef31a19e97e42b51698247dfafe43cb44986ef572a328d0b84cf55240e66
+Size (scite372.tgz) = 2319823 bytes
 SHA1 (patch-aa) = c7283f7f7ac61050f490ac0058cfb8d493a8f2ca
Prev by Date: pull syncthing-relaysrv/syncthing-discosrv to 0.14.18
Next by Date: py-ranger: Add some options to be able to preview files
Previous by Thread: pull syncthing-relaysrv/syncthing-discosrv to 0.14.18
Next by Thread: py-ranger: Add some options to be able to preview files
Indexes:
Home | Main Index | Thread Index | Old Index