[pkgsrc/trunk]: pkgsrc/editors/scite Remove --version-script linker arguments...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fa998ea519c
branches:  trunk
changeset: 646684:5fa998ea519c
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Feb 13 16:58:17 2015 +0000

description:
Remove --version-script linker arguments on SunOS.

diffstat:

 editors/scite/Makefile         |   6 +++++-
 editors/scite/distinfo         |   4 ++--
 editors/scite/patches/patch-aa |  19 ++++++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diffs (78 lines):

diff -r 37e46cdecc77 -r 5fa998ea519c editors/scite/Makefile
--- a/editors/scite/Makefile    Fri Feb 13 16:30:44 2015 +0000
+++ b/editors/scite/Makefile    Fri Feb 13 16:58:17 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/05/05 00:47:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2015/02/13 16:58:17 jperkin Exp $
 #
 
 DISTNAME=      scite339
@@ -20,6 +20,10 @@
 MAKE_FILE=     makefile
 INSTALLATION_DIRS= share/applications share/pixmaps
 
+OPSYSVARS+=    BUILDLINK_TRANSFORM
+
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=lua.vers
+
 post-extract:
        ${RM} -r ${WRKDIR}/scintilla
        ${RM} ${WRKSRC}/gtk/deps.mak
diff -r 37e46cdecc77 -r 5fa998ea519c editors/scite/distinfo
--- a/editors/scite/distinfo    Fri Feb 13 16:30:44 2015 +0000
+++ b/editors/scite/distinfo    Fri Feb 13 16:58:17 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2014/02/06 17:26:32 drochner Exp $
+$NetBSD: distinfo,v 1.7 2015/02/13 16:58:17 jperkin Exp $
 
 SHA1 (scite339.tgz) = 6ac4fc0c56aad1d037dba2e46acb83922a639330
 RMD160 (scite339.tgz) = f7cf3a47280fe34fe1e558945fe86c0f4b4e3bb4
 Size (scite339.tgz) = 2229269 bytes
-SHA1 (patch-aa) = af56e927d5a2902229b7d95232d81dab67d55686
+SHA1 (patch-aa) = 3579a07d7a2e9157421602c07b0d6310848882a1
diff -r 37e46cdecc77 -r 5fa998ea519c editors/scite/patches/patch-aa
--- a/editors/scite/patches/patch-aa    Fri Feb 13 16:30:44 2015 +0000
+++ b/editors/scite/patches/patch-aa    Fri Feb 13 16:58:17 2015 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $
+$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-01-17 01:17:02.000000000 +0000
+--- gtk/makefile.orig  2013-10-13 21:38:06.000000000 +0000
 +++ gtk/makefile
-@@ -46,10 +46,10 @@ PROG       = ../bin/SciTE
+@@ -43,10 +43,10 @@ PROG       = ../bin/SciTE
  
  all: $(PROG)
  
@@ -15,7 +17,7 @@
  ifdef CHECK_DEPRECATED
  DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
  endif
-@@ -73,7 +73,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ
+@@ -74,7 +74,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ
  
  vpath %.c ../lua/src ../lua/src/lib
  
@@ -24,7 +26,7 @@
  
  .c.o:
        $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
-@@ -102,7 +102,7 @@ deps:
+@@ -111,13 +111,13 @@ deps:
        $(CC) -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.
@@ -33,3 +35,10 @@
  
  $(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 \
+       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++
+ 
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak