Mon Jan 25 23:04:49 2010 UTC ()
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.


(tron)
diff -r1.131 -r1.132 pkgsrc/mail/imap-uw/Makefile
diff -r1.38 -r1.39 pkgsrc/mail/imap-uw/distinfo
diff -r1.24 -r1.25 pkgsrc/mail/imap-uw/patches/patch-ab
cvs diff -r1.131 -r1.132 pkgsrc/mail/imap-uw/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/imap-uw/Makefile 2009/08/21 11:55:50 1.131
+++ pkgsrc/mail/imap-uw/Makefile 2010/01/25 23:04:49 1.132
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.131 2009/08/21 11:55:50 obache Exp $ 1# $NetBSD: Makefile,v 1.132 2010/01/25 23:04:49 tron Exp $
2# 2#
3# ATTENTION: 3# ATTENTION:
4# The Kerberos support in this software is known to be problematic. If you 4# The Kerberos support in this software is known to be problematic. If you
5# upgrade this package you *must* test it on a system with Kerberos libraries 5# upgrade this package you *must* test it on a system with Kerberos libraries
6# but not running Kerberos before committing the changes. 6# but not running Kerberos before committing the changes.
7# 7#
8# NOTE ALSO: 8# NOTE ALSO:
9# The most common reason to install this package is as a prerequisite for pine. 9# The most common reason to install this package is as a prerequisite for pine.
10# If you upgrade this package, you *must* test mail/pine with the new version. 10# If you upgrade this package, you *must* test mail/pine with the new version.
11 11
12DISTNAME= imap-2007e 12DISTNAME= imap-2007e
13PKGNAME= ${DISTNAME:S/-/-uw-/} 13PKGNAME= ${DISTNAME:S/-/-uw-/}
14PKGREVISION= 1 14PKGREVISION= 1
@@ -27,27 +27,33 @@ MAKE_ENV+= LIBTOOL=libtool @@ -27,27 +27,33 @@ MAKE_ENV+= LIBTOOL=libtool
27MAKE_ENV+= LTCOMPILE="libtool --mode=compile" 27MAKE_ENV+= LTCOMPILE="libtool --mode=compile"
28MAKE_ENV+= LTLINK="libtool --mode=link" 28MAKE_ENV+= LTLINK="libtool --mode=link"
29LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} 29LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM}
30LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_LIB} 30LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_LIB}
31 31
32WRKSRC= ${WRKDIR}/${DISTNAME:S/2$//} 32WRKSRC= ${WRKDIR}/${DISTNAME:S/2$//}
33 33
34MAKE_JOBS_SAFE= no 34MAKE_JOBS_SAFE= no
35 35
36.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
37 37
38# Each platform has its own special target in the imap Makefiles. 38# Each platform has its own special target in the imap Makefiles.
39OPSYSVARS+= BUILD_TARGET 39OPSYSVARS+= BUILD_TARGET
 40
 41.include "../../mk/compiler.mk"
 42. if empty(CC_VERSION:Mgcc-)
 43BUILD_TARGET.SunOS= soc
 44. else
40BUILD_TARGET.SunOS= gso 45BUILD_TARGET.SunOS= gso
 46. endif
41.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h) 47.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h)
42BUILD_TARGET.Linux= lnp 48BUILD_TARGET.Linux= lnp
43.else 49.else
44BUILD_TARGET.Linux= slx 50BUILD_TARGET.Linux= slx
45.endif 51.endif
46.if ${OPSYS} == Darwin 52.if ${OPSYS} == Darwin
47LDFLAGS+= -flat_namespace 53LDFLAGS+= -flat_namespace
48. if exists(/usr/include/pam/pam_appl.h) 54. if exists(/usr/include/pam/pam_appl.h)
49BUILD_TARGET.Darwin= oxp 55BUILD_TARGET.Darwin= oxp
50. else 56. else
51BUILD_TARGET.Darwin= osx 57BUILD_TARGET.Darwin= osx
52. endif 58. endif
53.endif 59.endif
cvs diff -r1.38 -r1.39 pkgsrc/mail/imap-uw/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/imap-uw/distinfo 2010/01/11 09:26:01 1.38
+++ pkgsrc/mail/imap-uw/distinfo 2010/01/25 23:04:49 1.39
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.38 2010/01/11 09:26:01 tron Exp $ 1$NetBSD: distinfo,v 1.39 2010/01/25 23:04:49 tron Exp $
2 2
3SHA1 (imap-2007e.tar.Z) = 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 3SHA1 (imap-2007e.tar.Z) = 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70
4RMD160 (imap-2007e.tar.Z) = 7d6af203419975f763d7ec17b6a4544c94490b50 4RMD160 (imap-2007e.tar.Z) = 7d6af203419975f763d7ec17b6a4544c94490b50
5Size (imap-2007e.tar.Z) = 2789469 bytes 5Size (imap-2007e.tar.Z) = 2789469 bytes
6SHA1 (patch-aa) = ac880c250dfee3d0d316063ace5b92cd2f190510 6SHA1 (patch-aa) = ac880c250dfee3d0d316063ace5b92cd2f190510
7SHA1 (patch-ab) = 0cfdae5b64f41d45c027483364216b20bc8724b4 7SHA1 (patch-ab) = c7985a2db4d4b5c8d2644492b2e48f8ebe2d64b1
8SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3 8SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3
9SHA1 (patch-ad) = d817dca51413bb8d228c2fabadffa3b924dff11d 9SHA1 (patch-ad) = d817dca51413bb8d228c2fabadffa3b924dff11d
10SHA1 (patch-ae) = 85e0917ce1934f6789bbce45ad5321e28cf294d9 10SHA1 (patch-ae) = 85e0917ce1934f6789bbce45ad5321e28cf294d9
11SHA1 (patch-af) = 38d3d020109076403becf691a8eb288ccabd9f70 11SHA1 (patch-af) = 38d3d020109076403becf691a8eb288ccabd9f70
12SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed 12SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed
13SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75 13SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75
14SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832 14SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832
15SHA1 (patch-aj) = d9edbd39d552b70561c8df8d1d34568cec528cf9 15SHA1 (patch-aj) = d9edbd39d552b70561c8df8d1d34568cec528cf9
16SHA1 (patch-al) = f85551692a8e7e6d7bbdba9aed4850e3a434058b 16SHA1 (patch-al) = f85551692a8e7e6d7bbdba9aed4850e3a434058b
17SHA1 (patch-am) = f0c5d250d69976c85537c9b8080365e8c2391c9d 17SHA1 (patch-am) = f0c5d250d69976c85537c9b8080365e8c2391c9d
18SHA1 (patch-ao) = b23f356cdeaccd996fd2d11b23da265b6b0df49f 18SHA1 (patch-ao) = b23f356cdeaccd996fd2d11b23da265b6b0df49f
19SHA1 (patch-ap) = 3cd56196e6bc770e4398b97ba5a73f724af2a225 19SHA1 (patch-ap) = 3cd56196e6bc770e4398b97ba5a73f724af2a225
20SHA1 (patch-aq) = 33399fb6dd6478d3a89ec1e967b12d93d9a8219b 20SHA1 (patch-aq) = 33399fb6dd6478d3a89ec1e967b12d93d9a8219b
cvs diff -r1.24 -r1.25 pkgsrc/mail/imap-uw/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/mail/imap-uw/patches/patch-ab 2010/01/11 09:26:02 1.24
+++ pkgsrc/mail/imap-uw/patches/patch-ab 2010/01/25 23:04:49 1.25
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ab,v 1.24 2010/01/11 09:26:02 tron Exp $ 1$NetBSD: patch-ab,v 1.25 2010/01/25 23:04:49 tron Exp $
2 2
3--- src/osdep/unix/Makefile.orig 2008-06-04 19:18:34.000000000 +0100 3--- src/osdep/unix/Makefile.orig 2008-06-04 19:18:34.000000000 +0100
4+++ src/osdep/unix/Makefile 2010-01-11 09:17:00.000000000 +0000 4+++ src/osdep/unix/Makefile 2010-01-25 22:56:57.000000000 +0000
5@@ -48,7 +48,7 @@ 5@@ -48,7 +48,7 @@
6 # Try to have some consistency in GCC builds. We want optimization, but we 6 # Try to have some consistency in GCC builds. We want optimization, but we
7 # also want to be able to debug. 7 # also want to be able to debug.
8  8
9-GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer 9-GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer
10+GCCCFLAGS= -pipe -fno-omit-frame-pointer 10+GCCCFLAGS= -pipe -fno-omit-frame-pointer
11 GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign 11 GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
12  12
13  13
14@@ -149,7 +149,7 @@ 14@@ -149,7 +149,7 @@
15  15
16 # Normally no need to change any of these 16 # Normally no need to change any of these
17  17
@@ -19,26 +19,35 @@ $NetBSD: patch-ab,v 1.24 2010/01/11 09:2 @@ -19,26 +19,35 @@ $NetBSD: patch-ab,v 1.24 2010/01/11 09:2
19+ARCHIVE=libc-client.la 19+ARCHIVE=libc-client.la
20 BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \ 20 BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \
21 dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ 21 dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
22 rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ 22 rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
23@@ -529,7 +529,7 @@ 23@@ -529,7 +529,7 @@
24 $(BUILD) `$(CAT) SPECIALS` OS=bsi \ 24 $(BUILD) `$(CAT) SPECIALS` OS=bsi \
25 CRXTYPE=nfs \ 25 CRXTYPE=nfs \
26 SPOOLDIR=/var \ 26 SPOOLDIR=/var \
27- ACTIVEFILE=/var/db/news/active \ 27- ACTIVEFILE=/var/db/news/active \
28+ ACTIVEFILE=/var/news/db/active \ 28+ ACTIVEFILE=/var/news/db/active \
29 RSHPATH=/usr/bin/rsh \ 29 RSHPATH=/usr/bin/rsh \
30 BASECFLAGS="$(GCCCFLAGS)" \ 30 BASECFLAGS="$(GCCCFLAGS)" \
31 BASELDFLAGS="-lcrypt" 31 BASELDFLAGS="-lcrypt"
 32@@ -718,7 +718,7 @@
 33 RSHPATH=/usr/bin/rsh \
 34 BASECFLAGS="-g -O -w" \
 35 BASELDFLAGS="-lsocket -lnsl -lgen" \
 36- RANLIB=true CC=/opt/SUNWspro/bin/cc
 37+ RANLIB=true CC=cc
 38
 39
 40 # Note: It is a long and disgusting story about why cc is set to ucbcc. You
32@@ -855,7 +855,7 @@ 41@@ -855,7 +855,7 @@
33 @$(SH) ARCHIVE 42 @$(SH) ARCHIVE
34  43
35 .c.o: 44 .c.o:
36- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c 45- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
37+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c 46+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
38  47
39  48
40 # Cleanup 49 # Cleanup
41@@ -915,7 +915,7 @@ 50@@ -915,7 +915,7 @@
42 @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL 51 @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
43 @echo is not installed on your system. Either install OpenSSL first 52 @echo is not installed on your system. Either install OpenSSL first
44 @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none 53 @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none