summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/courier-auth/Makefile9
-rw-r--r--mail/courier-auth/Makefile.authdaemond14
-rw-r--r--mail/courier-auth/Makefile.common7
-rw-r--r--mail/courier-authldap/Makefile6
-rw-r--r--mail/courier-authmysql/Makefile8
-rw-r--r--mail/courier-authpgsql/Makefile10
-rw-r--r--mail/courier-imap/Makefile5
-rw-r--r--mail/courier-maildirmake/Makefile17
-rw-r--r--mail/imap-uw-utils/Makefile9
-rw-r--r--mail/php4-imap/Makefile12
-rw-r--r--mail/sqwebmail/Makefile3
11 files changed, 37 insertions, 63 deletions
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 83e2ebc0767..32f00b3ee08 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/19 09:04:10 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/08 23:15:58 jlam Exp $
PKGNAME= courier-auth-${BASE_VERS}
PKGREVISION?= 1
@@ -8,7 +8,6 @@ COMMENT= authentication modules for Courier mail packages
CONFLICTS= courier-imap<=1.4.0
CONFLICTS+= courier-imap-ldap-*
-USE_BUILDLINK_ONLY= yes
USE_PERL5= yes
REPLACE_PERL= sysconftool
@@ -30,12 +29,6 @@ RCD_SCRIPTS= authdaemond
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
-do-install:
-.for DIR in ${WRKSRC_SUBDIRS}
- @cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${INSTALL_TARGET}
-.endfor
-
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
index b4aaa50119c..960cd72e369 100644
--- a/mail/courier-auth/Makefile.authdaemond
+++ b/mail/courier-auth/Makefile.authdaemond
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.authdaemond,v 1.3 2002/02/05 15:03:19 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.4 2002/10/08 23:15:58 jlam Exp $
.include "../../mail/courier-auth/Makefile.common"
PERL5_REQD= 5.6.0
-BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5?= build
WRKSRC_FILES= config.guess config.sub configure \
install-sh mkinstalldirs
@@ -22,17 +22,13 @@ SYSCONFTOOL= ${PREFIX}/sbin/authdaemon.sysconftool
DISTINFO_FILE= ${.CURDIR}/../../mail/courier-auth/distinfo
PATCHDIR= ${.CURDIR}/../../mail/courier-auth/patches
+BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
+
FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
.if defined(USE_PAM)
BUILD_DEFS+= USE_PAM
-.include "../../security/PAM/buildlink.mk"
+. include "../../security/PAM/buildlink2.mk"
.endif
pre-configure: configure-init
-
-do-build:
-.for DIR in ${WRKSRC_SUBDIRS}
- @cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${ALL_TARGET}
-.endfor
diff --git a/mail/courier-auth/Makefile.common b/mail/courier-auth/Makefile.common
index 9777d45894a..d465dac9956 100644
--- a/mail/courier-auth/Makefile.common
+++ b/mail/courier-auth/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/02/05 15:03:19 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/10/08 23:15:58 jlam Exp $
DISTNAME?= courier-${DIST_VERS}
CATEGORIES+= mail
@@ -26,6 +26,7 @@ EGDIR= ${PREFIX}/share/examples/courier
.include "../../mk/bsd.prefs.mk"
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datadir=${DATADIR}
CONFIGURE_ARGS+= --libexecdir=${LIBEXECDIR}
@@ -53,8 +54,8 @@ CONFIGURE_ARGS+= --without-authpgsql
CONFIGURE_ENV+= EXPECT="${LOCALBASE}/bin/expect"
.if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
-CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2
+. include "../../databases/db/buildlink2.mk"
+CPPFLAGS+= ${BUILDLINK_CPPFLAGS.db}
.endif
configure-init:
diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
index bab6c6edbcb..e08aab18fa9 100644
--- a/mail/courier-authldap/Makefile
+++ b/mail/courier-authldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/01/27 23:47:08 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/08 23:15:59 jlam Exp $
PKGNAME= courier-authldap-${BASE_VERS}
PKGREVISION?= # empty
@@ -8,8 +8,6 @@ CONFLICTS= courier-imap-ldap-[0-9]*
DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
-USE_BUILDLINK_ONLY= yes
-
.include "../../mail/courier-auth/Makefile.authdaemond"
CONFIGURE_ARGS+= --with-authldap
@@ -29,6 +27,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/authlib/authldap.schema ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/authlib/authldaprc ${EGDIR}/authldaprc.dist
-.include "../../databases/openldap/buildlink.mk"
+.include "../../databases/openldap/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
index b02710d857e..b64914ebbfc 100644
--- a/mail/courier-authmysql/Makefile
+++ b/mail/courier-authmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/01/27 23:47:09 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/08 23:15:59 jlam Exp $
PKGNAME= courier-authmysql-${BASE_VERS}
PKGREVISION?= # empty
@@ -6,12 +6,10 @@ COMMENT= Courier MySQL authentication module
DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
-USE_BUILDLINK_ONLY= yes
-
.include "../../mail/courier-auth/Makefile.authdaemond"
CONFIGURE_ARGS+= --with-authmysql
-LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+LDFLAGS+= ${BUILDLINK_LDFLAGS.mysql-client}
GEN_FILES= authmysqlrc
CONF_FILES_PERMS= # empty
@@ -30,6 +28,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/authlib/README.authmysql.html \
${PREFIX}/share/doc/html/courier
-.include "../../databases/mysql-client/buildlink.mk"
+.include "../../databases/mysql-client/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index fe28ceec7ae..9242f25edef 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/01/27 23:47:09 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/08 23:16:00 jlam Exp $
PKGNAME= courier-authpgsql-${BASE_VERS}
PKGREVISION?= # empty
@@ -6,13 +6,11 @@ COMMENT= Courier PostgreSQL authentication module
DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
-USE_BUILDLINK_ONLY= yes
-
.include "../../mail/courier-auth/Makefile.authdaemond"
CONFIGURE_ARGS+= --with-authpgsql
-CONFIGURE_ARGS+= --with-pgsql-includes=${BUILDLINK_DIR}/include/pgsql
-CONFIGURE_ARGS+= --with-pgsql-libs=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+= --with-pgsql-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+CONFIGURE_ARGS+= --with-pgsql-libs=${BUILDLINK_PREFIX.postgresql-lib}/lib
GEN_FILES= authpgsqlrc
CONF_FILES_PERMS= # empty
@@ -38,6 +36,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/authlib/README.authpgsql.html \
${PREFIX}/share/doc/html/courier
-.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 6307d2883c4..b68c3121a52 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/09/19 09:04:11 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/10/08 23:16:00 jlam Exp $
DISTNAME= courier-imap-1.4.2
PKGREVISION= 1
@@ -8,7 +8,6 @@ HOMEPAGE= http://www.inter7.com/courierimap/
DEPENDS+= courier-auth>=0.37.1:../../mail/courier-auth
DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
-USE_BUILDLINK_ONLY= yes
USE_PERL5= yes
REPLACE_PERL= sysconftool
@@ -68,6 +67,6 @@ post-install:
${DOCDIR}/README.imap
cd ${WRKSRC}; ${INSTALL_DATA} imap/imapd.pam imap/pop3d.pam ${EGDIR}
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 4df51971c10..c610d4ad7c2 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/18 21:15:11 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/08 23:16:00 jlam Exp $
PKGNAME= courier-maildirmake-${BASE_VERS}
PKGREVISION?= 1
@@ -7,7 +7,6 @@ COMMENT= Courier Maildir utilities
PERL5_REQD= 5.6.0
USE_PERL5= build
-USE_BUILDLINK_ONLY= yes
REPLACE_PERL= sysconftool
.include "../../mail/courier-auth/Makefile.common"
@@ -21,6 +20,8 @@ WRKSRC_SUBDIRS+= maildir
EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
+BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
+
.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
INSTALL_TARGET= install-strip
.endif
@@ -29,18 +30,6 @@ CONF_FILES= ${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
pre-configure: configure-init
-do-build:
-.for DIR in ${WRKSRC_SUBDIRS}
- @cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${ALL_TARGET}
-.endfor
-
-do-install:
-.for DIR in ${WRKSRC_SUBDIRS}
- @cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${INSTALL_TARGET}
-.endfor
-
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg ${EGDIR}/quotawarnmsg
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index c5bd7392e92..f164ed890b9 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/02 14:38:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/08 23:20:38 jlam Exp $
DISTNAME= imap-utils
PKGNAME= imap-uw-utils-20020102
@@ -12,12 +12,12 @@ COMMENT= UW IMAP mailbox utilities
DIST_SUBDIR= ${PKGNAME}
WRKSRC= ${WRKDIR}
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
SRCDIRS= chkmail dmail icat ifrom imapcopy imapxfer \
mbxcopy mbxcreat mbxcvt tmail
-CFLAGS+= -I${BUILDLINK_DIR}/include/c-client
+CFLAGS+= -I${BUILDLINK_PREFIX.imap-uw}/include/c-client
LIBS+= -lc-client -lssl -lcrypto
do-build:
@@ -37,5 +37,6 @@ do-install:
${LN} -sf imapcopy ${PREFIX}/bin/imapmove
${LN} -sf mbxcopy ${PREFIX}/bin/mbxmove
-.include "../../mail/imap-uw/buildlink.mk"
+.include "../../mail/imap-uw/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index 447b32ae560..07d3c694eb5 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2002/02/28 06:18:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/08 23:22:07 jlam Exp $
MODNAME= imap
CATEGORIES+= mail
PKGREVISION= # empty
COMMENT= PHP4 extension for IMAP (Internet Mailbox Access Protocol)
+USE_BUILDLINK2= # defined
+
.include "../../www/php4/Makefile.module"
-CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_DIR}
-CONFIGURE_ARGS+= --with-${MODNAME}-ssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw}
+CONFIGURE_ARGS+= --with-${MODNAME}-ssl=${SSLBASE}
CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no
LIBS+= -lssl -lcrypto
-.include "../../mail/imap-uw/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../mail/imap-uw/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index c9a738719e8..00a553b563d 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/18 21:15:13 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/08 23:16:01 jlam Exp $
DISTNAME= sqwebmail-3.3.1
CATEGORIES= www
@@ -8,7 +8,6 @@ HOMEPAGE= http://www.inter7.com/sqwebmail/
DEPENDS+= courier-auth>=0.37.1nb1:../../mail/courier-auth
DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
-USE_BUILDLINK_ONLY= yes
USE_PERL5= yes
REPLACE_PERL= sysconftool
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 23:47:57 +0000