experimental update to 3.7.0 of SciTE

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: experimental update to 3.7.0 of SciTE
From: Daniel Oelschlegel <amoibos%gmail.com@localhost>
Date: Sun, 16 Oct 2016 20:49:01 +0000
Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sun Oct 16 20:49:01 2016 +0000
Changeset:	a5193fb9f184941d14df84768a8081b246358814

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

Log Message:
experimental update to 3.7.0 of SciTE

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

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 | 40 ++++++++++++-------------
 scite/Makefile             |  4 +--
 scite/distinfo             | 10 +++----
 scite/patches/patch-aa     | 75 +++++++++++++++++++---------------------------
 6 files changed, 65 insertions(+), 78 deletions(-)

diffs:
diff --git a/scintilla/Makefile b/scintilla/Makefile
index df22f92..28cfdac 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=	scintilla366
-PKGNAME=	scintilla-3.6.6
+DISTNAME=	scintilla370
+PKGNAME=	scintilla-3.7.0
 PKGREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
diff --git a/scintilla/distinfo b/scintilla/distinfo
index 8c684a7..257b498 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 (scintilla366.tgz) = 582efe82287c110fbee1d0877363ec73bf6393ea
-RMD160 (scintilla366.tgz) = c4d2c567119c2339d935102a6d61d0586a455dd7
-SHA512 (scintilla366.tgz) = e759f075b8f47faeaca8e22f73d420732f0fc00ffd261fc2134276d0356f0eec214e0924e93cd7c7446124be8775c24d71c7a54c4875a9ca16035860c2875f8a
-Size (scintilla366.tgz) = 1314970 bytes
-SHA1 (patch-aa) = ec46d9083643f121915152200dfa0d227bac0290
+SHA1 (scintilla370.tgz) = 26293d8fc480be0944d44725ae145bc3bd886d3e
+RMD160 (scintilla370.tgz) = db7d16ccc4718dcb0769270c55f1fe0409003f47
+SHA512 (scintilla370.tgz) = 08747264695c439a5a3e04709562aac1867520e80e98c572c77fcd76f3788dad6dc72c794d4ee5cfd7de20131117b88ffcb2398d96ffb7025e59128bbaddd106
+Size (scintilla370.tgz) = 1370149 bytes
+SHA1 (patch-aa) = cca1ad4399b00e261a96dd3ddb437c93b6b21f6b
diff --git a/scintilla/patches/patch-aa b/scintilla/patches/patch-aa
index 879399d..e210323 100644
--- a/scintilla/patches/patch-aa
+++ b/scintilla/patches/patch-aa
@@ -1,37 +1,36 @@
---- gtk/makefile.orig	2016-05-17 23:50:39.000000000 +0000
-+++ gtk/makefile	2016-08-21 23:04:04.169401815 +0000
-@@ -15,6 +15,7 @@
+--- 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
+ ARFLAGS = rc
  RANLIB = touch
  
- ifdef GTK3
-@@ -42,7 +43,8 @@
- COMPLIB=..\bin\scintilla.a
+@@ -45,7 +46,8 @@
+ COMPLIB=$(srcdir)\..\bin\scintilla.a
  else
  DEL = rm -f
--COMPLIB=../bin/scintilla.a
-+COMPLIB=../bin/libscintilla.a
-+LEXERLIB=../bin/libscintilla_lexers.a
+-COMPLIB=$(srcdir)/../bin/scintilla.a
++COMPLIB=$(srcdir)/../bin/libscintilla.a
++LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a
  endif
  
- vpath %.h ../src ../include ../lexlib
-@@ -95,7 +97,7 @@
+ vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
+@@ -98,7 +100,7 @@
  
- LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
+ LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))
  
 -all: $(COMPLIB)
 +all: $(COMPLIB) $(LEXERLIB)
  
  clean:
  	$(DEL) *.o $(COMPLIB) *.plist
-@@ -105,16 +107,22 @@
+@@ -110,15 +112,22 @@
+ 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] > $@
  
- deps:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
--
 -$(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 \
@@ -40,15 +39,16 @@
  	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.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) $@ $^
++
 +$(COMPLIB): $(LIBOBJS)
 +	$(AR) rc $@ $^
 +	$(RANLIB) $@
-+
++	
 +$(LEXERLIB): $(LEXOBJS)
- 	$(AR) rc $@ $^
++	$(AR) rc $@ $^
  	$(RANLIB) $@
-+	
  
++
  # Automatically generate header dependencies with "make deps"
  include deps.mak
diff --git a/scite/Makefile b/scite/Makefile
index 6e9e58d..9c8e42a 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=	scite366
-PKGNAME=	scite-3.6.6
+DISTNAME=	scite370
+PKGNAME=	scite-3.7.0
 #PKGREVISION=	0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
diff --git a/scite/distinfo b/scite/distinfo
index 9267b69..aca85cc 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 (scite366.tgz) = 86651845f28aeee659286d5a4564a469407e9fcd
-RMD160 (scite366.tgz) = 59e70df6cfa6e8b6a891dbe5d777694cc2fb7cf7
-SHA512 (scite366.tgz) = 815f67a5c04f74260a2f008380b61ca0e9efc7ab4c1fba9257d68f666f08fa7bd980e50a65a88a02ff3726c951cee667dc644cc71dc3c97f915b19c780985504
-Size (scite366.tgz) = 2371062 bytes
-SHA1 (patch-aa) = a2199e47fb526f479f3c6ceaf969bde8ac62caaa
+SHA1 (scite370.tgz) = 6d4d8759e5a1d778f8528e203ec5ce5929fb8d01
+RMD160 (scite370.tgz) = fee0da1ab7c642d713539904f3401d3d7ff0057b
+SHA512 (scite370.tgz) = e398abcd35e244478d797ae7bde6cae137dea7e77c6e42cc378fde6953cccffc9aa634a262522b063c701e39069dd4cd64c05c4e8bdd806b87f61f3d3ee0a189
+Size (scite370.tgz) = 2352677 bytes
+SHA1 (patch-aa) = 9e3a3482be638b75fa7f111f77540ce8dc922102
diff --git a/scite/patches/patch-aa b/scite/patches/patch-aa
index bd96c40..2ebe27a 100644
--- a/scite/patches/patch-aa
+++ b/scite/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD$
-Overwrite paths and defaults, patch inspired by OpenBSD ports version 3.5.2
---- gtk/makefile.orig	2015-09-22 00:04:06.000000000 +0000
-+++ gtk/makefile	2016-08-21 21:11:56.272068426 +0000
-@@ -29,13 +29,14 @@
+--- gtk/makefile.orig	2016-10-16 03:10:33.000000000 +0000
++++ gtk/makefile	2016-10-16 20:44:27.385048978 +0000
+@@ -33,13 +33,14 @@
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
  else
@@ -18,74 +16,63 @@ Overwrite paths and defaults, patch inspired by OpenBSD ports version 3.5.2
  
  INSTALL=install
  
-@@ -43,22 +44,24 @@
+@@ -47,10 +48,10 @@
  
  all: $(PROG)
  
--vpath %.h ../src ../../scintilla/include
-+vpath %.h ../src scintilla
- vpath %.cxx ../src
+-vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../../scintilla/include
++vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../scintilla
+ vpath %.cxx $(srcdir) $(srcdir)/../src
  
--INCLUDEDIRS=-I ../../scintilla/include -I ../src
-+INCLUDEDIRS=-I $(PREFIX)/include/scintilla -I ../src -I $(prefix)/include
+-INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
++INCLUDEDIRS=-I $(PREFIX)/include/scintilla -I $(srcdir)/../src -I $(prefix)/include
  ifdef CHECK_DEPRECATED
  DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
  endif
--CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
-+CXXBASEFLAGS=-W -Wall -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
- 
- ifdef DEBUG
--CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
- else
--CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
+@@ -62,7 +63,9 @@
+ CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
  endif
  
 -ifndef NO_LUA
-+LIBS = -L $(PREFIX)/lib -lscintilla -lscintilla_lexers
++LIBS= -L $(PREFIX)/lib -lscintilla -lscintilla_lexers
 +
 +ifdef LUA
  LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
  		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
  		ltable.o ltm.o lundump.o lvm.o lzio.o
-@@ -70,7 +73,7 @@
+@@ -74,7 +77,7 @@
  
- vpath %.c ../lua/src ../lua/src/lib
+ vpath %.c $(srcdir)/../lua/src $(srcdir)/../lua/src/lib
  
--INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
-+INCLUDEDIRS+=-I../lua/include
+-INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -I$(srcdir)/../lua/include
++INCLUDEDIRS+=-I$(srcdir)/../lua/include
  
  .c.o:
- 	$(CC) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
-@@ -106,16 +109,13 @@
- deps:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ 	$(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o $@
+@@ -111,16 +114,13 @@
+ deps.mak:
+ 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
  
 -# make should be run in ../../scintilla/gtk to compile all the lexers.
--COMPLIB=../../scintilla/bin/scintilla.a
+-COMPLIB=$(srcdir)/../../scintilla/bin/scintilla.a
 -
  $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
--FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
--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 \
-+	FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
-+	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 \
+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
+ 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)` $(LIBS) -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++
++	$(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
-@@ -136,7 +136,7 @@
+@@ -141,7 +141,7 @@
  ifdef gnomeprefix
  	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
- 	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
--	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+	$(INSTALL) -m 444 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ 	$(INSTALL) -m 755 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+-	$(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++	$(INSTALL) -m 444 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
  endif
  
  uninstall:
Prev by Date: Reduced warnings reported by pkglint
Next by Date: Update plist
Previous by Thread: Reduced warnings reported by pkglint
Next by Thread: Update plist
Indexes:
Home | Main Index | Thread Index | Old Index