Tue Mar 20 16:34:32 2012 UTC ()
If OPSYS is NetBSD and there is no PAM header in /usr/include, include
pam.buildlink3.mk. This is wrong and a hack, but it gets the package
building again in my test environment. Someone please revert this and
do it right.

Currently there seems to be logic for enabling PAM in the build or not
on various platforms depending on whether native PAM appears to exist.
This is higly bogus; the package should be cleaned up so it either
depends on PAM or doesn't, regardless of platform, or preferably makes
it a build option.

XXX.


(dholland)
diff -r1.134 -r1.135 pkgsrc/mail/imap-uw/Makefile
cvs diff -r1.134 -r1.135 pkgsrc/mail/imap-uw/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/imap-uw/Makefile 2011/01/30 01:33:44 1.134
+++ pkgsrc/mail/imap-uw/Makefile 2012/03/20 16:34:32 1.135
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.134 2011/01/30 01:33:44 markd Exp $ 1# $NetBSD: Makefile,v 1.135 2012/03/20 16:34:32 dholland 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
@@ -59,26 +59,32 @@ BUILD_TARGET.Darwin= osx @@ -59,26 +59,32 @@ BUILD_TARGET.Darwin= osx
59.endif 59.endif
60.if ${OPSYS} == "IRIX" 60.if ${OPSYS} == "IRIX"
61. if ${OS_VERSION} >= 6.5 61. if ${OS_VERSION} >= 6.5
62BUILD_TARGET.IRIX= sg6 62BUILD_TARGET.IRIX= sg6
63. else 63. else
64BUILD_TARGET.IRIX= sgi 64BUILD_TARGET.IRIX= sgi
65. endif 65. endif
66.endif 66.endif
67BUILD_TARGET.OSF1= osf 67BUILD_TARGET.OSF1= osf
68BUILD_TARGET.OpenBSD= bso 68BUILD_TARGET.OpenBSD= bso
69BUILD_TARGET.*= neb 69BUILD_TARGET.*= neb
70MESSAGE_SRC= ${PKGDIR}/MESSAGE 70MESSAGE_SRC= ${PKGDIR}/MESSAGE
71 71
 72# XXX this is not the right approach - should either depend on pam or
 73# not, or make it an option.
 74.if ${OPSYS} == NetBSD && !exists(/usr/include/security/pam_appl.h)
 75.include "../../mk/pam.buildlink3.mk"
 76.endif
 77
72.include "options.mk" 78.include "options.mk"
73 79
74# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf. 80# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf.
75#IMAP_UW_CCLIENT_MBOX_FMT?= unix 81#IMAP_UW_CCLIENT_MBOX_FMT?= unix
76#IMAP_UW_MAILSPOOLHOME?= .Mailbox 82#IMAP_UW_MAILSPOOLHOME?= .Mailbox
77BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME 83BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME
78 84
79CCLIENT_LIB= libc-client.la 85CCLIENT_LIB= libc-client.la
80CCLIENT_PICLIB= libc-client_pic.a 86CCLIENT_PICLIB= libc-client_pic.a
81CCLIENT_MAJOR= 5 87CCLIENT_MAJOR= 5
82CCLIENT_MINOR= 0 88CCLIENT_MINOR= 0
83MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q} 89MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q}
84MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q} 90MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q}