[pkgsrc/pkgsrc-2009Q4]: pkgsrc/mail/imap-uw Pullup ticket 2971 - requested by...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf86bb60880a
branches:  pkgsrc-2009Q4
changeset: 569212:cf86bb60880a
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Jan 26 08:59:08 2010 +0000

description:
Pullup ticket 2971 - requested by tron
build fix for Solaris / Sun Studio C

Revisions pulled up:
- pkgsrc/mail/imap-uw/Makefile          1.132
- pkgsrc/mail/imap-uw/distinfo          1.39
- pkgsrc/mail/imap-uw/patches/patch-ab  1.25

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Mon Jan 25 23:04:49 UTC 2010

   Modified Files:
           pkgsrc/mail/imap-uw: Makefile distinfo
           pkgsrc/mail/imap-uw/patches: patch-ab

   Log Message:
   Use "soc" target if building with Sun Studio C++ and modify that target
   to use "cc" rather than an absolute path (which is no longer correct).
   This fixes the build with that compiler without breaking the build
   using GCC.


   To generate a diff of this commit:
   cvs rdiff -u -r1.131 -r1.132 pkgsrc/mail/imap-uw/Makefile
   cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/imap-uw/distinfo
   cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/imap-uw/patches/patch-ab

diffstat:

 mail/imap-uw/Makefile         |   8 +++++++-
 mail/imap-uw/distinfo         |   4 ++--
 mail/imap-uw/patches/patch-ab |  13 +++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 66428e811641 -r cf86bb60880a mail/imap-uw/Makefile
--- a/mail/imap-uw/Makefile     Tue Jan 26 08:23:22 2010 +0000
+++ b/mail/imap-uw/Makefile     Tue Jan 26 08:59:08 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2009/08/21 11:55:50 obache Exp $
+# $NetBSD: Makefile,v 1.131.4.1 2010/01/26 08:59:08 spz Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -37,7 +37,13 @@
 
 # Each platform has its own special target in the imap Makefiles.
 OPSYSVARS+=            BUILD_TARGET
+
+.include "../../mk/compiler.mk"
+.  if empty(CC_VERSION:Mgcc-)
+BUILD_TARGET.SunOS=    soc
+.  else
 BUILD_TARGET.SunOS=    gso
+.  endif
 .if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h)
 BUILD_TARGET.Linux=    lnp
 .else
diff -r 66428e811641 -r cf86bb60880a mail/imap-uw/distinfo
--- a/mail/imap-uw/distinfo     Tue Jan 26 08:23:22 2010 +0000
+++ b/mail/imap-uw/distinfo     Tue Jan 26 08:59:08 2010 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.38 2010/01/11 09:26:01 tron Exp $
+$NetBSD: distinfo,v 1.38.2.1 2010/01/26 08:59:08 spz Exp $
 
 SHA1 (imap-2007e.tar.Z) = 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70
 RMD160 (imap-2007e.tar.Z) = 7d6af203419975f763d7ec17b6a4544c94490b50
 Size (imap-2007e.tar.Z) = 2789469 bytes
 SHA1 (patch-aa) = ac880c250dfee3d0d316063ace5b92cd2f190510
-SHA1 (patch-ab) = 0cfdae5b64f41d45c027483364216b20bc8724b4
+SHA1 (patch-ab) = c7985a2db4d4b5c8d2644492b2e48f8ebe2d64b1
 SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3
 SHA1 (patch-ad) = d817dca51413bb8d228c2fabadffa3b924dff11d
 SHA1 (patch-ae) = 85e0917ce1934f6789bbce45ad5321e28cf294d9
diff -r 66428e811641 -r cf86bb60880a mail/imap-uw/patches/patch-ab
--- a/mail/imap-uw/patches/patch-ab     Tue Jan 26 08:23:22 2010 +0000
+++ b/mail/imap-uw/patches/patch-ab     Tue Jan 26 08:59:08 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.24 2010/01/11 09:26:02 tron Exp $
+$NetBSD: patch-ab,v 1.24.2.1 2010/01/26 08:59:08 spz Exp $
 
 --- src/osdep/unix/Makefile.orig       2008-06-04 19:18:34.000000000 +0100
-+++ src/osdep/unix/Makefile    2010-01-11 09:17:00.000000000 +0000
++++ src/osdep/unix/Makefile    2010-01-25 22:56:57.000000000 +0000
 @@ -48,7 +48,7 @@
  # Try to have some consistency in GCC builds.  We want optimization, but we
  # also want to be able to debug.
@@ -29,6 +29,15 @@
         RSHPATH=/usr/bin/rsh \
         BASECFLAGS="$(GCCCFLAGS)" \
         BASELDFLAGS="-lcrypt"
+@@ -718,7 +718,7 @@
+        RSHPATH=/usr/bin/rsh \
+        BASECFLAGS="-g -O -w" \
+        BASELDFLAGS="-lsocket -lnsl -lgen" \
+-       RANLIB=true CC=/opt/SUNWspro/bin/cc
++       RANLIB=true CC=cc
+ 
+ 
+ # Note: It is a long and disgusting story about why cc is set to ucbcc.  You
 @@ -855,7 +855,7 @@
        @$(SH) ARCHIVE