diff options
author | obache <obache> | 2007-08-19 05:42:35 +0000 |
---|---|---|
committer | obache <obache> | 2007-08-19 05:42:35 +0000 |
commit | 3552fbdf68ef1464564623b7e98ea5ccdfcdf9f8 (patch) | |
tree | f3d21ff8e8248acccec7490167c25030854b26c9 /mail | |
parent | fa5060b0024cddb201cdb89b206e9fbbdde37803 (diff) | |
download | pkgsrc-3552fbdf68ef1464564623b7e98ea5ccdfcdf9f8.tar.gz |
PAM capable Darwin need should use build target "oxp" instead of "osx",
reported in PR 36767.
Also fixed namespace issue reported in PR 35592.
Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/imap-uw/Makefile | 11 | ||||
-rw-r--r-- | mail/imap-uw/buildlink3.mk | 7 |
2 files changed, 15 insertions, 3 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 8c036d26450..07b3e6a1b35 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.120 2007/08/05 18:41:52 tron Exp $ +# $NetBSD: Makefile,v 1.121 2007/08/19 05:42:35 obache Exp $ # # ATTENTION: # The Kerberos support in this software is known to be problematic. If you @@ -11,7 +11,7 @@ DISTNAME= imap-2006j2 PKGNAME= ${DISTNAME:S/-/-uw-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ EXTRACT_SUFX= .tar.Z @@ -39,7 +39,14 @@ BUILD_TARGET.Linux= lnp .else BUILD_TARGET.Linux= slx .endif +.if ${OPSYS} == Darwin +LDFLAGS+= -flat_namespace +. if exists(/usr/include/pam/pam_appl.h) +BUILD_TARGET.Darwin= oxp +. else BUILD_TARGET.Darwin= osx +. endif +.endif .if ${OPSYS} == "IRIX" . if ${OS_VERSION} >= 6.5 BUILD_TARGET.IRIX= sg6 diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk index b6cbf5a90e6..e841ad7453b 100644 --- a/mail/imap-uw/buildlink3.mk +++ b/mail/imap-uw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/08/05 04:51:34 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2007/08/19 05:42:35 obache Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ IMAP_UW_BUILDLINK3_MK:= ${IMAP_UW_BUILDLINK3_MK}+ @@ -11,10 +11,15 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimap-uw} BUILDLINK_PACKAGES+= imap-uw BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imap-uw +.include "../../mk/bsd.fast.prefs.mk" + .if !empty(IMAP_UW_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004 BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2006j2nb1 BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw +. if ${OPSYS} == "Darwin" +BUILDLINK_LDFLAGS.imap-uw+= -flat_namespace +. endif .endif # IMAP_UW_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" |