[pkgsrc/trunk]: pkgsrc/print/cups Limit ssp fix to SunOS.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1975a3164632
branches:  trunk
changeset: 596247:1975a3164632
user:      hans <hans%pkgsrc.org@localhost>
date:      Fri Dec 02 14:14:58 2011 +0000

description:
Limit ssp fix to SunOS.

diffstat:

 print/cups/Makefile         |  6 +++++-
 print/cups/distinfo         |  4 ++--
 print/cups/patches/patch-ah |  4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 78569bf4f621 -r 1975a3164632 print/cups/Makefile
--- a/print/cups/Makefile       Fri Dec 02 13:59:35 2011 +0000
+++ b/print/cups/Makefile       Fri Dec 02 14:14:58 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2011/11/14 01:23:26 sbd Exp $
+# $NetBSD: Makefile,v 1.186 2011/12/02 14:14:58 hans Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -69,6 +69,10 @@
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV+=                LIBS_SSP=-lssp_nonshared
+.endif
+
 PLIST_VARS+=           notmac
 .if ${OPSYS} != "Darwin"
 PLIST.notmac=          yes
diff -r 78569bf4f621 -r 1975a3164632 print/cups/distinfo
--- a/print/cups/distinfo       Fri Dec 02 13:59:35 2011 +0000
+++ b/print/cups/distinfo       Fri Dec 02 14:14:58 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2011/11/29 15:46:24 hans Exp $
+$NetBSD: distinfo,v 1.89 2011/12/02 14:14:58 hans Exp $
 
 SHA1 (cups-1.5.0-source.tar.bz2) = 628f549867751e373fc20c7558fec422f9eb942b
 RMD160 (cups-1.5.0-source.tar.bz2) = e7be9b6b44428561609c59abaea8fa31a11aefff
@@ -8,7 +8,7 @@
 SHA1 (patch-ae) = 7806067b36fa1c98763cf51a14941665f590b816
 SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271
 SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
-SHA1 (patch-ah) = 23b049987e27d1ff096b6e18cbf9e70d002356d4
+SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052
 SHA1 (patch-ai) = 13725f3b4e0016acf5ead79cadb9626d1f2ce58e
 SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
 SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
diff -r 78569bf4f621 -r 1975a3164632 print/cups/patches/patch-ah
--- a/print/cups/patches/patch-ah       Fri Dec 02 13:59:35 2011 +0000
+++ b/print/cups/patches/patch-ah       Fri Dec 02 14:14:58 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.19 2011/11/29 15:46:25 hans Exp $
+$NetBSD: patch-ah,v 1.20 2011/12/02 14:14:58 hans Exp $
 
 Some builds of gcc seem to support this for compiling but then fail during
 linking with undefined reference to `__stack_chk_fail_local'
@@ -12,7 +12,7 @@
 -      AC_TRY_LINK(,,
 +      AC_TRY_LINK(, [return 0;],
                OPTIM="$OPTIM -fstack-protector"
-+              LIBS="$LIBS -lssp_nonshared"
++              LIBS="$LIBS $LIBS_SSP"
                AC_MSG_RESULT(yes),
                AC_MSG_RESULT(no))
        CFLAGS="$OLDCFLAGS"