update scite to 3.6.6

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: update scite to 3.6.6
From: Daniel Oelschlegel <amoibos%gmail.com@localhost>
Date: Sun, 28 Aug 2016 19:19:18 +0000
Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sun Aug 28 19:19:18 2016 +0000
Changeset:	9071de3895053547fa512406143b84f3c54bd47c

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

Log Message:
update scite to 3.6.6

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

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

diffstat:
 scite/Makefile         |  6 ++--
 scite/distinfo         |  5 +--
 scite/patches/patch-aa | 87 ++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 71 insertions(+), 27 deletions(-)

diffs:
diff --git a/scite/Makefile b/scite/Makefile
index 7993947..58b41d2 100644
--- a/scite/Makefile
+++ b/scite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2015/04/25 14:20:43 tnn Exp $
+# $NetBSD: Makefile,v 1.25 2016/02/25 08:27:03 jperkin Exp $
 #
 
 DISTNAME=	scite366
 PKGNAME=	scite-3.6.6
-PKGREVISION=	0
+PKGREVISION=	0� CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
 EXTRACT_SUFX=	.tgz
@@ -20,8 +20,6 @@ USE_TOOLS+=	gmake pkg-config
 MAKE_FILE=	makefile
 INSTALLATION_DIRS= share/applications share/pixmaps
 
-OPSYSVARS+=	BUILDLINK_TRANSFORM
-
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=lua.vers
 
 post-extract:
diff --git a/scite/distinfo b/scite/distinfo
index 2aa49a8..c70307b 100644
--- a/scite/distinfo
+++ b/scite/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/02/13 16:58:17 jperkin Exp $
+$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) = 3579a07d7a2e9157421602c07b0d6310848882a1
+SHA1 (patch-aa) = 9c8ae662e2de538c8c4aa282ed690550eb63678d
diff --git a/scite/patches/patch-aa b/scite/patches/patch-aa
index c7ed52f..eb55361 100644
--- a/scite/patches/patch-aa
+++ b/scite/patches/patch-aa
@@ -1,44 +1,89 @@
-$NetBSD: patch-aa,v 1.5 2015/02/13 16:58:17 jperkin Exp $
-
-Use --version-script=file form so we can rm it if necessary.
-
---- gtk/makefile.orig	2013-10-13 21:38:06.000000000 +0000
-+++ gtk/makefile
-@@ -43,10 +43,10 @@ PROG	= ../bin/SciTE
+--- 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 @@
+ ifdef gnomeprefix
+   prefix=$(gnomeprefix)
+ else
+-  prefix=/usr
++  prefix=$(PREFIX)
+ endif
+ endif
+ datadir=$(prefix)/share
+ pixmapdir=$(datadir)/pixmaps
+ bindir=$(prefix)/bin
+ SYSCONF_PATH=$(prefix)/share/scite
++DOCPATH=$(PREFIX)/share/doc/scite
+ 
+ INSTALL=install
+ 
+@@ -43,22 +44,24 @@
  
  all: $(PROG)
  
 -vpath %.h ../src ../../scintilla/include
-+vpath %.h ../src $(prefix)/include/scintilla
++vpath %.h ../src scintilla
  vpath %.cxx ../src
  
 -INCLUDEDIRS=-I ../../scintilla/include -I ../src
-+INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src
++INCLUDEDIRS=-I $(PREFIX)/include/scintilla -I ../src -I $(prefix)/include
  ifdef CHECK_DEPRECATED
  DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
  endif
-@@ -74,7 +74,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ
+-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)
+ endif
+ 
+-ifndef NO_LUA
++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 @@
  
  vpath %.c ../lua/src ../lua/src/lib
  
 -INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
-+INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src -I../lua/include
++INCLUDEDIRS+=-I../lua/include
  
  .c.o:
- 	$(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
-@@ -111,13 +111,13 @@ deps:
- 	$(CC) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ 	$(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
  
- # make should be run in ../../scintilla/gtk to compile all the lexers.
+-# make should be run in ../../scintilla/gtk to compile all the lexers.
 -COMPLIB=../../scintilla/bin/scintilla.a
-+COMPLIB=$(prefix)/lib/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 Exporters.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)
--	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
-+	$(CC) `$(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 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++
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
+@@ -136,7 +136,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
+ endif
+ 
+ uninstall:
Prev by Date: missing scintilla update to version 3.6.6
Next by Date: Add py-jsonrpclib 0.1.7
Previous by Thread: missing scintilla update to version 3.6.6
Next by Thread: Add py-jsonrpclib 0.1.7
Indexes:
Home | Main Index | Thread Index | Old Index