CVS commit: pkgsrc/x11/blt

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 18 15:06:27 UTC 2017

Modified Files:
        pkgsrc/x11/blt: distinfo
        pkgsrc/x11/blt/patches: patch-ae

Log Message:
blt: Use GCC for linking on SunOS, fixes SSP.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/blt/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/blt/patches/patch-ae

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

Modified files:

Index: pkgsrc/x11/blt/distinfo
diff -u pkgsrc/x11/blt/distinfo:1.14 pkgsrc/x11/blt/distinfo:1.15
--- pkgsrc/x11/blt/distinfo:1.14        Wed Nov  4 03:28:26 2015
+++ pkgsrc/x11/blt/distinfo     Mon Dec 18 15:06:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 03:28:26 agc Exp $
+$NetBSD: distinfo,v 1.15 2017/12/18 15:06:26 jperkin Exp $
 
 SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f
 RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b
@@ -12,7 +12,7 @@ SHA1 (patch-aa) = 6a28cc2405adcc6037865f
 SHA1 (patch-ab) = da9479d5de1053c45753eef611eae2764909f0ec
 SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9
 SHA1 (patch-ad) = cc2579223a5a8a764d797fa16a146999cd4a796d
-SHA1 (patch-ae) = f2689eb585f19d05e9dfe6164f96d6fc9dbc77ad
+SHA1 (patch-ae) = 12da4ffe7ccb272650e58301aaf72bbc43404762
 SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253
 SHA1 (patch-src_bltNsUtil.h) = 949647e6ca4a4890a51917c268289384da98b7ca
 SHA1 (patch-src_tkButton.c) = 39132933914ee8d52389f5be72cbc02b21e7216e

Index: pkgsrc/x11/blt/patches/patch-ae
diff -u pkgsrc/x11/blt/patches/patch-ae:1.6 pkgsrc/x11/blt/patches/patch-ae:1.7
--- pkgsrc/x11/blt/patches/patch-ae:1.6 Fri Oct  7 17:39:26 2005
+++ pkgsrc/x11/blt/patches/patch-ae     Mon Dec 18 15:06:26 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2005/10/07 17:39:26 perry Exp $
+$NetBSD: patch-ae,v 1.7 2017/12/18 15:06:26 jperkin Exp $
 
---- configure.orig     2002-10-04 01:33:59.000000000 -0400
-+++ configure  2005-10-07 13:33:26.000000000 -0400
-@@ -3384,8 +3384,8 @@
+--- configure.orig     2002-10-04 05:33:59.000000000 +0000
++++ configure
+@@ -3384,8 +3384,8 @@ case $target in
      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
    *)
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.6 2005/10/07 17:39
      ;;
  esac
  
-@@ -4072,7 +4072,8 @@
+@@ -4072,7 +4072,8 @@ fi
      EXTRA_LIB_SPECS="-ldl"
      ;;
  
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.6 2005/10/07 17:39
      # Not available on all versions:  check for include file.
      ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4109,9 +4110,10 @@
+@@ -4109,9 +4110,10 @@ test_ok=no
  fi
  
      if test "$test_ok" = yes; then
@@ -35,3 +35,15 @@ $NetBSD: patch-ae,v 1.6 2005/10/07 17:39
      fi
      ;;
  
+@@ -4181,9 +4183,9 @@ fi
+   *-solaris2*)
+ 
+     SHLIB_CFLAGS="-KPIC"
+-    if test "${blt_with_gnu_ld}" = "yes" -a "$blt_have_gcc" = "yes" ; then
++    if test "$blt_have_gcc" = "yes" ; then
+       SHLIB_LD="gcc"
+-      SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
++      SHLIB_LD_FLAGS='-shared -Wl,-soname,$@'
+       LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
+     else
+       SHLIB_LD="/usr/ccs/bin/ld"