summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/balsa2/Makefile6
-rw-r--r--mail/bmf/Makefile4
-rw-r--r--mail/clamav/Makefile7
-rw-r--r--mail/clamsmtp/Makefile4
-rw-r--r--mail/coolmail/Makefile4
-rw-r--r--mail/courier-imap/Makefile4
-rw-r--r--mail/cucipop/Makefile8
-rw-r--r--mail/cyrus-imapd/Makefile10
-rw-r--r--mail/cyrus-imapd21/Makefile6
-rw-r--r--mail/dbmail/Makefile4
-rw-r--r--mail/distribute/Makefile6
-rw-r--r--mail/dk-milter/Makefile4
-rw-r--r--mail/dkim-milter/Makefile4
-rw-r--r--mail/dovecot/hacks.mk4
-rw-r--r--mail/drac/Makefile8
-rw-r--r--mail/dspam/Makefile8
-rw-r--r--mail/elm-me/Makefile6
-rw-r--r--mail/elmo/Makefile5
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--mail/exim-html/Makefile6
-rw-r--r--mail/exim/Makefile8
-rw-r--r--mail/exim3/Makefile8
-rw-r--r--mail/exmh/Makefile4
-rw-r--r--mail/faces/Makefile6
-rw-r--r--mail/imap-uw/Makefile6
-rw-r--r--mail/imp4/Makefile6
-rw-r--r--mail/ja-mh/Makefile13
-rw-r--r--mail/ja-mh/distinfo4
-rw-r--r--mail/ja-mh/patches/patch-av4
-rw-r--r--mail/ja-squirrelmail/Makefile4
-rw-r--r--mail/kbiff/Makefile4
-rw-r--r--mail/libesmtp/buildlink3.mk6
-rw-r--r--mail/libetpan/Makefile4
-rw-r--r--mail/mailagent/Makefile15
-rw-r--r--mail/mailcrypt/Makefile4
-rw-r--r--mail/mailgraph/Makefile6
-rw-r--r--mail/mailman/Makefile15
-rw-r--r--mail/mailscanner/Makefile12
-rw-r--r--mail/mailserv/Makefile6
-rw-r--r--mail/mailsync/Makefile4
-rw-r--r--mail/mailwrapper/Makefile6
-rw-r--r--mail/mairix/Makefile4
-rw-r--r--mail/majordomo/Makefile6
-rw-r--r--mail/metamail/Makefile4
-rw-r--r--mail/mew/Makefile8
-rw-r--r--mail/mew3/Makefile8
-rw-r--r--mail/mimedefang/Makefile8
-rw-r--r--mail/mutt-devel/Makefile6
-rw-r--r--mail/mutt/Makefile6
-rw-r--r--mail/nmh/Makefile9
-rw-r--r--mail/nullmailer/Makefile18
-rw-r--r--mail/oe2mbx/Makefile8
-rw-r--r--mail/offlineimap/Makefile4
-rw-r--r--mail/pfqueue/Makefile4
-rw-r--r--mail/php-imap/Makefile5
-rw-r--r--mail/pine/distinfo4
-rw-r--r--mail/pine/patches/patch-ad4
-rw-r--r--mail/popa3d/Makefile6
-rw-r--r--mail/postfix-current/Makefile9
-rw-r--r--mail/postfix/Makefile9
-rw-r--r--mail/postgrey/Makefile9
-rw-r--r--mail/prayer/Makefile12
-rw-r--r--mail/procmail/Makefile4
-rw-r--r--mail/pymsgauth/Makefile4
-rw-r--r--mail/qmail-run/Makefile6
-rw-r--r--mail/qmail/Makefile12
-rw-r--r--mail/qmail/options.mk4
-rw-r--r--mail/ripmime/Makefile4
-rw-r--r--mail/rmail-mime/Makefile6
-rw-r--r--mail/sendmail/Makefile6
-rw-r--r--mail/sendmail/Makefile.common8
-rw-r--r--mail/sendmail812/Makefile.common8
-rw-r--r--mail/smtpfeed/Makefile4
-rw-r--r--mail/spamassassin/Makefile6
-rw-r--r--mail/spamd/Makefile4
-rw-r--r--mail/squirrelmail/Makefile4
-rw-r--r--mail/squirrelmail/plugin.mk4
-rw-r--r--mail/sqwebmail/Makefile4
-rw-r--r--mail/sylpheed-claws/plugins.mk4
-rw-r--r--mail/tmda/Makefile12
-rw-r--r--mail/turba/Makefile4
-rw-r--r--mail/vm/Makefile10
-rw-r--r--mail/wl/Makefile4
-rw-r--r--mail/xmailbox/Makefile6
-rw-r--r--mail/yatsvrs/Makefile8
85 files changed, 266 insertions, 278 deletions
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 0e3a0585b1c..5edc6f89fc1 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:19 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:28 rillig Exp $
DISTNAME= balsa-2.2.6
PKGREVISION= 2
@@ -20,11 +20,11 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake perl pkg-config
-CONFIGURE_ARGS= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
+CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme:Q}/bin/gpgme-config
CONFIGURE_ARGS+= --disable-more-warnings
CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --enable-pcre
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes
EGDIR= ${PREFIX}/share/examples/balsa
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index 9b7da3e2e9b..952bd85b24c 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/24 23:07:49 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:28 rillig Exp $
#
DISTNAME= bmf-0.9.4
@@ -12,6 +12,6 @@ COMMENT= Self contained and extremely efficient Bayesian mail filter
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --without-mysql
-MAKE_ENV+= DESTDIR=${PREFIX} BINDIR=/bin MANDIR=/man
+MAKE_ENV+= DESTDIR=${PREFIX:Q} BINDIR=/bin MANDIR=/man
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 63fc7eaab9a..ecf82ee0d6f 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/11/04 03:47:49 grant Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/05 20:50:28 rillig Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP
-FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER}
+FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q}
MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER}
USE_PKGINSTALL= yes
@@ -39,7 +39,7 @@ PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\ User
VIRUSDBDIR= ${VARBASE}/clamav
EGDIR= ${PREFIX}/share/examples/clamav
-FILES_SUBST+= VIRUSDBDIR=${VIRUSDBDIR}
+FILES_SUBST+= VIRUSDBDIR=${VIRUSDBDIR:Q}
OWN_DIRS_PERMS= ${VIRUSDBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
CONF_FILES= # empty
@@ -51,7 +51,6 @@ CONF_FILES+= ${EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
CONF_FILES_PERMS+= ${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_} \
${CLAMAV_USER} ${CLAMAV_GROUP} 0664
.endfor
-.undef _file_
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index cfc136e7f02..39eff47c9db 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/02 08:48:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:28 rillig Exp $
DISTNAME= clamsmtp-1.6
CATEGORIES= mail
@@ -15,7 +15,7 @@ USE_PKGINSTALL= yes
RCD_SCRIPTS= clamsmtpd
MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE}
-FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER}
+FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q}
# Doesn't work with GNU pth (missing required mutex features)
PTHREAD_OPTS+= require native
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index bf09aa3bdf0..f70458db6aa 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/07 21:17:07 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:29 rillig Exp $
DISTNAME= coolmail-1.3
PKGREVISION= 1
@@ -14,7 +14,7 @@ EXTRA_LIBS.*= -lcompat
EXTRA_LIBS.Interix= -lSM
EXTRA_LIBS.IRIX= # empty
MAKE_ENV+= EXTRA_LIBS=${EXTRA_LIBS:Q}
-MAKE_ENV+= X11BASE=${PREFIX}
+MAKE_ENV+= X11BASE=${PREFIX:Q}
USE_X11BASE= yes
.include "../../mk/x11.buildlink3.mk"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 593655adbb6..cb85576f192 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/11/11 07:33:05 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:29 rillig Exp $
DISTNAME= courier-imap-4.0.6
CATEGORIES= mail
@@ -32,7 +32,7 @@ INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
GEN_FILES= imapd imapd-ssl pop3d pop3d-ssl
SSLCNF_FILES= imapd.cnf pop3d.cnf
-FILES_SUBST+= SSLCERTS=${SSLCERTS}
+FILES_SUBST+= SSLCERTS=${SSLCERTS:Q}
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
USE_PKGINSTALL= yes
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 2f9c69c7d73..7a21d713931 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= cucipop-1.31
@@ -17,8 +17,8 @@ USE_PKGINSTALL= YES
LICENSE= cucipop-license
-MAKE_ENV+= ROOT_USER="${ROOT_USER}"
-MAKE_ENV+= ROOT_GROUP="${ROOT_GROUP}"
+MAKE_ENV+= ROOT_USER=${ROOT_USER:Q}
+MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP:Q}
REQD_DIRS+= ${PREFIX}/share/cucipop/bulletins
SPECIAL_PERMS+= ${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2755
@@ -32,7 +32,7 @@ PKG_SUPPORTED_OPTIONS= db inet6
.if !empty(PKG_OPTIONS:Mdb)
BDB_ACCEPTED= db2
CFLAGS+= -DUSE_DB
-MAKE_ENV+= LIBS=${BDB_LIBS}
+MAKE_ENV+= LIBS=${BDB_LIBS:Q}
. include "../../mk/bdb.buildlink3.mk"
.endif
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index e868aa8237f..65641bd6994 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/08/08 16:50:59 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2005/12/05 20:50:29 rillig Exp $
DISTNAME= cyrus-imapd-2.2.12
PKGREVISION= 2
@@ -27,8 +27,8 @@ CYRUS_USER?= cyrus
CYRUS_GROUP?= mail
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
-FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP}
+FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
+FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER}
@@ -106,7 +106,7 @@ PLIST_SUBST+= IDLED=
PLIST_SUBST+= IDLED="@comment "
.endif
-MAKE_ENV+= PERL=${PERL5}
+MAKE_ENV+= PERL=${PERL5:Q}
HTMLDIR= ${PREFIX}/share/doc/html/cyrus-imapd
EGDIR= ${PREFIX}/share/examples/cyrus-imapd
@@ -125,7 +125,7 @@ PERL5_PACKLIST= \
.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE}
+CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE:Q}
# Only imap/mupdate needs to be build with pthreads support, so selectively
# enable it via patches for just that one program.
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 491b24dd0fa..49522ffc666 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:29 rillig Exp $
DISTNAME= cyrus-imapd-2.1.18
SVR4_PKGNAME= cimap
@@ -29,8 +29,8 @@ CYRUS_USER?= cyrus
CYRUS_GROUP?= mail
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
-FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP}
+FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
+FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER}
CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP}
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 160abaa3c30..295c4c0ea64 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= dbmail-2.0.1
@@ -21,7 +21,7 @@ EGDIR= ${PREFIX}/share/examples/dbmail
CONF_FILES= ${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf
RCD_SCRIPTS= dbmail dbmailimapd dbmaillmtpd dbmailpop3d
-PLIST_SUBST+= SQLDB=${SQLDB}
+PLIST_SUBST+= SQLDB=${SQLDB:Q}
SUBST_CLASSES+= sysconf
SUBST_STAGE.sysconf= do-configure
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 3974a40fa19..c1b90ed7c7c 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/08 13:25:38 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:29 rillig Exp $
DISTNAME= distribute-2.1-pl19
PKGNAME= distribute-2.1.26
@@ -35,8 +35,8 @@ MAKE_ENV+= DEFAULTCONFIG='-DDEF_SEQ_PATH="\"${MAILINGLIST_DIR}\"" \
-DDEF_MAJORDOMO_RECIPIENT_PATH="\"${MAJORDOMO_LIST_DIR}\"" \
-DDEF_DOMAINNAME="\"${DEF_DOMAINNAME}\"" \
-DDEF_ARCHIVE_PATH="\"${ARCHIVE_DIR}\""' \
- INSTALL="${INSTALL}" \
- INSTALL_MAN="${INSTALL_MAN}"
+ INSTALL=${INSTALL:Q} \
+ INSTALL_MAN=${INSTALL_MAN:Q}
pre-build:
${TOUCH} ${WRKSRC}/logging.h ${WRKSRC}/strsep.c
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 4694179d72f..f89dcf8beae 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:22:04 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:29 rillig Exp $
DISTNAME= dk-milter-0.3.0
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Open source implementation of DomainKeys for sendmail
BUILDLINK_DEPENDS.libmilter+= libmilter>=8.13.0
LICENSE= no-profit
-MAKE_ENV+= M4="${M4}"
+MAKE_ENV+= M4=${M4:Q}
RCD_SCRIPTS= dk-milter
USE_BUILTIN.libmilter= no
USE_TOOLS+= gm4
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index d9d157990cc..96d5eee0d3d 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:29 rillig Exp $
DISTNAME= dkim-milter-0.1.1
CATEGORIES= mail
@@ -11,7 +11,7 @@ COMMENT= Open source DKIM filter software from Sendmail, Inc
BUILDLINK_DEPENDS.libmilter+= libmilter>=8.13.0
LICENSE= no-profit
-MAKE_ENV+= M4="${M4}"
+MAKE_ENV+= M4=${M4:Q}
RCD_SCRIPTS= dkim-milter
USE_BUILTIN.libmilter= no
USE_TOOLS+= gm4
diff --git a/mail/dovecot/hacks.mk b/mail/dovecot/hacks.mk
index 454b2c7dba2..f397b35e85f 100644
--- a/mail/dovecot/hacks.mk
+++ b/mail/dovecot/hacks.mk
@@ -1,9 +1,9 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/08 19:58:16 schmonz Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:29 rillig Exp $
.include "../../mk/compiler.mk"
# Avoid an ICE in gcc2 on sparc64
.if !empty(CC_VERSION:Mgcc-*)
PKG_HACKS+= sparc64-gcc2-ice
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.endif
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 7b408596773..0aad23db867 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= drac
@@ -14,9 +14,9 @@ COMMENT= Dynamic Relay Authorization Control
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
-MAKE_ENV+= MKDIR="${MKDIR}"
-MAKE_ENV+= INSTALL="${INSTALL}"
-MAKE_ENV+= RANLIB="${RANLIB}"
+MAKE_ENV+= MKDIR=${MKDIR:Q}
+MAKE_ENV+= INSTALL=${INSTALL:Q}
+MAKE_ENV+= RANLIB=${RANLIB:Q}
MAKE_ENV+= EBIN="${LOCALBASE}/libexec"
MAKE_ENV+= MAN="${LOCALBASE}/man/man"
MAKE_ENV+= EXAMPLES="${LOCALBASE}/share/examples/drac"
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index c5c32f10daa..b8728b6d92e 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/12/02 08:10:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:29 rillig Exp $
DISTNAME= dspam-3.6.2
CATEGORIES= mail
@@ -97,9 +97,9 @@ OWN_DIRS_PERMS= ${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_WWWGROUP} 0775
OWN_DIRS_PERMS+= ${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775
OWN_DIRS_PERMS+= ${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0770
-FILES_SUBST+= DSPAM_USER=${DSPAM_USER}
-FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP}
-FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR}
+FILES_SUBST+= DSPAM_USER=${DSPAM_USER:Q}
+FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP:Q}
+FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR:Q}
SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 9b5d97437c3..b7eee4f2490 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/20 19:13:58 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:29 rillig Exp $
DISTNAME= elm-2.4ME+93
PKGNAME= elm-me-2.4.93
@@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/elm2.4.ME+.93
USE_PKGINSTALL= YES
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ksh ./Configure
-CONFIGURE_ENV= PREFIX="${PREFIX}" RUN_AS_BATCH=yes
-CONFIGURE_ARGS= -S
+CONFIGURE_ENV+= PREFIX=${PREFIX:Q} RUN_AS_BATCH=yes
+CONFIGURE_ARGS+= -S
INSTALL_DIRS= ${WRKSRC} ${WRKSRC}/nls
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 5f712a0c53b..4e0b652559b 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/08/29 17:53:49 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:29 rillig Exp $
#
DISTNAME= elmo-1.3.2
-PKGREVISION= # empty
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=elmo/}
@@ -20,7 +19,7 @@ CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
# I get segmentation faults when not compiled with debug enabled
CONFIGURE_ARGS+= --enable-debug
-SUBST_CLASSES= tux
+SUBST_CLASSES+= tux
SUBST_STAGE.tux= post-patch
SUBST_FILES.tux= configure
SUBST_SED.tux= -e "s|==|=|"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 66954818c67..8bb2defd927 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/12/04 09:09:47 hira Exp $
+# $NetBSD: Makefile,v 1.95 2005/12/05 20:50:29 rillig Exp $
DISTNAME= evolution-2.4.1
PKGREVISION= 1
@@ -24,7 +24,7 @@ PKG_SUPPORTED_OPTIONS= inet6 krb4 krb5 ssl
# function name conflicts with libsoftokn3 provided by Mozilla NSS. These
# cause runtime crashes, so don't allow these options to be specified
# together.
-PKG_FAIL_REASON= "Kerberos support conflicts with SSL"
+PKG_FAIL_REASON+= "Kerberos support conflicts with SSL"
.endif
GNU_CONFIGURE= YES
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index f49c7a7a833..3612af7e1be 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/17 17:06:12 abs Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exim-html-4.50
CATEGORIES= mail net
@@ -11,8 +11,8 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.exim.org/
COMMENT= HTML documentation for the Exim mail transfer agent
-NO_CONFIGURE=
-NO_BUILD=
+NO_CONFIGURE= yes
+NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/exim
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 6232247875b..75e2bdcfe31 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2005/10/16 14:10:57 abs Exp $
+# $NetBSD: Makefile,v 1.71 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exim-4.54
PKGREVISION= 1
@@ -18,12 +18,12 @@ USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
MAKE_ENV+= SSLBASE=${SSLBASE:Q}
-MAKE_ENV+= INST_CHOWN=${CHOWN}
+MAKE_ENV+= INST_CHOWN=${CHOWN:Q}
MAKE_FLAGS+= FULLECHO=''
.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS= EXIM_USER EXIM_GROUP EXIM_DB
+BUILD_DEFS+= EXIM_USER EXIM_GROUP EXIM_DB
PKG_GROUPS= ${EXIM_GROUP}
PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:${VARBASE}/mail:${NOLOGIN}
@@ -33,7 +33,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/exim
CONF_FILES= ${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
CONF_FILES+= ${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
MESSAGE_SUBST+= EXAMPLESDIR="${EXAMPLESDIR}"
-PLIST_SUBST+= DISTNAME="${DISTNAME}"
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
RCD_SCRIPTS= exim
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index aabeab82e7d..ed7998702fe 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/23 11:48:48 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exim-3.36
PKGREVISION= 4
@@ -36,7 +36,7 @@ PKG_GROUPS= ${EXIM_GROUP}
USE_TOOLS+= gzip gzcat perl:run
FILES_SUBST+= GZIP_CMD="${GZIP_CMD:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"
-FILES_SUBST+= GZCAT="${GZCAT}"
+FILES_SUBST+= GZCAT=${GZCAT:Q}
_LOOKUP_LIBS+= ${LDFLAGS}
@@ -61,8 +61,8 @@ BDB_ACCEPTED= db1 db3 db2 # does not compile with db4
DBMLIB+= ${LDFLAGS} ${BDB_LIBS}
MAKE_ENV+= DBMLIB=${DBMLIB:Q}
-MAKE_ENV+= LOOKUP_INCLUDE="${LOOKUP_INCLUDE}"
-MAKE_ENV+= LOOKUP_LIBS="${LOOKUP_LIBS}"
+MAKE_ENV+= LOOKUP_INCLUDE=${LOOKUP_INCLUDE:Q}
+MAKE_ENV+= LOOKUP_LIBS=${LOOKUP_LIBS:Q}
pre-patch:
${MKDIR} ${WRKSRC}/Local
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index f271aeab360..343f9bf2c34 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:30 rillig Exp $
DISTNAME= exmh-2.6.3
CATEGORIES= mail tk
@@ -14,7 +14,7 @@ DEPENDS+= metamail>=2.7:../../mail/metamail
.include "../../mk/bsd.prefs.mk"
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}
WISH= wish
TCLSH= tclsh
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 4855cb43ef8..f21333f0340 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/09/29 14:29:26 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:31 rillig Exp $
DISTNAME= faces-1.6.1
PKGREVISION= 3
@@ -23,8 +23,8 @@ USE_X11BASE= YES
USE_LIBTOOL= YES
USE_TOOLS+= perl:run
-MAKE_FLAGS+= PREFIX="${PREFIX}"
-MAKE_FLAGS+= CCOMP="${CFLAGS}"
+MAKE_FLAGS+= PREFIX=${PREFIX:Q}
+MAKE_FLAGS+= CCOMP=${CFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index cb9778e3375..a3f88d32126 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2005/11/24 19:04:34 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2005/12/05 20:50:31 rillig Exp $
#
# ATTENTION:
# The Kerberos support in this software is known to be problematic. If you
@@ -83,8 +83,8 @@ BUILD_TARGET+= EXTRACFLAGS="${CFLAGS}"
. if ${MACHINE_ARCH} == "alpha"
CPPFLAGS:= ${CPPFLAGS:C/-O[0-9]*/-O/g}
CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q}
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
. endif
.endif
diff --git a/mail/imp4/Makefile b/mail/imp4/Makefile
index 91add70ed64..6ffb5fca563 100644
--- a/mail/imp4/Makefile
+++ b/mail/imp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/18 12:38:11 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:32 rillig Exp $
DISTNAME= imp-h3-${IMPVER}
PKGNAME= imp-${IMPVER}
@@ -58,7 +58,7 @@ CONF_FILES_PERMS+= ${IMPDIR}/config/trailer.txt.dist \
${IMPDIR}/config/trailer.txt \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUBST_CLASSES= files
+SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
SUBST_FILES.files= imp.conf.dist
SUBST_SED.files= -e "s|@IMPDIR@|${IMPDIR}|g"
@@ -84,12 +84,10 @@ do-install:
. for d in ${PAXDIRS}
${INSTALL_DATA_DIR} ${IMPDIR}/${d}
. endfor
-. undef d
. for d in ${PAXDIRS}
cd ${WRKSRC}/${d} && ${PAX} -rw . ${IMPDIR}/${d}
. endfor
-. undef d
${INSTALL_DATA} ${WRKSRC}/config/*.dist ${IMPDIR}/config
${INSTALL_DATA} ${WRKSRC}/*.php ${IMPDIR}
diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile
index 39919e69133..363c26fa458 100644
--- a/mail/ja-mh/Makefile
+++ b/mail/ja-mh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/07 18:42:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:32 rillig Exp $
DISTNAME= mh-6.8.4-JP-3.05
PKGNAME= ja-mh6-3.05
@@ -16,7 +16,7 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://www.chem.eng.himeji-tech.ac.jp/mh-plus/
COMMENT= Rand MH mail handling system + Japanese patches
-DEPENDS= ja-less>=332:../../misc/ja-less
+DEPENDS+= ja-less>=332:../../misc/ja-less
CONFLICTS= nmh-[0-9]* ja-mh-*_JP_*
@@ -24,10 +24,11 @@ CONFLICTS= nmh-[0-9]* ja-mh-*_JP_*
MANCOMPRESSED= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-batchmode \
- --libexecdir=${PREFIX}/libexec/mh \
- --enable-jmandir=${PREFIX}/${PKGMANDIR}/ja_JP.EUC \
- --enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
+CONFIGURE_ARGS+= --enable-batchmode
+CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec/mh
+CONFIGURE_ARGS+= --enable-jmandir=${PREFIX:Q}/${PKGMANDIR:Q}/ja_JP.EUC
+CONFIGURE_ARGS+= --enable-apop=${PREFIX:Q}/etc/pop.auth
+CONFIGURE_ARGS+= --enable-rpop
post-install:
${LN} -sf libmh.so.3.2 ${PREFIX}/lib/libmh.so.3
diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
index 90471589e99..eb08dcb145c 100644
--- a/mail/ja-mh/distinfo
+++ b/mail/ja-mh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/03/17 09:09:36 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/12/05 20:50:32 rillig Exp $
SHA1 (mh-6.8.4-JP-3.05.tar.gz) = cb531f80be4326cd56d33d6fa9efba4d2d63d0ce
RMD160 (mh-6.8.4-JP-3.05.tar.gz) = a092a9447370a09f770121baa2ae7eced130ff0f
@@ -20,5 +20,5 @@ SHA1 (patch-al) = 59bd51d6b67beb0492b3a3d3acc05242474bac7b
SHA1 (patch-as) = 786c7bf7988806023d9fd5a2ced5a9d31550ff54
SHA1 (patch-at) = 5594d3beac4e911cfa3ff277d4ae034a6dccdccb
SHA1 (patch-au) = 3788f6ca9362a97323cc6bf0f942f2ba949e1c46
-SHA1 (patch-av) = e3e33d7e2ab065028244d60734e3dba4fd950b12
+SHA1 (patch-av) = 2f25ebe4272bbad270b6286d2eb1dce5ddae690e
SHA1 (patch-aw) = 8cfee271b0549e6886e29ae74e4e547dccc20230
diff --git a/mail/ja-mh/patches/patch-av b/mail/ja-mh/patches/patch-av
index c8a47ca060a..6f5eacc0628 100644
--- a/mail/ja-mh/patches/patch-av
+++ b/mail/ja-mh/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1 2004/11/29 05:09:43 taca Exp $
+$NetBSD: patch-av,v 1.2 2005/12/05 20:50:32 rillig Exp $
--- uip/dropsbr.c.orig 1998-04-24 06:02:00.000000000 +0900
+++ uip/dropsbr.c
-@@ -20,6 +20,9 @@ static char ident[] = "@(#)$Id: dropsbr.
+@@ -20,6 +20,9 @@
#undef NULLVP
#include <netinet/in.h>
#else
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 452ae7417fc..e9f895da9dd 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:14:35 martti Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:33 rillig Exp $
DISTNAME= squirrelmail-1.4.5
PKGNAME= ja-${DISTNAME}
@@ -40,7 +40,7 @@ ATTACHMENTS_DIR= ${DATADIR}/attachments
USER_PREFS_DIR= ${DATADIR}/data
MESSAGE_SUBST+= SMDIR=${SMDIR}
-FILES_SUBST+= SMDIR=${SMDIR}
+FILES_SUBST+= SMDIR=${SMDIR:Q}
CONF_FILES= ${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
CONF_FILES+= ${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 8858371ffa8..c75af41d31f 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
DISTNAME= kbiff-3.7.1
PKGREVISION= 1
@@ -8,7 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.granroth.org/kbiff/index.html
-COMMENT= A new mail notification utility for KDE
+COMMENT= Mail notification utility for KDE
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
index 885e3040de4..273deb53655 100644
--- a/mail/libesmtp/buildlink3.mk
+++ b/mail/libesmtp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/05 20:50:33 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBESMTP_BUILDLINK3_MK:= ${LIBESMTP_BUILDLINK3_MK}+
@@ -17,8 +17,8 @@ BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
LIBESMTP= -lesmtp
-CONFIGURE_ENV+= LIBESMTP="${LIBESMTP}"
-MAKE_ENV+= LIBESMTP="${LIBESMTP}"
+CONFIGURE_ENV+= LIBESMTP=${LIBESMTP:Q}
+MAKE_ENV+= LIBESMTP=${LIBESMTP:Q}
.endif # LIBESMTP_BUILDLINK3_MK
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 4f03d51fbe1..db93898139f 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/05 20:55:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= libetpan-0.38
@@ -12,7 +12,7 @@ COMMENT= Really nice mail library
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-SUBST_CLASSES= conf
+SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-configure
SUBST_FILES.conf= libetpan-config.in
SUBST_SED.conf= -e "s|@COMPILERFLAGS@|${COMPILER_RPATH_FLAG}|g"
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 84163cb3451..255ec44788e 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailagent-3.0.73
CATEGORIES= mail
@@ -14,12 +14,13 @@ INTERACTIVE_STAGE= configure
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS= -dres \
- -Dperlpath='${PERL5}' \
- -Dutmp='/var/run/utmp' \
- -Dprefix='${PREFIX}' -Dmansrc='${PREFIX}/man/man1' \
- -Dnotifypatches='false'
-MAKE_ENV= PATH=`${DIRNAME} ${PERL5}`:${PATH}
+CONFIGURE_ARGS+= -dres
+CONFIGURE_ARGS+= -Dperlpath=${PERL5:Q}
+CONFIGURE_ARGS+= -Dutmp='/var/run/utmp'
+CONFIGURE_ARGS+= -Dprefix=${PREFIX:Q}
+CONFIGURE_ARGS+= -Dmansrc=${PREFIX:Q}/man/man1
+CONFIGURE_ARGS+= -Dnotifypatches='false'
+MAKE_ENV+= PATH=`${DIRNAME} ${PERL5}`:${PATH}
INSTALL_TARGET= install install.man
pre-extract:
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 0905b5cb0b2..515859525fd 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailcrypt-3.5.8
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT= Emacs frontend for PGP and GPG
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
GNU_CONFIGURE= yes
-MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
+MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
INFO_FILES= mailcrypt.info
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 09a3b4e4771..ed72c40d620 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/14 08:27:55 kleink Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mailgraph-1.12
@@ -30,8 +30,8 @@ DOCDIR= share/doc/${PKGBASE}
OWN_DIRS+= ${PREFIX}/${DOCDIR}
RCD_SCRIPTS= mailgraph
-PLIST_SUBST+= CGIDIR="${CGIDIR}"
-PLIST_SUBST+= DOCDIR="${DOCDIR}"
+PLIST_SUBST+= CGIDIR=${CGIDIR:Q}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
SUBST_CLASSES+= defs
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 9076ced6b58..1bd395f3dfe 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2005/12/03 23:00:06 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailman-2.1.6
-PKGREVISION= # empty
CATEGORIES= mail www
MASTER_SITES= http://www.list.org/ \
${MASTER_SITE_GNU:=mailman/}
@@ -21,7 +20,7 @@ MESSAGE_SUBST+= DOCDIR=${DOCDIR}
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${EXECDIR}
-MAKE_FLAGS+= DIRSETGID=${TRUE}
+MAKE_FLAGS+= DIRSETGID=${TRUE:Q}
EXECDIR= ${PREFIX}/lib/mailman
MAILMAN_DATADIR?= ${VARBASE}/db/mailman
@@ -35,11 +34,11 @@ MAILMAN_CGIEXT?= .cgi
MESSAGE_SUBST+= EXECDIR=${EXECDIR}
MESSAGE_SUBST+= MAILMAN_USER=${MAILMAN_USER}
-FILES_SUBST+= EXECDIR=${EXECDIR}
-FILES_SUBST+= MAILMAN_USER=${MAILMAN_USER}
-FILES_SUBST+= MAILMAN_GROUP=${MAILMAN_GROUP}
-FILES_SUBST+= MAILMAN_DATADIR=${MAILMAN_DATADIR}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+FILES_SUBST+= EXECDIR=${EXECDIR:Q}
+FILES_SUBST+= MAILMAN_USER=${MAILMAN_USER:Q}
+FILES_SUBST+= MAILMAN_GROUP=${MAILMAN_GROUP:Q}
+FILES_SUBST+= MAILMAN_DATADIR=${MAILMAN_DATADIR:Q}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
PKG_GROUPS= ${MAILMAN_GROUP}
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 91ac824bdf7..331b6ddbc97 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:12 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= MailScanner-4.30.3-2
@@ -23,7 +23,7 @@ DEPENDS+= p5-MIME-tools>=0:../../mail/p5-MIME-tools
DEPENDS+= tnef>=1.0:../../mail/tnef
NO_BUILD= YES
-USE_TOOLS= perl:run
+USE_TOOLS+= perl:run
REPLACE_PERL= bin/MailScanner
DOCSDIR= ${LOCALBASE}/share/doc/MailScanner
@@ -34,10 +34,10 @@ LIBEXECDIR= ${LOCALBASE}/libexec/MailScanner
OWN_DIRS= ${PKG_SYSCONFDIR}/CustomFunctions
OWN_DIRS+= ${PKG_SYSCONFDIR}/rules
-PLIST_SUBST+= DOCSDIR=${DOCSDIR}
-PLIST_SUBST+= EGDIR=${EGDIR}
-PLIST_SUBST+= LIBDIR=${LIBDIR}
-PLIST_SUBST+= LIBEXECDIR=${LIBEXECDIR}
+PLIST_SUBST+= DOCSDIR=${DOCSDIR:Q}
+PLIST_SUBST+= EGDIR=${EGDIR:Q}
+PLIST_SUBST+= LIBDIR=${LIBDIR:Q}
+PLIST_SUBST+= LIBEXECDIR=${LIBEXECDIR:Q}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index 27a3f4960a9..d56f9e7bf5b 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mailserv
@@ -24,7 +24,6 @@ CONF_FILES=
majordomo-share majordomo mlp pmdf smartlist subscribe
CONF_FILES+= ${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf
.endfor
-.undef cf
INSTALLATION_DIRS= libexec/cgi-bin
@@ -39,7 +38,6 @@ do-configure:
-e "s|/usr/local/bin/perl|${PREFIX}/bin/perl|g" \
-e "s|/usr/bin/perl|${PREFIX}/bin/perl|g"
.endfor
-.undef file
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cgi-bin/mailserv
@@ -52,11 +50,9 @@ do-install:
cd ${PREFIX}/libexec/cgi-bin/mailserv && \
${LN} -s mailserv ${cf}
.endfor
-.undef cf
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailserv
.for doc in ChangeLog LICENSE README
${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/mailserv
.endfor
-.undef doc
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 014de3272a6..65301165aa2 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/31 03:06:17 grant Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mailsync_5.2.1.orig
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://mailsync.sourceforge.net/
COMMENT= Mailsync is a way of synchronizing a collection of mailboxes
-WRKSRC= ${WRKDIR}/${PKGNAME}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_TOOLS+= gmake
USE_LANGUAGES+= c c++
GNU_CONFIGURE= yes
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index b8526952613..d96b894e184 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/08/10 21:49:04 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mailwrapper-19990412
PKGREVISION= 4
@@ -6,7 +6,7 @@ CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= tech-pkg@NetBSD.org
-COMMENT= wrapper to support arbitrary Mail Transport Agents
+COMMENT= Wrapper to support arbitrary Mail Transport Agents
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
@@ -19,7 +19,7 @@ INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
EGDIR= ${PREFIX}/share/examples/mailwrapper
MAILWRAPPER_BACKUP_SFX= .pkgsrc.mailwrapper
-FILES_SUBST+= MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX}
+FILES_SUBST+= MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX:Q}
MAILWRAPPEES= /usr/bin/mailq \
/usr/bin/newaliases /usr/sbin/newaliases \
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 1217077147b..afd148680d6 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2005/10/18 01:24:25 simonb Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
#
DISTNAME= mairix-0.16.1
CATEGORIES= mail
MASTER_SITES= http://www.rpcurnow.force9.co.uk/mairix/
-MAINTAINER= simonb@NetBSD.ORG
+MAINTAINER= simonb@NetBSD.org
HOMEPAGE= http://www.rc0.org.uk/mairix/
COMMENT= Program for indexing and searching email messages
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 80d068c03e7..7adcd82781a 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/23 22:56:16 he Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
DISTNAME= majordomo-1.94.5
PKGREVISION= 1
@@ -39,8 +39,8 @@ MAJORDOMO_HOMEDIR?= /home
MAJORDOMO_USER?= majordom
MAJORDOMO_GROUP?= majordom
-PLIST_SUBST= HOME=${MAJORDOMO_HOMEDIR} \
- MAJORDOMO_USER=${MAJORDOMO_USER}
+PLIST_SUBST+= HOME=${MAJORDOMO_HOMEDIR:Q} \
+ MAJORDOMO_USER=${MAJORDOMO_USER:Q}
MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \
MAJORDOMO_USER=${MAJORDOMO_USER} \
MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index fb1612a128f..1447df0339a 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/06/03 21:11:07 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:33 rillig Exp $
DISTNAME= mm2.7
PKGNAME= metamail-2.7
@@ -20,7 +20,7 @@ USE_PKGINSTALL= YES
CFLAGS.Linux+= -DLINUX
CFLAGS.SunOS+= -DSYSV
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} CHMOD=${CHMOD} SED=${SED}
+MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} CHMOD=${CHMOD:Q} SED=${SED:Q}
EGDIR= ${PREFIX}/share/examples/metamail
CONF_FILES= ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 23995a811bc..2d5cd51b8aa 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.66 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mew-4.2
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -19,12 +19,12 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215
MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
-MAKE_FLAGS+= prefix=${PREFIX}
-MAKE_FLAGS+= EMACS=${EMACS_BIN}
+MAKE_FLAGS+= prefix=${PREFIX:Q}
+MAKE_FLAGS+= EMACS=${EMACS_BIN:Q}
MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/mew
MAKE_FLAGS+= etcdir=${PREFIX}/share/mew
-SUBST_CLASSES= local
+SUBST_CLASSES+= local
SUBST_STAGE.local= post-configure
SUBST_FILES.local= Makefile bin/configure info/Makefile
SUBST_SED.local= -e 's|/usr/local|${PREFIX}|g'
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index d486ac36e20..b68dfd7ef42 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mew-3.3
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -19,12 +19,12 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215
MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
-MAKE_FLAGS+= prefix=${PREFIX}
-MAKE_FLAGS+= EMACS=${EMACS_BIN}
+MAKE_FLAGS+= prefix=${PREFIX:Q}
+MAKE_FLAGS+= EMACS=${EMACS_BIN:Q}
MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/mew
MAKE_FLAGS+= etcdir=${PREFIX}/share/mew
-SUBST_CLASSES= local
+SUBST_CLASSES+= local
SUBST_STAGE.local= post-configure
SUBST_FILES.local= Makefile bin/configure info/Makefile
SUBST_SED.local= -e 's|/usr/local|${PREFIX}|g'
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index c467f1a36ce..e153e73d4d6 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mimedefang-2.52
PKGREVISION= 1
@@ -35,9 +35,9 @@ PKG_USERS= ${DEFANG_USER}:${DEFANG_GROUP}
EGDIR= ${PREFIX}/share/examples/mimedefang
SHAREDIR= ${PREFIX}/share/mimedefang
-FILES_SUBST+= SHAREDIR=${SHAREDIR}
-FILES_SUBST+= DEFANG_USER=${DEFANG_USER}
-FILES_SUBST+= DEFANG_SPOOLDIR=${DEFANG_SPOOLDIR}
+FILES_SUBST+= SHAREDIR=${SHAREDIR:Q}
+FILES_SUBST+= DEFANG_USER=${DEFANG_USER:Q}
+FILES_SUBST+= DEFANG_SPOOLDIR=${DEFANG_SPOOLDIR:Q}
RCD_SCRIPTS= mimedefang-multiplexor mimedefang
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 9b783e51920..36a97ef3b2b 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/10/05 20:08:32 tonio Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mutt-1.5.11
PKGREVISION= 2
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--without-included-gettext \
--enable-pop \
--enable-imap
-MAKE_ENV+= CHGRP=${CHGRP}
+MAKE_ENV+= CHGRP=${CHGRP:Q}
.if (${OPSYS} == "SunOS")
CONFIGURE_ARGS+= --without-wc-funcs
@@ -52,7 +52,7 @@ DOCDIR= ${PREFIX}/share/doc/mutt
EGDIR= ${PREFIX}/share/examples/mutt
CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-FILES_SUBST+= DOCDIR=${DOCDIR}
+FILES_SUBST+= DOCDIR=${DOCDIR:Q}
.if exists(${WRKSRC}/mutt_dotlock)
PLIST_SUBST+= MUTT_DOTLOCK=
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 7b156b47420..605a01a16f7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2005/09/22 15:30:44 tron Exp $
+# $NetBSD: Makefile,v 1.129 2005/12/05 20:50:34 rillig Exp $
DISTNAME= mutt-1.4.2.1i
PKGNAME= ${DISTNAME:C/i$//}
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--without-included-gettext \
--enable-pop \
--enable-imap
-MAKE_ENV+= CHGRP=${CHGRP}
+MAKE_ENV+= CHGRP=${CHGRP:Q}
.if ${OPSYS} == "SunOS"
CONFIGURE_ARGS+= --without-wc-funcs
@@ -55,7 +55,7 @@ DOCDIR= ${PREFIX}/share/doc/mutt
EGDIR= ${PREFIX}/share/examples/mutt
CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-FILES_SUBST+= DOCDIR=${DOCDIR}
+FILES_SUBST+= DOCDIR=${DOCDIR:Q}
.if exists(${WRKSRC}/mutt_dotlock)
PLIST_SUBST+= MUTT_DOTLOCK=
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index bbc4d8fa3da..cf2236f0854 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:34 rillig Exp $
DISTNAME= nmh-1.0.4
PKGREVISION= 6
@@ -33,18 +33,18 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --enable-nmh-pop
CONFIGURE_ARGS+= --with-mts=${NMH_MTA}
-.ifdef NMH_EDITOR
+.if defined(NMH_EDITOR)
CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR}
.endif
-.ifdef NMH_PAGER
+.if defined(NMH_PAGER)
CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
.endif
.if defined(KERBEROS)
PKG_USE_KERBEROS= yes
.if ${OPSYS} == "NetBSD"
-LIBS= -lroken -lcrypt -lcom_err
+LIBS+= -lroken -lcrypt -lcom_err
.endif
CONFIGURE_ARGS+= --with-krb4
.else
@@ -87,7 +87,6 @@ CONF_FILES= # empty
tmac.h
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
# This hopefully makes sure the permissions and ownership are right.
pre-install:
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 26c293d38d7..cfd33e11411 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/20 02:20:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:34 rillig Exp $
DISTNAME= nullmailer-1.00
CATEGORIES= mail
@@ -25,16 +25,16 @@ NULLMAILER_USER?= nullmail
PKG_GROUPS?= ${NULLMAILER_GROUP}
PKG_USERS?= ${NULLMAILER_USER}:${NULLMAILER_GROUP}
-MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILER_GROUP}
-MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER}
+MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILER_GROUP:Q}
+MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER:Q}
-PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} \
- NULLMAILER_GROUP=${NULLMAILER_GROUP} \
- NULLMAILER_USER=${NULLMAILER_USER}
+PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} \
+ NULLMAILER_GROUP=${NULLMAILER_GROUP:Q} \
+ NULLMAILER_USER=${NULLMAILER_USER:Q}
-FILES_SUBST+= VARBASE=${VARBASE} \
- NULLMAILER_GROUP=${NULLMAILER_GROUP} \
- NULLMAILER_USER=${NULLMAILER_USER}
+FILES_SUBST+= VARBASE=${VARBASE:Q} \
+ NULLMAILER_GROUP=${NULLMAILER_GROUP:Q} \
+ NULLMAILER_USER=${NULLMAILER_USER:Q}
RCD_SCRIPTS= nullmailer
diff --git a/mail/oe2mbx/Makefile b/mail/oe2mbx/Makefile
index 90503856635..c6d01370b91 100644
--- a/mail/oe2mbx/Makefile
+++ b/mail/oe2mbx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/01 03:00:17 reed Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= oe2mbx-1.21
@@ -12,9 +12,9 @@ COMMENT= Outlook Express messages to the Unix mailbox format converter
WRKSRC= ${WRKDIR}/liboe-0.92
MAKEFILE= makefile
-MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_LIB="${INSTALL_LIB}" \
- INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
+ INSTALL_LIB=${INSTALL_LIB:Q} \
+ INSTALL_DATA=${INSTALL_DATA:Q}
BUILD_TARGET= liboe oe2mbx
INSTALLATION_DIRS= bin lib include
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 31bf99babc8..e9c5c2ddbf0 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:21 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= offlineimap_${_OFFLINEIMAP_VER}
@@ -18,7 +18,7 @@ _OFFLINEIMAP_VER= 4.0.6
PYTHON_VERSIONS_ACCEPTED= 22 23
PYDISTUTILSPKG= yes
PYTHON_PATCH_SCRIPTS= bin/offlineimap
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
INSTALLATION_DIRS= man/man1 share/examples/offlineimap
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 3a7cc131cc7..18dd8edd8f7 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= pfqueue-0.1.4
@@ -10,7 +10,7 @@ HOMEPAGE= http://pfqueue.sourceforge.net/
COMMENT= Real-time queue scanner for postfix
GNU_CONFIGURE= yes
-INCOMPAT_CURSES= NetBSD-1.*
+INCOMPAT_CURSES= NetBSD-1.*-*
INSTALLATION_DIRS= bin man/man1
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
index 592fb76c1eb..dc260d3a0bd 100644
--- a/mail/php-imap/Makefile
+++ b/mail/php-imap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2005/04/20 12:03:25 kim Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:34 rillig Exp $
MODNAME= imap
-PKGREVISION= # empty
CATEGORIES+= mail
COMMENT= PHP extension for IMAP (Internet Mailbox Access Protocol)
@@ -18,7 +17,7 @@ CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no
# PHP_OPENSSL is set. For a self contained extension build like for
# this package this is not the case of course.
-CONFIGURE_ENV+= PHP_OPENSSL=${SSLBASE}
+CONFIGURE_ENV+= PHP_OPENSSL=${SSLBASE:Q}
.include "../../mail/imap-uw/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 6b524c7ab82..ca28b0a6b4a 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/08/24 04:13:46 tv Exp $
+$NetBSD: distinfo,v 1.31 2005/12/05 20:50:34 rillig Exp $
SHA1 (pine4.63.tar.bz2) = ad235c1fad7cc8adfff5c69cea8eb267afa648c9
RMD160 (pine4.63.tar.bz2) = b04a6f5134aeae6b0a5663acbfa4e812c3fc7762
@@ -6,7 +6,7 @@ Size (pine4.63.tar.bz2) = 3083721 bytes
SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
SHA1 (patch-ab) = cfac4d24763dbd4285e03c6c25891469c5ac1953
SHA1 (patch-ac) = 870d7d414e25b37e47c5f62447210fe7800c733b
-SHA1 (patch-ad) = 68e3238369bcdf49867e2facc876a8f434136228
+SHA1 (patch-ad) = 48a9a7b4014bfc5499aef3e52a929f6f56a67562
SHA1 (patch-ae) = 0faf3a4161cba517a559a776d2a3a7fcb5116570
SHA1 (patch-af) = 1cd12e0b7aea804528730ed7323e7ea1ac385466
SHA1 (patch-ag) = 74d7e2dc9b986148825335f6f2b52bde963f9a67
diff --git a/mail/pine/patches/patch-ad b/mail/pine/patches/patch-ad
index 1490fab35eb..3950f2d7170 100644
--- a/mail/pine/patches/patch-ad
+++ b/mail/pine/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.11 2005/01/25 10:08:59 adam Exp $
+$NetBSD: patch-ad,v 1.12 2005/12/05 20:50:34 rillig Exp $
--- pine/signals.c.orig 2004-11-04 22:33:05.000000000 +0000
+++ pine/signals.c
-@@ -53,6 +53,7 @@ static char rcsid[] = "$Id: signals.c,v
+@@ -53,6 +53,7 @@
====*/
#include "headers.h"
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index c5a6c0c4a04..6ac94a9234e 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:34 rillig Exp $
#
DISTNAME= popa3d-1.0
@@ -23,8 +23,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
RCD_SCRIPTS= popa3d
-FILES_SUBST+= POPA3D_USER=${POPA3D_USER}
-FILES_SUBST+= POPA3D_GROUP=${POPA3D_GROUP}
+FILES_SUBST+= POPA3D_USER=${POPA3D_USER:Q}
+FILES_SUBST+= POPA3D_GROUP=${POPA3D_GROUP:Q}
SUBST_CLASSES+= params
SUBST_STAGE.params= post-patch
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index ced57cf7337..cce44f3888a 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/12/04 06:30:37 martti Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/05 20:50:34 rillig Exp $
DISTNAME= postfix-2.3-20051128
#PKGREVISION= 1
@@ -72,7 +72,7 @@ LIBEXECDIR= ${PREFIX}/libexec/postfix
DOCDIR= ${PREFIX}/share/doc/postfix
EXAMPLEDIR= ${PREFIX}/share/examples/postfix
-FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
+FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
MESSAGE_SUBST+= DOCDIR=${DOCDIR}
@@ -83,8 +83,8 @@ MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
PLIST_SRC+= ${PKGDIR}/PLIST
BUILD_TARGET= # empty
-MAKE_ENV= CC="${CC}" OPT="${CFLAGS}"
-MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
USE_PKGINSTALL= yes
RCD_SCRIPTS= postfix
@@ -103,7 +103,6 @@ CONF_FILES_PERMS= # empty
CONF_FILES_PERMS+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
${ROOT_USER} ${ROOT_GROUP} 755
.endfor
-.undef _file_
.if !empty(PKG_OPTIONS:Msasl)
MAKE_DIRS+= ${SASLLIBDIR}
CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 8704b8c4050..b0bbe5a04c1 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2005/12/01 06:46:40 martti Exp $
+# $NetBSD: Makefile,v 1.170 2005/12/05 20:50:34 rillig Exp $
DISTNAME= postfix-2.2.6
#PKGREVISION= 1
@@ -69,7 +69,7 @@ LIBEXECDIR= ${PREFIX}/libexec/postfix
DOCDIR= ${PREFIX}/share/doc/postfix
EXAMPLEDIR= ${PREFIX}/share/examples/postfix
-FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
+FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
MESSAGE_SUBST+= DOCDIR=${DOCDIR}
@@ -80,8 +80,8 @@ MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
PLIST_SRC+= ${PKGDIR}/PLIST
BUILD_TARGET= # empty
-MAKE_ENV= CC="${CC}" OPT="${CFLAGS}"
-MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:M*:Q}
+MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
USE_PKGINSTALL= yes
RCD_SCRIPTS= postfix
@@ -100,7 +100,6 @@ CONF_FILES_PERMS= # empty
CONF_FILES_PERMS+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
${ROOT_USER} ${ROOT_GROUP} 755
.endfor
-.undef _file_
.if !empty(PKG_OPTIONS:Msasl)
MAKE_DIRS+= ${SASLLIBDIR}
CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index 2cfd05d2227..f281fdacb4e 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= postgrey-1.21
-PKGREVISION= # empty
CATEGORIES= mail
MASTER_SITES= http://isg.ee.ethz.ch/tools/postgrey/pub/ \
http://isg.ee.ethz.ch/tools/postgrey/pub/old/
@@ -45,10 +44,10 @@ OWN_DIRS+= ${PREFIX}/${EGDIR}
OWN_DIRS_PERMS+= ${POSTGREY_DBDIR} \
${POSTGREY_USER} ${POSTGREY_GROUP} 0775
-FILES_SUBST+= PERL="${PERL5}"
+FILES_SUBST+= PERL=${PERL5:Q}
-PLIST_SUBST+= DOCDIR="${DOCDIR}"
-PLIST_SUBST+= EGDIR="${EGDIR}"
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+= EGDIR=${EGDIR:Q}
SUBST_CLASSES+= postgrey
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index d2de6a26658..08ff6d9a3ca 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= prayer-1.0.12
@@ -16,11 +16,11 @@ PRAYER_GROUP= prayer
PKG_GROUPS= ${PRAYER_GROUP}
PKG_USERS= ${PRAYER_USER}:${PRAYER_GROUP}
-MAKE_ENV+= EGDIR="${EGDIR}"
-MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
+MAKE_ENV+= EGDIR=${EGDIR:Q}
+MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
MAKE_ENV+= BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
MAKE_ENV+= BUILDLINK_PREFIX.imap-uw="${BUILDLINK_PREFIX.imap-uw}"
-MAKE_ENV+= SSLCERTS="${SSLCERTS}"
+MAKE_ENV+= SSLCERTS=${SSLCERTS:Q}
PKG_SYSCONFSUBDIR= prayer
EGDIR= ${PREFIX}/share/examples/prayer
@@ -37,8 +37,8 @@ VAR_PREFIX= ${VARBASE}/spool/prayer
OWN_DIRS+= ${EGDIR}
OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
-FILES_SUBST+= OPSYS="${OPSYS}"
-FILES_SUBST+= VAR_PREFIX="${VAR_PREFIX}"
+FILES_SUBST+= OPSYS=${OPSYS:Q}
+FILES_SUBST+= VAR_PREFIX=${VAR_PREFIX:Q}
post-patch:
${FIND} ${WRKSRC} -name CVS -type d -print | ${SORT} -r | \
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index e0e392b4627..252e736d85d 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= procmail-3.22
@@ -12,7 +12,7 @@ COMMENT= Local mail delivery agent
PKG_INSTALLATION_TYPES= overwrite pkgviews
-MAKE_ENV+= SHELL=${SH} CHMOD=${CHMOD}
+MAKE_ENV+= SHELL=${SH:Q} CHMOD=${CHMOD:Q}
INSTALL_TARGET= install-suid install.man
UNLIMIT_RESOURCES= datasize
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index e3eb76bef5b..b0984c8fa89 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= pymsgauth-2.1.0
@@ -25,7 +25,7 @@ PYTHON_PATCH_SCRIPTS= ${PYMSGAUTH_PROGRAMS} *.py
USE_PKGINSTALL= yes
INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL
DEINSTALL_EXTRA_TMPL+= ${PKGDIR}/DEINSTALL
-FILES_SUBST+= SHAREDIR=${SHAREDIR}
+FILES_SUBST+= SHAREDIR=${SHAREDIR:Q}
INSTALLATION_DIRS= ${SHAREDIR} ${DOCDIR} ${HTMLDOCDIR} ${EGDIR} bin
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index ed95e8c366f..4fcee5030e0 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= qmail-run-20050415
@@ -21,8 +21,8 @@ NO_CHECKSUM= yes
USE_PKGINSTALL= yes
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
-FILES_SUBST+= PKGNAME=${PKGNAME}
+FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
RCD_SCRIPTS= qmail qmailpop3d qmailqread qmailsend qmailsmtpd
INSTALLATION_DIRS= bin share/doc/qmail-run share/examples/qmail-run
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 7f29cbfbedc..c6086bf834e 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/19 04:44:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= netqmail-1.05
@@ -49,11 +49,11 @@ DOCDIR= ${PREFIX}/share/doc/qmail
EGDIR= ${PREFIX}/share/examples/qmail
SHAREDIR= ${PREFIX}/share/qmail
MESSAGE_SUBST+= DOCDIR=${DOCDIR} EGDIR=${EGDIR}
-FILES_SUBST+= DOCDIR=${DOCDIR} EGDIR=${EGDIR} SHAREDIR=${SHAREDIR}
-FILES_SUBST+= QMAILDIR=${QMAILDIR} QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR}
-FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
-FILES_SUBST+= VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE}
-FILES_SUBST+= PKGNAME=${PKGNAME}
+FILES_SUBST+= DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} SHAREDIR=${SHAREDIR:Q}
+FILES_SUBST+= QMAILDIR=${QMAILDIR:Q} QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q}
+FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
+FILES_SUBST+= VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME:Q}
PLIST_SRC= ${PKGDIR}/PLIST
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index b17f3977cb0..9257a42f979 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2005/10/05 05:46:54 schmonz Exp $
+# $NetBSD: options.mk,v 1.18 2005/12/05 20:50:35 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
PKG_SUPPORTED_OPTIONS+= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
@@ -40,7 +40,7 @@ DARWINSUFX= .doc
.else
DARWINSUFX= # empty
.endif
-PLIST_SUBST+= DARWINSUFX=${DARWINSUFX}
+PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q}
.if !empty(PKG_OPTIONS:Mqmail-netqmail)
NETQMAIL_PATCH= netqmail-1.05.tar.gz
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index e36f0fe3f74..aaeb54d2795 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= ripmime-1.4.0.2
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.pldaniels.com/ripmime/
COMMENT= Extract the attached files out of a MIME encoded email package
PKGMANDIR?= man
-MAKE_ENV+= PKGMANDIR=${PKGMANDIR}
+MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
INSTALLATION_DIRS= bin ${PKGMANDIR}
diff --git a/mail/rmail-mime/Makefile b/mail/rmail-mime/Makefile
index aceb7b880aa..4f64b30d652 100644
--- a/mail/rmail-mime/Makefile
+++ b/mail/rmail-mime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:35 rillig Exp $
#
DISTNAME= rmail-mime-1.13.0
@@ -9,12 +9,12 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/rmail-mime/
MAINTAINER= jschauma@NetBSD.org
COMMENT= MIME-capabilities for RMAIL in Emacs
-DEPENDS= ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi
+DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi
.include "../../mk/emacs.mk"
SITE_LISP= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}
-PLIST_SUBST+= SITE_LISP=${SITE_LISP}
+PLIST_SUBST+= SITE_LISP=${SITE_LISP:Q}
do-build:
cd ${WRKSRC}; ${EMACS_BIN} --no-init-file --no-site-file -batch \
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index e433e1133b2..eaf992449ec 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.80 2005/12/05 20:50:35 rillig Exp $
.include "../../mail/sendmail/Makefile.common"
@@ -11,9 +11,9 @@ MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
SMRSH_CMDDIR?= ${PREFIX}/libexec/sm.bin
-PLIST_SUBST+= SMRSH_CMDDIR=${SMRSH_CMDDIR}
+PLIST_SUBST+= SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
-SUBST_CLASSES= paths
+SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-build
SUBST_FILES.paths= ../mailer.conf include/sm/conf.h smrsh/smrsh.8
SUBST_SED.paths= -e "s|@@PREFIX@@|${PREFIX}|g" \
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 75d68eae93f..73fea46e4dc 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2005/10/14 08:36:02 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.30 2005/12/05 20:50:35 rillig Exp $
#
# Makefile fragment shared with libmilter
#
@@ -20,9 +20,9 @@ PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
DIST_VERS= 8.13.5
-MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
- BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
- BUILDLINK_DIR="${BUILDLINK_DIR}"
+MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
+ BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
+ BUILDLINK_DIR=${BUILDLINK_DIR:Q}
SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
BUILD_DEFS+= SMRSH_CMDDIR
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
index 9f2c69a6f32..df353e8a484 100644
--- a/mail/sendmail812/Makefile.common
+++ b/mail/sendmail812/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/08/04 12:30:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:35 rillig Exp $
#
# Makefile fragment shared with libmilter
#
@@ -20,9 +20,9 @@ PATCHDIR= ${.CURDIR}/../../mail/sendmail812/patches
DIST_VERS= 8.12.11
-MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
- BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
- BUILDLINK_DIR="${BUILDLINK_DIR}"
+MAKE_ENV+= BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
+ BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
+ BUILDLINK_DIR=${BUILDLINK_DIR:Q}
SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
DESCR_SRC= ${WRKDIR}/.DESCR_SRC
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 646871cbbb8..3047280c9c3 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/07 20:35:20 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:35 rillig Exp $
DISTNAME= smtpfeed-1.18
PKGREVISION= 1
@@ -17,7 +17,7 @@ COMMENT= SMTP Fast Exploding External Deliverer for Sendmail
#DEPENDS+= sendmail>=8.9.3:../../mail/sendmail
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec
+CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec
# use bind8?
#CONFIGURE_ARGS+= --with-bind8
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index a3685edc65c..40fc789f50f 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/11/22 13:03:22 rillig Exp $
+# $NetBSD: Makefile,v 1.65 2005/12/05 20:50:35 rillig Exp $
DISTNAME= Mail-SpamAssassin-3.1.0
PKGNAME= spamassassin-3.1.0
@@ -111,8 +111,8 @@ _INTERPRETER_SUPPORT= YES
.endif
# These variables are substituted in netbsd-rc-script.sh.
-FILES_SUBST+= _INTERPRETER_SUPPORT="${_INTERPRETER_SUPPORT}"
-FILES_SUBST+= OPSYS="${OPSYS}"
+FILES_SUBST+= _INTERPRETER_SUPPORT=${_INTERPRETER_SUPPORT:Q}
+FILES_SUBST+= OPSYS=${OPSYS:Q}
post-extract:
@# correct bad SA permissions
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 5c9a8a31548..ac988318600 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:35 rillig Exp $
DISTNAME= spamd-20050726
CATEGORIES= mail
@@ -22,7 +22,7 @@ RCD_SCRIPTS= pfspamd
CONF_FILES= ${PREFIX}/share/examples/spamd/spamd.conf \
${PKG_SYSCONFDIR}/spamd.conf
-SUBST_CLASSES= fix
+SUBST_CLASSES+= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= spamd/spamd.8
SUBST_FILES.fix+= spamd-setup/spamd-setup.c spamd-setup/spamd-setup.8
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 7a6f8cf311c..574e59c945f 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/12/05 20:13:38 martti Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:35 rillig Exp $
DISTNAME= squirrelmail-1.4.5
PKGREVISION= 3
@@ -34,7 +34,7 @@ ATTACHMENTS_DIR= ${DATADIR}/attachments
USER_PREFS_DIR= ${DATADIR}/data
MESSAGE_SUBST+= SMDIR=${SMDIR}
-FILES_SUBST+= SMDIR=${SMDIR}
+FILES_SUBST+= SMDIR=${SMDIR:Q}
CONF_FILES= ${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
CONF_FILES+= ${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
index 2523b7e1484..07339face9e 100644
--- a/mail/squirrelmail/plugin.mk
+++ b/mail/squirrelmail/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.1 2005/07/06 12:21:17 martti Exp $
+# $NetBSD: plugin.mk,v 1.2 2005/12/05 20:50:35 rillig Exp $
DISTNAME?= ${PLUGIN_NAME}-${PLUGIN_VERSION}
PKGNAME= sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -15,7 +15,7 @@ FULL_PLUGIN_DIR= ${PREFIX}/${PLUGIN_DIR}
INSTALLATION_DIRS+= ${PLUGIN_DIR}
-PLIST_SUBST+= PLUGIN_DIR=${PLUGIN_DIR}
+PLIST_SUBST+= PLUGIN_DIR=${PLUGIN_DIR:Q}
do-install:
cd ${WRKSRC} && \
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 65a86bbdb61..8066541a16a 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/11/11 07:45:03 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:35 rillig Exp $
DISTNAME= sqwebmail-5.0.6
CATEGORIES= mail www
@@ -6,7 +6,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam@NetBSD.org
-COMMENT= webmail CGI for access to maildir-style mailboxes
+COMMENT= Webmail CGI for access to maildir-style mailboxes
HOMEPAGE= http://www.courier-mta.org/sqwebmail/
DEPENDS+= courier-maildir>=0.52.1:../../mail/courier-maildir
diff --git a/mail/sylpheed-claws/plugins.mk b/mail/sylpheed-claws/plugins.mk
index c46217fe52f..abda83894b8 100644
--- a/mail/sylpheed-claws/plugins.mk
+++ b/mail/sylpheed-claws/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.6 2005/11/04 11:10:57 rillig Exp $
+# $NetBSD: plugins.mk,v 1.7 2005/12/05 20:50:35 rillig Exp $
#
.include "../../mail/sylpheed-claws/Makefile.common"
@@ -28,6 +28,6 @@ CONFIGURE_ARGS+= --disable-mathml-viewer-plugin
CONFIGURE_ARGS+= --disable-pgpmime-plugin
PLIST_SRC= ${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins
-PLIST_SUBST+= PLUGIN_NAME=${PLUGIN_NAME}
+PLIST_SUBST+= PLUGIN_NAME=${PLUGIN_NAME:Q}
MESSAGE_SRC+= ${.CURDIR}/../../mail/sylpheed-claws/MESSAGE.plugins
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 3a38789dbdc..2c3c3ff962a 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= tmda-1.0.3
@@ -23,16 +23,16 @@ PKG_GROUPS= tofmipd
PKG_USERS= tofmipd:tofmipd::TMDA\ ofmipd\ User
RCD_SCRIPTS= tofmipd
-FILES_SUBST+= PYTHONBIN=${PYTHONBIN}
+FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q}
SHAREDIR= share/${PKGBASE}
DOCDIR= share/doc/${PKGBASE}
CONTRIBDIR= share/doc/${PKGBASE}/contrib
HTMLDIR= share/doc/html/${PKGBASE}
-PLIST_SUBST+= SHAREDIR="${SHAREDIR}"
-PLIST_SUBST+= DOCDIR="${DOCDIR}"
-PLIST_SUBST+= CONTRIBDIR="${CONTRIBDIR}"
-PLIST_SUBST+= HTMLDIR="${HTMLDIR}"
+PLIST_SUBST+= SHAREDIR=${SHAREDIR:Q}
+PLIST_SUBST+= DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+= CONTRIBDIR=${CONTRIBDIR:Q}
+PLIST_SUBST+= HTMLDIR=${HTMLDIR:Q}
TMDA_PROGRAMS= bin/tmda-*
TMDA_DOCS= CODENAMES COPYING CRYPTO ChangeLog INSTALL README THANKS UPGRADE
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 337b81a5b41..bea0679fe4c 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/10/18 12:13:49 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:36 rillig Exp $
DISTNAME= turba-h3-${TURBAVER}
PKGNAME= turba-${TURBAVER}
@@ -28,7 +28,7 @@ REPLACE_PERL= ${WRKSRC}/scripts/ldap/addou.pl
USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR?= httpd
-SUBST_CLASSES= files
+SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
SUBST_FILES.files= turba.conf.dist
SUBST_SED.files= -e "s|@TURBADIR@|${TURBADIR}|g"
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 78e0a32675e..55398e13534 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/08/28 04:31:00 uebayasi Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:36 rillig Exp $
DISTNAME= vm-7.19
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -36,12 +36,12 @@ BINDIR= ${PREFIX}/bin
INFO_FILES= vm.info
PLIST_SRC= ${PKGDIR}/PLIST.emacs
.endif
-MAKEFLAGS+= EMACS=${EMACS_BIN}
+MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/vm
-MAKE_ENV+= INFODIR=${INFODIR}
-MAKE_ENV+= PIXMAPDIR=${PIXMAPDIR}
-MAKE_ENV+= BINDIR=${BINDIR}
+MAKE_ENV+= INFODIR=${INFODIR:Q}
+MAKE_ENV+= PIXMAPDIR=${PIXMAPDIR:Q}
+MAKE_ENV+= BINDIR=${BINDIR:Q}
do-install:
${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/vm
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index c3c1e55a126..598fcb328ce 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:36 rillig Exp $
DISTNAME= wl-2.14.0
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
# XXX please someone adjust paths and PLIST for XEmacs...
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX}
+MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
MAKE_FLAGS+= PIXMAPDIR=${PREFIX}/share/wl
INSTALL_TARGET= install install-info
INFO_FILES= wl.info wl-ja.info
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index a6d66d39b3c..3f02ee2b005 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= xmailbox-2.5
@@ -11,8 +11,8 @@ COMMENT= Enhanced xbiff, with pixmap and sound support
USE_IMAKE= YES
-MAKE_ENV+= INSTALL_PROGRAM='${INSTALL_PROGRAM}'
-MAKE_ENV+= INSTALL_MAN='${INSTALL_MAN}'
+MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/xmailbox
diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
index 1f95405c3b0..f417a44cdb4 100644
--- a/mail/yatsvrs/Makefile
+++ b/mail/yatsvrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/23 21:45:16 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:36 rillig Exp $
#
DISTNAME= yatsvrs-5.00p6
@@ -29,9 +29,9 @@ CONFIGURE_ARGS+= --enable-shadow-password
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
-FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_YATADMIN}
-FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID}
-FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID}
+FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_YATADMIN:Q}
+FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID:Q}
+FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID:Q}
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL