[pkgsrc/trunk]: pkgsrc/mail bl3ify

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a6d6f3cade2
branches:  trunk
changeset: 466080:5a6d6f3cade2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 11 07:40:13 2004 +0000

description:
bl3ify

diffstat:

 mail/cyrus-imapd21/Makefile |  14 ++++++++------
 mail/postfix/Makefile       |  20 ++++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diffs (121 lines):

diff -r 837745cd684a -r 5a6d6f3cade2 mail/cyrus-imapd21/Makefile
--- a/mail/cyrus-imapd21/Makefile       Sun Jan 11 06:55:00 2004 +0000
+++ b/mail/cyrus-imapd21/Makefile       Sun Jan 11 07:40:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/10 15:20:37 chris Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/11 07:40:55 jlam Exp $
 
 DISTNAME=              cyrus-imapd-2.1.15
 PKGREVISION=           2
@@ -11,7 +11,9 @@
 HOMEPAGE=              http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=               Cyrus IMAP server
 
-USE_BUILDLINK2=                YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         YES
 PERL5_CONFIGURE=       NO
 AUTOCONF_REQD=         2.13
@@ -133,11 +135,11 @@
                ${INSTALL_DATA} $$file ${HTMLDIR};                      \
        done
 
-.include "../../databases/db3/buildlink2.mk"
+.include "../../databases/db3/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl2/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
 
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 837745cd684a -r 5a6d6f3cade2 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Sun Jan 11 06:55:00 2004 +0000
+++ b/mail/postfix/Makefile     Sun Jan 11 07:40:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2003/12/18 03:37:17 grant Exp $
+# $NetBSD: Makefile,v 1.112 2004/01/11 07:40:13 jlam Exp $
 
 DISTNAME=      postfix-2.0.16
 CATEGORIES=    mail
@@ -9,7 +9,9 @@
 HOMEPAGE=      http://www.postfix.org/
 COMMENT=       Postfix SMTP server and tools
 
-USE_BUILDLINK2=        yes
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=        yes
 USE_PKGINSTALL=        yes
 
 PKG_SYSCONFSUBDIR=     postfix
@@ -29,7 +31,7 @@
 FIX_RPATH+=    AUXLIBS
 
 .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-.  include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
 PATCHFILES+=           tls+ipv6-1.18a-pf-2.0.16.patch.gz
 PATCH_SITES+=          ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.18/
 PATCH_DIST_STRIP=      -p1
@@ -46,7 +48,7 @@
 .endif
 
 .if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
-.  include "../../devel/pcre/buildlink2.mk"
+.  include "../../devel/pcre/buildlink3.mk"
 CCARGS+=       -DHAS_PCRE
 AUXLIBS+=      -L${BUILDLINK_PREFIX.pcre}/lib                          \
                -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib           \
@@ -57,7 +59,7 @@
 .endif
 
 .if defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"
-.  include "../../databases/openldap/buildlink2.mk"
+.  include "../../databases/openldap/buildlink3.mk"
 CCARGS+=       -DHAS_LDAP
 AUXLIBS+=      -L${BUILDLINK_PREFIX.openldap}/lib                      \
                -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib       \
@@ -66,7 +68,7 @@
 .endif
 
 .if defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
-.  include "../../databases/mysql-client/buildlink2.mk"
+.  include "../../databases/mysql-client/buildlink3.mk"
 CCARGS+=       -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 AUXLIBS+=      -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql            \
                -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql     \
@@ -76,7 +78,7 @@
 
 .if defined(USE_SASL2) && ${USE_SASL2} == "YES"
 USING_SASL=YES
-.  include "../../security/cyrus-sasl2/buildlink2.mk"
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
 CCARGS+=       -DUSE_SASL2_AUTH
 AUXLIBS+=      -L${BUILDLINK_PREFIX.cyrus-sasl}/lib                    \
                -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib     \
@@ -84,7 +86,7 @@
 BUILD_DEFS+=   USE_SASL2
 .elif defined(USE_SASL) && ${USE_SASL} == "YES"
 USING_SASL=YES
-.  include "../../security/cyrus-sasl/buildlink2.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 CCARGS+=       -DUSE_SASL_AUTH
 AUXLIBS+=      -L${BUILDLINK_PREFIX.cyrus-sasl}/lib                    \
                -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib     \
@@ -121,8 +123,10 @@
 CONF_FILES+=   ${SHAREDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf
 .if defined(USING_SASL)
 .  if defined(USE_SASL2)
+MAKE_DIRS+=    ${PREFIX}/lib/sasl2
 CONF_FILES+=   ${SHAREDIR}/smtpd.conf  ${PREFIX}/lib/sasl2/smtpd.conf
 .  else
+MAKE_DIRS+=    ${PREFIX}/lib/sasl
 CONF_FILES+=   ${SHAREDIR}/smtpd.conf  ${PREFIX}/lib/sasl/smtpd.conf
 .  endif
 .endif