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 (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,157 +1,163 @@ @@ -1,157 +1,163 @@
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
15CATEGORIES= mail 15CATEGORIES= mail
16MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ 16MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
17EXTRACT_SUFX= .tar.Z 17EXTRACT_SUFX= .tar.Z
18 18
19MAINTAINER= pkgsrc-users@NetBSD.org 19MAINTAINER= pkgsrc-users@NetBSD.org
20HOMEPAGE= http://www.washington.edu/imap/ 20HOMEPAGE= http://www.washington.edu/imap/
21COMMENT= University of Washington's IMAP, POP2, and POP3 servers 21COMMENT= University of Washington's IMAP, POP2, and POP3 servers
22 22
23PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
24 24
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26MAKE_ENV+= LIBTOOL=libtool 26MAKE_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
54.if ${OPSYS} == "IRIX" 60.if ${OPSYS} == "IRIX"
55. if ${OS_VERSION} >= 6.5 61. if ${OS_VERSION} >= 6.5
56BUILD_TARGET.IRIX= sg6 62BUILD_TARGET.IRIX= sg6
57. else 63. else
58BUILD_TARGET.IRIX= sgi 64BUILD_TARGET.IRIX= sgi
59. endif 65. endif
60.endif 66.endif
61BUILD_TARGET.OSF1= osf 67BUILD_TARGET.OSF1= osf
62BUILD_TARGET.OpenBSD= bso 68BUILD_TARGET.OpenBSD= bso
63BUILD_TARGET.*= neb 69BUILD_TARGET.*= neb
64MESSAGE_SRC= ${PKGDIR}/MESSAGE 70MESSAGE_SRC= ${PKGDIR}/MESSAGE
65 71
66.include "options.mk" 72.include "options.mk"
67 73
68# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf. 74# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf.
69#IMAP_UW_CCLIENT_MBOX_FMT?= unix 75#IMAP_UW_CCLIENT_MBOX_FMT?= unix
70#IMAP_UW_MAILSPOOLHOME?= .Mailbox 76#IMAP_UW_MAILSPOOLHOME?= .Mailbox
71BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME 77BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME
72 78
73CCLIENT_LIB= libc-client.la 79CCLIENT_LIB= libc-client.la
74CCLIENT_PICLIB= libc-client_pic.a 80CCLIENT_PICLIB= libc-client_pic.a
75CCLIENT_MAJOR= 5 81CCLIENT_MAJOR= 5
76CCLIENT_MINOR= 0 82CCLIENT_MINOR= 0
77MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q} 83MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q}
78MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q} 84MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q}
79 85
80EXTRASPECIALS+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto 86EXTRASPECIALS+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto
81 87
82MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q} 88MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q}
83MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q} 89MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q}
84MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q} 90MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q}
85 91
86SUBST_CLASSES+= mbox 92SUBST_CLASSES+= mbox
87SUBST_STAGE.mbox= do-configure 93SUBST_STAGE.mbox= do-configure
88SUBST_FILES.mbox= src/osdep/unix/env_unix.c 94SUBST_FILES.mbox= src/osdep/unix/env_unix.c
89.if defined(IMAP_USE_MAILSPOOLHOME) 95.if defined(IMAP_USE_MAILSPOOLHOME)
90SUBST_SED.mbox= -e 's|@SPOOLDIR@|myhomedir ()|' \ 96SUBST_SED.mbox= -e 's|@SPOOLDIR@|myhomedir ()|' \
91 -e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|' 97 -e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|'
92.else 98.else
93SUBST_SED.mbox= -e 's|@SPOOLDIR@|MAILSPOOL|' \ 99SUBST_SED.mbox= -e 's|@SPOOLDIR@|MAILSPOOL|' \
94 -e 's|@MAILBOX@|myusername ()|' 100 -e 's|@MAILBOX@|myusername ()|'
95.endif 101.endif
96 102
97SUBST_CLASSES+= man 103SUBST_CLASSES+= man
98SUBST_STAGE.man= post-build 104SUBST_STAGE.man= post-build
99SUBST_FILES.man= src/imapd/imapd.8 src/ipopd/ipopd.8 105SUBST_FILES.man= src/imapd/imapd.8 src/ipopd/ipopd.8
100SUBST_SED.man= -e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g" \ 106SUBST_SED.man= -e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g" \
101 -e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g" \ 107 -e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g" \
102 -e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g" \ 108 -e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g" \
103 -e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g" 109 -e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g"
104 110
105INSTALLATION_DIRS+= bin lib libexec sbin \ 111INSTALLATION_DIRS+= bin lib libexec sbin \
106 ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 112 ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
107 113
108# Generate _pic.a library from shared objects. 114# Generate _pic.a library from shared objects.
109post-build: 115post-build:
110 cd ${WRKSRC}/c-client; \ 116 cd ${WRKSRC}/c-client; \
111 ${LIBTOOL} --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo 117 ${LIBTOOL} --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo
112 118
113do-install: install-headers install-lib install-doc 119do-install: install-headers install-lib install-doc
114 ${LTINSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${DESTDIR}${PREFIX}/libexec 120 ${LTINSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${DESTDIR}${PREFIX}/libexec
115 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${DESTDIR}${PREFIX}/libexec 121 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${DESTDIR}${PREFIX}/libexec
116 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${DESTDIR}${PREFIX}/libexec 122 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${DESTDIR}${PREFIX}/libexec
117 ${LTINSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${DESTDIR}${PREFIX}/sbin 123 ${LTINSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${DESTDIR}${PREFIX}/sbin
118 ${LN} -sf ../libexec/imapd ${DESTDIR}${PREFIX}/sbin/rimapd 124 ${LN} -sf ../libexec/imapd ${DESTDIR}${PREFIX}/sbin/rimapd
119 ${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 125 ${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
120 ${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 126 ${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
121 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop2d.8 127 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop2d.8
122 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop3d.8 128 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop3d.8
123 ${LTINSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${DESTDIR}${PREFIX}/bin 129 ${LTINSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${DESTDIR}${PREFIX}/bin
124 ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 130 ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
125 ${LTINSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${DESTDIR}${PREFIX}/bin 131 ${LTINSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${DESTDIR}${PREFIX}/bin
126 ${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 132 ${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
127 ${LTINSTALL_PROGRAM} ${WRKSRC}/mlock/mlock ${DESTDIR}${PREFIX}/bin 133 ${LTINSTALL_PROGRAM} ${WRKSRC}/mlock/mlock ${DESTDIR}${PREFIX}/bin
128 ${LTINSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${DESTDIR}${PREFIX}/bin 134 ${LTINSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${DESTDIR}${PREFIX}/bin
129 ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 135 ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
130 136
131.PHONY: install-headers install-lib install-doc 137.PHONY: install-headers install-lib install-doc
132install-headers: 138install-headers:
133 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/c-client 139 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/c-client
134 ${CAT} ${PKGDIR}/PLIST | \ 140 ${CAT} ${PKGDIR}/PLIST | \
135 while read entry; do \ 141 while read entry; do \
136 case "$$entry" in \ 142 case "$$entry" in \
137 include/c-client/*) \ 143 include/c-client/*) \
138 src="${WRKSRC}/c-client/`${BASENAME} $$entry`"; \ 144 src="${WRKSRC}/c-client/`${BASENAME} $$entry`"; \
139 dest="${DESTDIR}${PREFIX}/$$entry"; \ 145 dest="${DESTDIR}${PREFIX}/$$entry"; \
140 ${INSTALL_DATA} $$src $$dest; \ 146 ${INSTALL_DATA} $$src $$dest; \
141 esac; \ 147 esac; \
142 done 148 done
143 149
144install-lib: 150install-lib:
145 ${LTINSTALL_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${DESTDIR}${PREFIX}/lib 151 ${LTINSTALL_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${DESTDIR}${PREFIX}/lib
146 ${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${DESTDIR}${PREFIX}/lib 152 ${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${DESTDIR}${PREFIX}/lib
147 ${RANLIB} ${DESTDIR}${PREFIX}/lib/${CCLIENT_PICLIB} 153 ${RANLIB} ${DESTDIR}${PREFIX}/lib/${CCLIENT_PICLIB}
148 154
149DOCDIR= ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 155DOCDIR= ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
150install-doc: 156install-doc:
151 ${INSTALL_DATA_DIR} ${DOCDIR} 157 ${INSTALL_DATA_DIR} ${DOCDIR}
152 ${CP} -R ${WRKSRC}/docs/* ${DOCDIR} 158 ${CP} -R ${WRKSRC}/docs/* ${DOCDIR}
153 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR} 159 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
154 ${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} 160 ${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
155 ${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 161 ${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
156 162
157.include "../../mk/bsd.pkg.mk" 163.include "../../mk/bsd.pkg.mk"
cvs diff -r1.38 -r1.39 pkgsrc/mail/imap-uw/distinfo (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,37 +1,37 @@ @@ -1,37 +1,37 @@
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
21SHA1 (patch-ar) = 32f3347697566439b059811be955dc2d3f56cd74 21SHA1 (patch-ar) = 32f3347697566439b059811be955dc2d3f56cd74
22SHA1 (patch-as) = d07e37e0789251e703805e4d120f6df86d6f5852 22SHA1 (patch-as) = d07e37e0789251e703805e4d120f6df86d6f5852
23SHA1 (patch-at) = 05688f632966a7ccbe0739bff502a5c27dc88818 23SHA1 (patch-at) = 05688f632966a7ccbe0739bff502a5c27dc88818
24SHA1 (patch-au) = 5f0137f593a0fb3936d3f54310d3fb430d6f7681 24SHA1 (patch-au) = 5f0137f593a0fb3936d3f54310d3fb430d6f7681
25SHA1 (patch-av) = 3851cbacd805dad0c16ba7ce19879d4f3f299275 25SHA1 (patch-av) = 3851cbacd805dad0c16ba7ce19879d4f3f299275
26SHA1 (patch-aw) = 4aa5b487426ed583ad137c58e117247b52fef494 26SHA1 (patch-aw) = 4aa5b487426ed583ad137c58e117247b52fef494
27SHA1 (patch-ax) = 0edac03adc6f80102d6063170123b1d1b304cde9 27SHA1 (patch-ax) = 0edac03adc6f80102d6063170123b1d1b304cde9
28SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f 28SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f
29SHA1 (patch-az) = 706c9e8ae56b92f2ce148ff0fd08f002f8be4ae5 29SHA1 (patch-az) = 706c9e8ae56b92f2ce148ff0fd08f002f8be4ae5
30SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c 30SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c
31SHA1 (patch-bb) = b6b5a5294019c23376187b4ff324bf58fdbc113e 31SHA1 (patch-bb) = b6b5a5294019c23376187b4ff324bf58fdbc113e
32SHA1 (patch-bc) = ae0119037fee2e94c6b60de3c9efc946ed4cfb68 32SHA1 (patch-bc) = ae0119037fee2e94c6b60de3c9efc946ed4cfb68
33SHA1 (patch-bd) = 303a47372f9fdd6fd57fae9d3073e40620dc98f4 33SHA1 (patch-bd) = 303a47372f9fdd6fd57fae9d3073e40620dc98f4
34SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54 34SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54
35SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537 35SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537
36SHA1 (patch-bg) = c95483ed73d7c6015df99967c0509cf0ea67d28f 36SHA1 (patch-bg) = c95483ed73d7c6015df99967c0509cf0ea67d28f
37SHA1 (patch-bh) = c43dc5df9fb61ea44b5195fc15c697e5f540dfae 37SHA1 (patch-bh) = c43dc5df9fb61ea44b5195fc15c697e5f540dfae
cvs diff -r1.24 -r1.25 pkgsrc/mail/imap-uw/patches/patch-ab (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,58 +1,67 @@ @@ -1,58 +1,67 @@
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
18-ARCHIVE=c-client.a 18-ARCHIVE=c-client.a
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
45- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c 54- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
46+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c 55+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
47  56
48 osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c 57 osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
49 $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c 58 $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
50@@ -968,7 +968,7 @@ 59@@ -968,7 +968,7 @@
51 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \ 60 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
52 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS 61 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
53 echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS 62 echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
54- echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE 63- echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
55+ echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE 64+ echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE
56 echo $(OS) > OSTYPE 65 echo $(OS) > OSTYPE
57 ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy 66 ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
58 ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS) 67 ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)