diff options
author | jlam <jlam> | 2004-01-11 07:40:13 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-01-11 07:40:13 +0000 |
commit | 4ff8ccf9db20e9ce9f41d0dcae82c41fe0a76676 (patch) | |
tree | 69bcd4b512aa777a4c59607a1b4112d23953dfd7 /mail | |
parent | a63749c34ff4a9b5c7ebd689a9cb4d9cef327367 (diff) | |
download | pkgsrc-4ff8ccf9db20e9ce9f41d0dcae82c41fe0a76676.tar.gz |
bl3ify
Diffstat (limited to 'mail')
-rw-r--r-- | mail/cyrus-imapd21/Makefile | 14 | ||||
-rw-r--r-- | mail/postfix/Makefile | 20 |
2 files changed, 20 insertions, 14 deletions
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 43f8e3a9c96..e03070075a3 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -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 @@ MAINTAINER= chris@NetBSD.org 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 @@ post-install: ${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 --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 562bab7949b..25b5b0f3ab8 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -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 @@ MAINTAINER= martti@NetBSD.org 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 @@ CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\" 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 @@ MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls .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 @@ CCARGS+= -DNO_PCRE .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 @@ BUILD_DEFS+= POSTFIX_USE_LDAP .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 @@ BUILD_DEFS+= POSTFIX_USE_MYSQL .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 @@ AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ 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}/main.cf ${PKG_SYSCONFDIR}/main.cf 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 |