diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-02 16:25:17 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-02 16:25:17 +0000 |
| commit | cb939586bb2b8b07300fb8a44168e16cd97ab2ed (patch) | |
| tree | b151db1ab438a9ffd9c5397b6a4fe08f07b05049 | |
| parent | acea7f0682b89f8d0999e81a81341dfe21db49fc (diff) | |
| download | pkgsrc-cb939586bb2b8b07300fb8a44168e16cd97ab2ed.tar.gz | |
mail: align variable assignments
pkglint -Wall -F --only aligned -r
No manual corrections.
112 files changed, 510 insertions, 510 deletions
diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile index ef1a31182b1..1a5c0e10c3d 100644 --- a/mail/GNUMail/Makefile +++ b/mail/GNUMail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2019/04/03 00:32:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.52 2019/11/02 16:25:17 rillig Exp $ DISTNAME= GNUMail-1.2.0 PKGREVISION= 16 @@ -15,7 +15,7 @@ USE_LANGUAGES= objc NO_CONFIGURE= yes MAKE_FILE= GNUmakefile -FIX_GNUSTEP_INSTALLATION_DIR= yes +FIX_GNUSTEP_INSTALLATION_DIR= yes .for dir in Account Advanced Clock Colors Compose Face Filtering \ Fonts Import MIME PGP Receiving Sending Viewing SUBST_FILES.gnustep_installation_dir+= Bundles/${dir}/GNUmakefile diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile index e64f709bd18..ed4cff7bdbb 100644 --- a/mail/Pantomime/Makefile +++ b/mail/Pantomime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/04/03 00:32:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/02 16:25:17 rillig Exp $ DISTNAME= Pantomime-1.2.0 PKGREVISION= 16 @@ -15,10 +15,10 @@ USE_LANGUAGES= objc PRIVILEGED_STAGES+= build PRIVILEGED_STAGES+= clean -NO_CONFIGURE= yes +NO_CONFIGURE= yes #MAKE_JOBS_SAFE= no -MAKE_ENV+= ADDITIONAL_CPPFLAGS=-DMKDIR -MAKE_FILE= GNUmakefile +MAKE_ENV+= ADDITIONAL_CPPFLAGS=-DMKDIR +MAKE_FILE= GNUmakefile .include "../../devel/gnustep-base/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index b2d578d8ae1..38edb7ea239 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2018/07/24 12:39:36 bsiegert Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/02 16:25:17 rillig Exp $ DISTNAME= alpine-2.21 CATEGORIES= mail @@ -10,26 +10,26 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Program for Internet News and E-mail LICENSE= apache-2.0 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} -CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q} -CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include -CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib -CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf -CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed -CONFIGURE_ARGS+= --with-passfile=.pine-passfile +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q} +CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include +CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib +CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf +CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed +CONFIGURE_ARGS+= --with-passfile=.pine-passfile # disabled, for Web Alpine Support CONFIGURE_ARGS+= --without-tcl USE_LIBTOOL= yes -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE= no INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M4.99.*) && empty(OS_VERSION:M[5-9]*) -CONFIGURE_ARGS+= --without-pthread +CONFIGURE_ARGS+= --without-pthread .endif # mach/mach.h defines panic, differently. diff --git a/mail/amavisd-milter/Makefile b/mail/amavisd-milter/Makefile index fa6f619d123..947b30f7c52 100644 --- a/mail/amavisd-milter/Makefile +++ b/mail/amavisd-milter/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2016/12/21 12:05:51 kivinen Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:18 rillig Exp $ # DISTNAME= amavisd-milter-1.6.1 PKGREVISION= 1 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amavisd-milter/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amavisd-milter/} MAINTAINER= kivinen@iki.fi HOMEPAGE= http://amavisd-milter.sourceforge.net/ @@ -13,11 +13,11 @@ LICENSE= modified-bsd .include "options.mk" -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib -RCD_SCRIPTS= amavisd-milter +RCD_SCRIPTS= amavisd-milter .include "../../mail/libmilter/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/amavisd-milter/options.mk b/mail/amavisd-milter/options.mk index c0e2b96e004..aea95a7fb96 100644 --- a/mail/amavisd-milter/options.mk +++ b/mail/amavisd-milter/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2016/12/21 12:05:51 kivinen Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 16:25:18 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.amavisd-milter -PKG_SUPPORTED_OPTIONS= # empty -PKG_SUGGESTED_OPTIONS= # empty +PKG_OPTIONS_VAR= PKG_OPTIONS.amavisd-milter +PKG_SUPPORTED_OPTIONS= # empty +PKG_SUGGESTED_OPTIONS= # empty .include "../../mk/bsd.options.mk" diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile index cb9c528d675..8757c787553 100644 --- a/mail/bmf/Makefile +++ b/mail/bmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/08/01 14:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:18 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+= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/${PKGMANDIR} +MAKE_ENV+= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/${PKGMANDIR} .include "../../mk/bsd.pkg.mk" diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile index 6dce727c6ac..ea22798bade 100644 --- a/mail/claws-mail-archive/Makefile +++ b/mail/claws-mail-archive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2019/08/22 12:23:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.65 2019/11/02 16:25:18 rillig Exp $ # PLUGIN_NAME= archive @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Adds archiving to Claws-Mail -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile index 7dbc4e113e1..66c8485f66f 100644 --- a/mail/claws-mail-attachwarner/Makefile +++ b/mail/claws-mail-attachwarner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2019/08/22 12:23:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.68 2019/11/02 16:25:18 rillig Exp $ # PLUGIN_NAME= attachwarner @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Warns if a message mentions an attachment without attaching files -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile index d40b542c821..5d21fcad8b4 100644 --- a/mail/claws-mail-attremover/Makefile +++ b/mail/claws-mail-attremover/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2019/08/22 12:23:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.67 2019/11/02 16:25:18 rillig Exp $ # PLUGIN_NAME= att_remover @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Permanently deletes attachments from mail -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile index 1db507d2e15..1951583cda6 100644 --- a/mail/claws-mail-fetchinfo/Makefile +++ b/mail/claws-mail-fetchinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2019/08/22 12:23:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.68 2019/11/02 16:25:18 rillig Exp $ # PLUGIN_NAME= fetchinfo @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Inserts headers containing some download information -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile index 651b8645c3d..ed633003113 100644 --- a/mail/claws-mail-mailmbox/Makefile +++ b/mail/claws-mail-mailmbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2019/08/22 12:23:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.67 2019/11/02 16:25:18 rillig Exp $ # PLUGIN_NAME= mailmbox @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Handles mailboxes in mbox format -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-managesieve/Makefile b/mail/claws-mail-managesieve/Makefile index 135040bdd12..70054fb8346 100644 --- a/mail/claws-mail-managesieve/Makefile +++ b/mail/claws-mail-managesieve/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/02 16:25:18 rillig Exp $ # PLUGIN_NAME= managesieve @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Manage Sieve filters on servers that support the ManageSieve protocol -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile index dfdd9e43571..86ac815d380 100644 --- a/mail/claws-mail-newmail/Makefile +++ b/mail/claws-mail-newmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2019/08/22 12:23:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.69 2019/11/02 16:25:19 rillig Exp $ # PLUGIN_NAME= newmail @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Write log file info on arriving email -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile index 366b7a8e6d5..d7d5a97dad6 100644 --- a/mail/claws-mail-notification/Makefile +++ b/mail/claws-mail-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2019/08/22 12:23:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.70 2019/11/02 16:25:19 rillig Exp $ # PLUGIN_NAME= notification @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Provides various ways to notify the user of new and unread email -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile index fd7f7ccdd2f..472e927f866 100644 --- a/mail/claws-mail-rssyl/Makefile +++ b/mail/claws-mail-rssyl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2019/08/22 12:23:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.75 2019/11/02 16:25:19 rillig Exp $ # PLUGIN_NAME= rssyl @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile index 602d3df5ed6..f7b2b7f9712 100644 --- a/mail/claws-mail-spamreport/Makefile +++ b/mail/claws-mail-spamreport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2019/08/22 12:23:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.73 2019/11/02 16:25:19 rillig Exp $ # PLUGIN_NAME= spam_report @@ -9,7 +9,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Report spam to various places -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile index 12bda0da30c..2cb3f057e95 100644 --- a/mail/claws-mail-tnef/Makefile +++ b/mail/claws-mail-tnef/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2019/08/22 12:23:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.69 2019/11/02 16:25:19 rillig Exp $ # PLUGIN_NAME= tnef_parse @@ -8,7 +8,7 @@ PKGREVISION= 8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Handles TNEF attachments from Outlook -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile index d45ea2db765..802ad54d180 100644 --- a/mail/claws-mail-vcalendar/Makefile +++ b/mail/claws-mail-vcalendar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2019/08/22 12:23:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.82 2019/11/02 16:25:19 rillig Exp $ # PLUGIN_NAME= vcalendar @@ -10,7 +10,7 @@ COMMENT= Enable vCalendar message handling USE_TOOLS+= perl -CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin +CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common index 8df67799c72..3872a0ec2e1 100644 --- a/mail/claws-mail/Makefile.common +++ b/mail/claws-mail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2019/06/09 22:09:18 nia Exp $ +# $NetBSD: Makefile.common,v 1.20 2019/11/02 16:25:18 rillig Exp $ # used by mail/claws-mail/plugins.mk @@ -24,7 +24,7 @@ GNU_CONFIGURE= YES # Force gnome detection off to avoid installing some extra files CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="no" -CONFIGURE_ARGS+= --enable-enchant +CONFIGURE_ARGS+= --enable-enchant CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --enable-compface CONFIGURE_ARGS+= --disable-manual diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile index 032f08c7ebf..b69e69686d4 100644 --- a/mail/cucipop/Makefile +++ b/mail/cucipop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2012/10/08 12:19:07 asau Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/02 16:25:19 rillig Exp $ # DISTNAME= cucipop-1.31 @@ -6,8 +6,8 @@ PKGREVISION= 3 CATEGORIES= mail MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/ -PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= cucipop-1.31-v6-20010223.diff.gz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ +PATCHFILES= cucipop-1.31-v6-20010223.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index d3bddcc6db0..5d9326606c0 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2019/08/11 13:21:26 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2019/11/02 16:25:19 rillig Exp $ DISTNAME= cyrus-imapd-2.4.20 PKGREVISION= 7 @@ -12,7 +12,7 @@ HOMEPAGE= https://www.cyrusimap.org/ COMMENT= Cyrus IMAP server #LICENSE= original-bsd # like license -MAKE_JOBS_SAFE=no +MAKE_JOBS_SAFE= no USE_TOOLS+= perl:run makedepend USE_PKGLOCALEDIR= yes diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile index ab058c2a213..bb51f32351c 100644 --- a/mail/distribute/Makefile +++ b/mail/distribute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/08/11 13:21:26 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/02 16:25:19 rillig Exp $ DISTNAME= distribute-2.1-pl19 PKGNAME= distribute-2.1.26 @@ -22,8 +22,8 @@ INSTALLATION_DIRS= libexec ${PKGMANDIR}/man1 WRKSRC= ${WRKDIR}/distribute-pl19 USE_TOOLS+= perl:run -MAN1= distribute.1 -DIST_SUBDIR= distribute +MAN1= distribute.1 +DIST_SUBDIR= distribute PATCH_DIST_STRIP= -p1 # customize below if you would like to diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 5f316d21a90..b37112a910b 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/02 16:25:20 rillig Exp $ DISTNAME= dk-milter-1.0.2 PKGREVISION= 1 @@ -26,7 +26,7 @@ SUBST_SED.libs+= -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' SUBST_SED.libs+= -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' SUBST_SED.libs+= -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|g' .if ${OPSYS} == SunOS -SUBST_SED.libs+= -e 's|-lrt|-lrt -lresolv|g' +SUBST_SED.libs+= -e 's|-lrt|-lrt -lresolv|g' .endif SUBST_MESSAGE.libs= Fixing makefile references. diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile index b2e3a78e2ae..1a68c5dbd9a 100644 --- a/mail/dkim-milter/Makefile +++ b/mail/dkim-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:05 rillig Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/02 16:25:20 rillig Exp $ DISTNAME= dkim-milter-2.8.3 PKGREVISION= 5 @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dkim-milter/} MAINTAINER= imil@gcu.info HOMEPAGE= https://sourceforge.net/projects/dkim-milter/ COMMENT= Open source DKIM filter software from Sendmail, Inc -LICENSE= sendmail-open-source-license +LICENSE= sendmail-open-source-license PKG_DESTDIR_SUPPORT= destdir diff --git a/mail/dnsbl-milter/Makefile b/mail/dnsbl-milter/Makefile index 7c3a09bd053..9116e5d892c 100644 --- a/mail/dnsbl-milter/Makefile +++ b/mail/dnsbl-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/06/24 10:59:41 nia Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/02 16:25:20 rillig Exp $ # VERSION= 6.45 @@ -12,7 +12,7 @@ HOMEPAGE= https://www.five-ten-sg.com/dnsbl/ COMMENT= DNSBL Sendmail milter LICENSE= gnu-gpl-v3 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes PKG_SYSCONFSUBDIR?= dnsbl-milter CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/${PKG_SYSCONFSUBDIR} CONFIGURE_ARGS+= ac_cv_path_BASH=${SH} @@ -33,11 +33,11 @@ EGDIR= share/examples/dnsbl-milter CONFS= dnsbl.conf hosts-ignore.conf tld.conf html-tags.conf .for f in ${CONFS} -CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor INSTALLATION_DIRS= ${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 -INSTALL_DIRS= src man +INSTALL_DIRS= src man post-install: cd ${WRKSRC} && ${INSTALL_DATA} ${CONFS} ${DESTDIR}${PREFIX}/${EGDIR} diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 5e20a72c14d..943d0e44c71 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.196 2019/07/20 22:46:30 wiz Exp $ +# $NetBSD: Makefile,v 1.197 2019/11/02 16:25:20 rillig Exp $ DOVECOT_VERSION= 1.2 DOVECOT_SUBVERSION= .17 @@ -11,7 +11,7 @@ MASTER_SITES= http://www.dovecot.org/releases/${DOVECOT_VERSION}/ DOVECOT_SIEVE_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOT_VERSION}/ MANAGESIEVE_PATCH= dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}-managesieve-${MANAGESIEVE_VERSION}.diff.gz -SITES.${MANAGESIEVE_PATCH}= ${DOVECOT_SIEVE_SITES} +SITES.${MANAGESIEVE_PATCH}= ${DOVECOT_SIEVE_SITES} PATCH_DIST_STRIP.${MANAGESIEVE_PATCH}= -p1 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk index afd694f1a87..50f20c44d89 100644 --- a/mail/dovecot/options.mk +++ b/mail/dovecot/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.29 2011/06/14 09:37:18 tron Exp $ +# $NetBSD: options.mk,v 1.30 2019/11/02 16:25:20 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot -PKG_SUPPORTED_OPTIONS= dovecot-sieve dovecot-managesieve gssapi -PKG_SUPPORTED_OPTIONS+= kqueue ldap mysql pam pgsql sqlite -PKG_OPTIONS_OPTIONAL_GROUPS= ssl -PKG_OPTIONS_GROUP.ssl= gnutls ssl -PKG_SUGGESTED_OPTIONS= pam ssl +PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot +PKG_SUPPORTED_OPTIONS= dovecot-sieve dovecot-managesieve gssapi +PKG_SUPPORTED_OPTIONS+= kqueue ldap mysql pam pgsql sqlite +PKG_OPTIONS_OPTIONAL_GROUPS= ssl +PKG_OPTIONS_GROUP.ssl= gnutls ssl +PKG_SUGGESTED_OPTIONS= pam ssl .if defined(PKG_HAVE_KQUEUE) PKG_SUGGESTED_OPTIONS+= kqueue diff --git a/mail/drac/Makefile b/mail/drac/Makefile index f00315ab96b..5eecac76786 100644 --- a/mail/drac/Makefile +++ b/mail/drac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/08/01 17:40:13 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/02 16:25:20 rillig Exp $ DISTNAME= drac PKGNAME= drac-1.12 @@ -38,16 +38,16 @@ RPCGENFLAGS= # empty .endif MAKE_FLAGS+= RPCGENFLAGS=${RPCGENFLAGS:Q} -CFLAGS.SunOS= -DTI_RPC -DFCNTL_LOCK -DSYSINFO -CFLAGS.BSDOS= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -CFLAGS.IRIX= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -CFLAGS.NetBSD= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C -CFLAGS.FreeBSD= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C -CFLAGS.OpenBSD= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C +CFLAGS.SunOS= -DTI_RPC -DFCNTL_LOCK -DSYSINFO +CFLAGS.BSDOS= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST +CFLAGS.IRIX= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST +CFLAGS.NetBSD= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C +CFLAGS.FreeBSD= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C +CFLAGS.OpenBSD= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C CFLAGS.Dragonfly= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C -CFLAGS.Linux= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C -CFLAGS.AIX= -DD_BSD -DBSD_INCLUDES -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDEBUG -LIBS.SunOS= -lnsl +CFLAGS.Linux= -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C +CFLAGS.AIX= -DD_BSD -DBSD_INCLUDES -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDEBUG +LIBS.SunOS= -lnsl INSTALL_TARGET= install install-man diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk index 8aa484faa3a..463984d3e26 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.26 2010/12/31 06:13:46 taca Exp $ +# $NetBSD: options.mk,v 1.27 2019/11/02 16:25:20 rillig Exp $ .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom) DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS} @@ -22,20 +22,20 @@ PKG_OPTIONS_LEGACY_OPTS+= preferences-extension:dspam-preferences-extension ### Default: procmail ### DSPAM_DELIVERY_AGENT?= procmail -BUILD_DEFS+= DSPAM_DELIVERY_AGENT +BUILD_DEFS+= DSPAM_DELIVERY_AGENT .if !empty(DSPAM_DELIVERY_AGENT:Mprocmail) DSPAM_DELIVERY_AGENT_BIN?= ${PREFIX}/bin/procmail -BUILD_DEPENDS+= procmail-[0-9]*:../../mail/procmail -CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} +BUILD_DEPENDS+= procmail-[0-9]*:../../mail/procmail +CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} .elif !empty(DSPAM_DELIVERY_AGENT:Mmaildrop) DSPAM_DELIVERY_AGENT_BIN?= ${PREFIX}/bin/maildrop -BUILD_DEPENDS+= maildrop-[0-9]*:../../mail/maildrop -CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} +BUILD_DEPENDS+= maildrop-[0-9]*:../../mail/maildrop +CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} .elif !empty(DSPAM_DELIVERY_AGENT) DSPAM_DELIVERY_AGENT_BIN?= ${DSPAM_DELIVERY_AGENT} -CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} +CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} .else -PKG_FAIL_REASON+= "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'" +PKG_FAIL_REASON+= "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'" .endif PLIST_VARS+= hash mysql pgsql sqlite diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile index a2f7a97816e..c3b79380549 100644 --- a/mail/elm-me/Makefile +++ b/mail/elm-me/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/02 16:25:20 rillig Exp $ DISTNAME= elm-2.4ME+93 PKGNAME= elm-me-2.4.93 @@ -37,7 +37,7 @@ SUBST_SED.errno= -e 's,^extern int errno;,\#include <errno.h>,' # currently not set in files/config.sh # (should probably be a package option) -#SPECIAL_PERMS+= bin/elm ${ROOT_USER} mail 2755 +#SPECIAL_PERMS+= bin/elm ${ROOT_USER} mail 2755 pre-configure: ${CP} ${FILESDIR}/config.sh ${WRKSRC}/ diff --git a/mail/exim/options.mk b/mail/exim/options.mk index 3ad6817427c..8d03837f32c 100644 --- a/mail/exim/options.mk +++ b/mail/exim/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.23 2019/06/07 12:20:32 tm Exp $ +# $NetBSD: options.mk,v 1.24 2019/11/02 16:25:20 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.exim PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore @@ -18,19 +18,19 @@ PKG_SUGGESTED_OPTIONS+= exim-tls inet6 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mexim-appendfile-maildir) -LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILDIR=yes +LOCAL_MAKEFILE_OPTIONS+= SUPPORT_MAILDIR=yes .endif .if !empty(PKG_OPTIONS:Mexim-appendfile-mailstore) -LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILSTORE=yes +LOCAL_MAKEFILE_OPTIONS+= SUPPORT_MAILSTORE=yes .endif .if !empty(PKG_OPTIONS:Mexim-auth-dovecot) -LOCAL_MAKEFILE_OPTIONS+=AUTH_DOVECOT=yes +LOCAL_MAKEFILE_OPTIONS+= AUTH_DOVECOT=yes .endif .if !empty(PKG_OPTIONS:Mexim-appendfile-mbx) -LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MBX=yes +LOCAL_MAKEFILE_OPTIONS+= SUPPORT_MBX=yes .endif .if !empty(PKG_OPTIONS:Mexim-build-eximon) @@ -41,20 +41,20 @@ PLIST_SRC+=${PKGDIR}/PLIST.eximon .endif .if !empty(PKG_OPTIONS:Mexim-content-scan) -LOCAL_MAKEFILE_OPTIONS+=WITH_CONTENT_SCAN=YES +LOCAL_MAKEFILE_OPTIONS+= WITH_CONTENT_SCAN=YES .endif .if !empty(PKG_OPTIONS:Mexim-lookup-cdb) -LOCAL_MAKEFILE_OPTIONS+=LOOKUP_CDB=YES -DEPENDS+=cdb-[0-9]*:../../databases/cdb +LOCAL_MAKEFILE_OPTIONS+= LOOKUP_CDB=YES +DEPENDS+= cdb-[0-9]*:../../databases/cdb .endif .if !empty(PKG_OPTIONS:Mexim-lookup-dnsdb) -LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DNSDB=YES +LOCAL_MAKEFILE_OPTIONS+= LOOKUP_DNSDB=YES .endif .if !empty(PKG_OPTIONS:Mexim-lookup-dsearch) -LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DSEARCH=YES +LOCAL_MAKEFILE_OPTIONS+= LOOKUP_DSEARCH=YES .endif .if !empty(PKG_OPTIONS:Mexim-lookup-ldap) @@ -95,11 +95,11 @@ LOOKUP_LIBS+=-lwhoson .endif .if !empty(PKG_OPTIONS:Mexim-old-demime) -LOCAL_MAKEFILE_OPTIONS+=WITH_OLD_DEMIME=YES +LOCAL_MAKEFILE_OPTIONS+= WITH_OLD_DEMIME=YES .endif .if !empty(PKG_OPTIONS:Mexim-router-iplookup) -LOCAL_MAKEFILE_OPTIONS+=ROUTER_IPLOOKUP=yes +LOCAL_MAKEFILE_OPTIONS+= ROUTER_IPLOOKUP=yes .endif .if !empty(PKG_OPTIONS:Mexim-tcp-wrappers) @@ -115,13 +115,13 @@ LOOKUP_LIBS+=-lssl -lcrypto .endif .if !empty(PKG_OPTIONS:Mexim-transport-lmtp) -LOCAL_MAKEFILE_OPTIONS+=TRANSPORT_LMTP=yes +LOCAL_MAKEFILE_OPTIONS+= TRANSPORT_LMTP=yes .endif .if !empty(PKG_OPTIONS:Minet6) -LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=YES +LOCAL_MAKEFILE_OPTIONS+= HAVE_IPV6=YES .else -LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=NO +LOCAL_MAKEFILE_OPTIONS+= HAVE_IPV6=NO .endif .if !empty(PKG_OPTIONS:Mopendmarc) diff --git a/mail/faces/Makefile b/mail/faces/Makefile index b5172638d5f..4a393c813a0 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2019/08/11 13:21:27 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2019/11/02 16:25:20 rillig Exp $ DISTNAME= faces-1.6.1 PKGREVISION= 12 @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Visual mail, user and print face server LICENSE= faces-license -RESTRICTED= Distribution not allowed if money exchanged +RESTRICTED= Distribution not allowed if money exchanged NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk index d5f5bc51dde..1f57d675f12 100644 --- a/mail/fetchmail/options.mk +++ b/mail/fetchmail/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.18 2015/09/30 08:25:37 tnn Exp $ +# $NetBSD: options.mk,v 1.19 2019/11/02 16:25:21 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail -PKG_SUPPORTED_OPTIONS= kerberos4 kerberos gssapi ssl +PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail +PKG_SUPPORTED_OPTIONS= kerberos4 kerberos gssapi ssl PKG_OPTIONS_OPTIONAL_GROUPS= socks PKG_OPTIONS_GROUP.socks= socks4 dante -PKG_SUGGESTED_OPTIONS= ssl +PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 92a5f56a51f..d91318f50c8 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2019/09/02 13:19:56 adam Exp $ +# $NetBSD: Makefile,v 1.102 2019/11/02 16:25:21 rillig Exp $ DISTNAME= fetchmail-6.3.26 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -29,7 +29,7 @@ USE_LANGUAGES+= c INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 INSTALL_TARGET= install-pythonPYTHON -PLIST_SUBST+= PYSITELIB=${PYSITELIB} +PLIST_SUBST+= PYSITELIB=${PYSITELIB} REPLACE_PYTHON= fetchmailconf.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 6.3.22 diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile index 8c33bce18f9..526192bfc25 100644 --- a/mail/fetchyahoo/Makefile +++ b/mail/fetchyahoo/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:27 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:21 rillig Exp $ # DISTNAME= fetchyahoo-2.11.0 PKGREVISION= 8 CATEGORIES= mail MASTER_SITES= http://fetchyahoo.sourceforge.net/ -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fetchyahoo/} +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fetchyahoo/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://fetchyahoo.sourceforge.net/ diff --git a/mail/fml/Makefile b/mail/fml/Makefile index de7ada9aa03..5cc57e8a820 100644 --- a/mail/fml/Makefile +++ b/mail/fml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:21:27 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/02 16:25:21 rillig Exp $ # DISTNAME= fml-7.99.1 @@ -59,7 +59,7 @@ PRINT_PLIST_AWK+= /share\/examples\/fml/ \ /${FML_STAMP}/ \ { gsub(/${FML_STAMP}/, "$${FML_STAMP}"); } -CHECK_INTERPRETER_SKIP+= lib/fml/${FML_STAMP}/* \ +CHECK_INTERPRETER_SKIP+= lib/fml/${FML_STAMP}/* \ libexec/fml/${FML_STAMP}/loader.in SUBST_CLASSES+= fixpaths diff --git a/mail/fml4/Makefile b/mail/fml4/Makefile index 2b981604b39..8d5773a9571 100644 --- a/mail/fml4/Makefile +++ b/mail/fml4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:21:28 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 16:25:21 rillig Exp $ # DISTNAME= fml-4.0-stable-20040215 @@ -23,11 +23,11 @@ BUILD_DEFS= FML_DATADIR .include "../../mk/bsd.prefs.mk" -FML_DATADIR?= ${VARBASE}/fml -FML_USER?= fml -FML_GROUP?= fml -PKG_GROUPS= ${FML_GROUP} -PKG_USERS= ${FML_USER}:${FML_GROUP} +FML_DATADIR?= ${VARBASE}/fml +FML_USER?= fml +FML_GROUP?= fml +PKG_GROUPS= ${FML_GROUP} +PKG_USERS= ${FML_USER}:${FML_GROUP} PKG_SHELL.${FML_USER}= /bin/csh REPLACE_PERL= databases/examples/ldap-toymodel/dump.pl \ diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile index 446213f5be4..3d97a6701c0 100644 --- a/mail/freepops/Makefile +++ b/mail/freepops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2019/08/22 12:23:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/02 16:25:21 rillig Exp $ # DISTNAME= freepops-0.2.9 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.freepops.org/ COMMENT= POP3 gateway to AOL, Gmail, Hotmail, Juno, Yahoo, etc LICENSE= gnu-gpl-v2 -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE= no LUA_VERSIONS_ACCEPTED= 51 .include "../../mk/bsd.prefs.mk" diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile index dd839aaef68..98506bef40c 100644 --- a/mail/fromto/Makefile +++ b/mail/fromto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/08/11 13:21:28 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/02 16:25:21 rillig Exp $ DISTNAME= fromto-1.5 PKGREVISION= 7 @@ -10,7 +10,7 @@ MAINTAINER= bad@NetBSD.org COMMENT= Sendmail logfile viewer LICENSE= fromto-license -RESTRICTED= Redistribution allowed for non-commercial purposes only +RESTRICTED= Redistribution allowed for non-commercial purposes only NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile index ad7bead2843..6758d90da28 100644 --- a/mail/gnarwl/Makefile +++ b/mail/gnarwl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/02/02 00:20:45 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/02 16:25:21 rillig Exp $ DISTNAME= gnarwl-3.6 PKGREVISION= 3 @@ -19,22 +19,22 @@ MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes USE_TOOLS+= gmake groff -GNARWL_LIBS= -L${BUILDLINK_PREFIX.openldap}/lib \ +GNARWL_LIBS= -L${BUILDLINK_PREFIX.openldap}/lib \ -W,-lR${BUILDLINK_PREFIX.openldap}/lib \ -L${BUILDLINK_PREFIX.gdbm}/lib \ -W,-lR${BUILDLINK_PREFIX.gdbm}/lib -CONFIGURE_ENV+= LDFLAGS=${GNARWL_LIBS:Q} -CONFIGURE_ARGS+=--with-homedir=${GNARWL_HOME} +CONFIGURE_ENV+= LDFLAGS=${GNARWL_LIBS:Q} +CONFIGURE_ARGS+= --with-homedir=${GNARWL_HOME} LDFLAGS.SunOS+= -liconv -GNARWL_USER?= gnarwl -GNARWL_GROUP?= gnarwl -GNARWL_HOME?= ${VARBASE}/gnarwl -BUILD_DEFS+= GNARWL_USER GNARWL_GROUP -PKG_GROUPS+= ${GNARWL_GROUP} -PKG_USERS+= ${GNARWL_USER}:${GNARWL_GROUP} -PKG_HOME.gnarwl=${GNARWL_HOME} +GNARWL_USER?= gnarwl +GNARWL_GROUP?= gnarwl +GNARWL_HOME?= ${VARBASE}/gnarwl +BUILD_DEFS+= GNARWL_USER GNARWL_GROUP +PKG_GROUPS+= ${GNARWL_GROUP} +PKG_USERS+= ${GNARWL_USER}:${GNARWL_GROUP} +PKG_HOME.gnarwl= ${GNARWL_HOME} GNARWL_MANDIR= ${DESTDIR}${PREFIX}/${PKGMANDIR} @@ -57,11 +57,11 @@ EGDIR= ${PREFIX}/share/examples/gnarwl EGFILES= badheaders.txt blacklist.txt footer.txt header.txt gnarwl.cfg .for files in ${EGFILES} -CONF_FILES+= ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files} +CONF_FILES+= ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files} .endfor -MAKE_DIRS_PERMS+=${GNARWL_HOME} ${GNARWL_USER} ${GNARWL_GROUP} 0750 -SPECIAL_PERMS+=${PREFIX}/bin/gnarwl ${GNARWL_USER} ${GNARWL_GROUP} 04555 +MAKE_DIRS_PERMS+= ${GNARWL_HOME} ${GNARWL_USER} ${GNARWL_GROUP} 0750 +SPECIAL_PERMS+= ${PREFIX}/bin/gnarwl ${GNARWL_USER} ${GNARWL_GROUP} 04555 .include "../../mk/dlopen.builtin.mk" .include "../../databases/openldap-client/buildlink3.mk" diff --git a/mail/greylisting-spp/options.mk b/mail/greylisting-spp/options.mk index ade94a5cedc..c2144bb296b 100644 --- a/mail/greylisting-spp/options.mk +++ b/mail/greylisting-spp/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2018/11/11 01:59:23 schmonz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 16:25:21 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.greylisting-spp PKG_OPTIONS_OPTIONAL_GROUPS= db -PKG_OPTIONS_GROUP.db= db4 sqlite sqlite3 +PKG_OPTIONS_GROUP.db= db4 sqlite sqlite3 PKG_SUGGESTED_OPTIONS= sqlite3 .include "../../mk/bsd.options.mk" diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile index 628139bb6a8..70bfe755934 100644 --- a/mail/heirloom-mailx/Makefile +++ b/mail/heirloom-mailx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/03/05 11:28:48 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/02 16:25:22 rillig Exp $ # DISTNAME= heirloom-mailx_12.5.orig @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.gz MAINTAINER= jgw@sdf.org HOMEPAGE= http://heirloom.sourceforge.net/mailx.html COMMENT= BSD mail utility with MIME extensions -LICENSE= original-bsd AND osl AND mpl-1.1 +LICENSE= original-bsd AND osl AND mpl-1.1 WRKSRC= ${WRKDIR}/heirloom-mailx-12.5 diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile index ff816b578da..ac317e66973 100644 --- a/mail/imapproxy/Makefile +++ b/mail/imapproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/08/08 16:39:11 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 16:25:22 rillig Exp $ # DISTNAME= squirrelmail-imap_proxy-1.2.7 @@ -13,24 +13,24 @@ COMMENT= Simple connection caching IMAP proxy daemon GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--exec_prefix=${DESTDIR}${PREFIX} -BUILD_DEFS+= VARBASE -CFLAGS+= -DDEFAULT_CONFIG_FILE=\"${PREFIX}/etc/imapproxy.conf\" -CFLAGS+= -DDEFAULT_PID_FILE=\"${VARBASE}/run/imapproxy.pid\" -RCD_SCRIPTS= imapproxy +CONFIGURE_ARGS+= --exec_prefix=${DESTDIR}${PREFIX} +BUILD_DEFS+= VARBASE +CFLAGS+= -DDEFAULT_CONFIG_FILE=\"${PREFIX}/etc/imapproxy.conf\" +CFLAGS+= -DDEFAULT_PID_FILE=\"${VARBASE}/run/imapproxy.pid\" +RCD_SCRIPTS= imapproxy IMAPPROXY_USER?= imapproxy IMAPPROXY_GROUP?= imapproxy -IMAPPROXY_CHROOT?= ${VARBASE}/chroot/imapproxy -IMAPPROXY_DOC?= share/doc/imapproxy -IMAPPROXY_EXAMPLES?= share/examples/imapproxy - -PKG_GROUPS_VARS+= IMAPPROXY_GROUP -PKG_USERS_VARS+= IMAPPROXY_USER -PKG_GROUPS= ${IMAPPROXY_GROUP} -PKG_USERS= ${IMAPPROXY_USER}:${IMAPPROXY_GROUP} -PKG_GECOS.${IMAPPROXY_USER}= IMAP Proxy pseudo-user -PKG_HOME.${IMAPPROXY_USER}= ${IMAPPROXY_CHROOT} +IMAPPROXY_CHROOT?= ${VARBASE}/chroot/imapproxy +IMAPPROXY_DOC?= share/doc/imapproxy +IMAPPROXY_EXAMPLES?= share/examples/imapproxy + +PKG_GROUPS_VARS+= IMAPPROXY_GROUP +PKG_USERS_VARS+= IMAPPROXY_USER +PKG_GROUPS= ${IMAPPROXY_GROUP} +PKG_USERS= ${IMAPPROXY_USER}:${IMAPPROXY_GROUP} +PKG_GECOS.${IMAPPROXY_USER}= IMAP Proxy pseudo-user +PKG_HOME.${IMAPPROXY_USER}= ${IMAPPROXY_CHROOT} INSTALLATION_DIRS+= sbin INSTALLATION_DIRS+= ${IMAPPROXY_DOC} diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile index 3ef2ba1e780..cf9e4170011 100644 --- a/mail/ja-mh/Makefile +++ b/mail/ja-mh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2011/11/11 09:18:31 sbd Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:22 rillig Exp $ DISTNAME= mh-6.8.4-JP-3.05 PKGNAME= ja-mh6-3.05 @@ -26,9 +26,9 @@ PKG_DESTDIR_SUPPORT= destdir .include "../../mk/bsd.prefs.mk" -MAKE_JOBS_SAFE= NO -MANCOMPRESSED= yes -GNU_CONFIGURE= yes +MAKE_JOBS_SAFE= NO +MANCOMPRESSED= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-batchmode CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/libexec/mh CONFIGURE_ARGS+= --enable-jmandir=${PREFIX:Q}/${PKGMANDIR:Q}/ja_JP.EUC diff --git a/mail/jchkmail/Makefile b/mail/jchkmail/Makefile index 61a723cea89..264a2e2809a 100644 --- a/mail/jchkmail/Makefile +++ b/mail/jchkmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/09/24 14:30:36 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:22 rillig Exp $ DISTNAME= jchkmail-1.3.1a PKGREVISION= 2 @@ -18,16 +18,16 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-rc-dir=${PREFIX}/share/examples/rc.d \ --with-conf-dir=${PKG_SYSCONFDIR:Q} -EGDIR= ${PREFIX}/share/examples/jchkmail -PKG_SYSCONFSUBDIR= jchkmail -CONF_FILES+= ${EGDIR}/j-chkmail.cf ${PKG_SYSCONFDIR}/j-chkmail.cf -CONF_FILES+= ${EGDIR}/j-local-users ${PKG_SYSCONFDIR}/j-local-users -CONF_FILES+= ${EGDIR}/j-error-msg ${PKG_SYSCONFDIR}/j-error-msg -CONF_FILES+= ${EGDIR}/j-nets ${PKG_SYSCONFDIR}/j-nets -CONF_FILES+= ${EGDIR}/j-host-access ${PKG_SYSCONFDIR}/j-host-access -CONF_FILES+= ${EGDIR}/j-user-access ${PKG_SYSCONFDIR}/j-user-access -CONF_FILES+= ${EGDIR}/j-regex ${PKG_SYSCONFDIR}/j-regex -RCD_SCRIPTS= jchkmail +EGDIR= ${PREFIX}/share/examples/jchkmail +PKG_SYSCONFSUBDIR= jchkmail +CONF_FILES+= ${EGDIR}/j-chkmail.cf ${PKG_SYSCONFDIR}/j-chkmail.cf +CONF_FILES+= ${EGDIR}/j-local-users ${PKG_SYSCONFDIR}/j-local-users +CONF_FILES+= ${EGDIR}/j-error-msg ${PKG_SYSCONFDIR}/j-error-msg +CONF_FILES+= ${EGDIR}/j-nets ${PKG_SYSCONFDIR}/j-nets +CONF_FILES+= ${EGDIR}/j-host-access ${PKG_SYSCONFDIR}/j-host-access +CONF_FILES+= ${EGDIR}/j-user-access ${PKG_SYSCONFDIR}/j-user-access +CONF_FILES+= ${EGDIR}/j-regex ${PKG_SYSCONFDIR}/j-regex +RCD_SCRIPTS= jchkmail RCD_SCRIPT_SRC.jchkmail= ${WRKSRC}/bin/jchkmail.init PTHREAD_AUTO_VARS= yes diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk index 3ffb7173165..c7f19bbae5e 100644 --- a/mail/libmilter/builtin.mk +++ b/mail/libmilter/builtin.mk @@ -1,9 +1,9 @@ -# $NetBSD: builtin.mk,v 1.6 2013/11/23 11:34:45 obache Exp $ +# $NetBSD: builtin.mk,v 1.7 2019/11/02 16:25:22 rillig Exp $ BUILTIN_PKG:= libmilter -BUILTIN_FIND_LIBS:= milter -BUILTIN_FIND_HEADERS_VAR:= H_LIBMILTER +BUILTIN_FIND_LIBS:= milter +BUILTIN_FIND_HEADERS_VAR:= H_LIBMILTER BUILTIN_FIND_HEADERS.H_LIBMILTER= libmilter/mfapi.h .include "../../mk/buildlink3/bsd.builtin.mk" @@ -20,7 +20,7 @@ IS_BUILTIN.libmilter= no IS_BUILTIN.libmilter= yes . endif .endif -MAKEVARS+= IS_BUILTIN.libmilter +MAKEVARS+= IS_BUILTIN.libmilter ### ### Determine whether we should use the built-in implementation if it @@ -47,4 +47,4 @@ USE_BUILTIN.libmilter!= \ . endif . endif # PREFER.libmilter .endif -MAKEVARS+= USE_BUILTIN.libmilter +MAKEVARS+= USE_BUILTIN.libmilter diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 4a6ec49bb35..c5041a600dc 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2019/08/11 13:21:28 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2019/11/02 16:25:22 rillig Exp $ DISTNAME= maildrop-3.0.0 PKGREVISION= 2 @@ -23,7 +23,7 @@ DOCFILES= README README.postfix README.dovecotauth maildroptips.txt # These are the users that may invoke maildrop with the "-d user" # argument (mailbox delivery mode). -MAILDROP_TRUSTED_USERS?=${REAL_ROOT_USER} ${COURIER_USER} ${QMAIL_DAEMON_USER} +MAILDROP_TRUSTED_USERS?= ${REAL_ROOT_USER} ${COURIER_USER} ${QMAIL_DAEMON_USER} BUILD_DEFS+= QMAIL_DAEMON_USER CONFIGURE_ARGS+= --datadir=${DATADIR} diff --git a/mail/mailhops/Makefile b/mail/mailhops/Makefile index 89b856cd331..fe86d782cc8 100644 --- a/mail/mailhops/Makefile +++ b/mail/mailhops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:29 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:22 rillig Exp $ # DISTNAME= mailhops-1.4 @@ -18,11 +18,11 @@ EXTRACT_CMD= ${ECHO} ${CP} "$${extract_file}" ${WRKSRC}/mailhops; \ ${CP} "$${extract_file}" ${WRKSRC}/mailhops -DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate +DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run -REPLACE_PERL+= mailhops +REPLACE_PERL+= mailhops do-build: diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index d8bab959fe4..417c74b19cc 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2019/09/02 13:19:56 adam Exp $ +# $NetBSD: Makefile,v 1.89 2019/11/02 16:25:22 rillig Exp $ DISTNAME= mailman-2.1.29 PKGNAME= mailman-2.1.29 @@ -70,9 +70,9 @@ INSTALL_TEMPLATES+= ${FILESDIR}/INSTALL DEINSTALL_TEMPLATES+= ${FILESDIR}/DEINSTALL PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.1.14.1 -REPLACE_PYTHON+= Mailman/Archiver/pipermail.py -REPLACE_PYTHON+= Mailman/Post.py -REPLACE_PYTHON+= bin/msgfmt.py +REPLACE_PYTHON+= Mailman/Archiver/pipermail.py +REPLACE_PYTHON+= Mailman/Post.py +REPLACE_PYTHON+= bin/msgfmt.py CONFIGURE_ARGS+= --with-cgi-gid=${MAILMAN_CGIGROUP:Q} .if ${MAILMAN_CGIEXT} != "none" diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile index 11b7967818b..6f61324a517 100644 --- a/mail/mailserv/Makefile +++ b/mail/mailserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/11 13:21:29 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/02 16:25:22 rillig Exp $ # DISTNAME= mailserv @@ -18,11 +18,11 @@ USE_TOOLS+= perl:run NO_BUILD= YES PKG_SYSCONFSUBDIR= mailserv -EGDIR= ${PREFIX}/share/examples/mailserv +EGDIR= ${PREFIX}/share/examples/mailserv CONF_FILES= .for cf in listproc listserv mail-list maiser majordomo-admin \ majordomo-share majordomo mlp pmdf smartlist subscribe -CONF_FILES+= ${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf +CONF_FILES+= ${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf .endfor INSTALLATION_DIRS= libexec/cgi-bin diff --git a/mail/mailsort/Makefile b/mail/mailsort/Makefile index ea1b75e8cee..cc39787c042 100644 --- a/mail/mailsort/Makefile +++ b/mail/mailsort/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/08/11 13:21:29 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/02 16:25:23 rillig Exp $ # DISTNAME= mailsort-1.26 @@ -13,9 +13,9 @@ COMMENT= Sort mbox mail folders by date LICENSE= gnu-gpl-v2 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 -REPLACE_PERL+= mailsort -USE_LANGUAGES= # none -USE_TOOLS= perl pod2man +REPLACE_PERL+= mailsort +USE_LANGUAGES= # none +USE_TOOLS= perl pod2man do-build: pod2man ${WRKSRC}/mailsort > ${WRKSRC}/mailsort.1 diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile index 0cc685ef7aa..5730a05ef96 100644 --- a/mail/mailwrapper/Makefile +++ b/mail/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/08 12:19:16 asau Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/02 16:25:23 rillig Exp $ DISTNAME= mailwrapper-19990412 PKGREVISION= 4 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/mailwrapper EGDIR= ${PREFIX}/share/examples/mailwrapper MAILWRAPPER_BACKUP_SFX= .pkgsrc.mailwrapper -FILES_SUBST+= MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX:Q} +FILES_SUBST+= MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX:Q} MAILWRAPPEES= /usr/bin/mailq \ /usr/bin/newaliases /usr/sbin/newaliases \ diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile index 258b326047b..33476fa02af 100644 --- a/mail/mess822/Makefile +++ b/mail/mess822/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/06/19 17:43:28 schmonz Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/02 16:25:23 rillig Exp $ # DISTNAME= mess822-0.58 @@ -27,10 +27,10 @@ SUBST_STAGE.paths= do-configure SUBST_FILES.paths= hier.c SUBST_VARS.paths= PKGMANDIR -MESS822PATCHES= qmailqueue:${QMAILQUEUE_PATCH} -QMAILQUEUE_PATCH= mess822-0.58-qmailqueue-20170527.patch -PATCHFILES+= ${QMAILQUEUE_PATCH} -SITES.${QMAILQUEUE_PATCH}=https://schmonz.com/qmail/mess822qmailqueue/ +MESS822PATCHES= qmailqueue:${QMAILQUEUE_PATCH} +QMAILQUEUE_PATCH= mess822-0.58-qmailqueue-20170527.patch +PATCHFILES+= ${QMAILQUEUE_PATCH} +SITES.${QMAILQUEUE_PATCH}= https://schmonz.com/qmail/mess822qmailqueue/ BUILD_DEFS+= MESS822PATCHES diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 498f86e1a5e..5207e67437b 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2018/06/20 12:03:04 ryoon Exp $ +# $NetBSD: Makefile,v 1.98 2019/11/02 16:25:23 rillig Exp $ DISTNAME= mew-6.8 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -25,14 +25,14 @@ EMACS_VERSIONS_ACCEPTED+= emacs25 emacs25nox EMACS_VERSIONS_ACCEPTED+= emacs21 emacs21nox EMACS_MODULES+= base -MAKE_FLAGS+= DESTDIR=${DESTDIR:Q} -MAKE_FLAGS+= prefix=${PREFIX:Q} -MAKE_FLAGS+= exec_prefix=${PREFIX:Q} -MAKE_FLAGS+= EMACS=${EMACS_BIN:Q} -MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX:Q}/mew -MAKE_FLAGS+= etcdir=${EMACS_ETCPREFIX:Q}/mew -MAKE_FLAGS+= infodir=${EMACS_INFOPREFIX:Q} -MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1 +MAKE_FLAGS+= DESTDIR=${DESTDIR:Q} +MAKE_FLAGS+= prefix=${PREFIX:Q} +MAKE_FLAGS+= exec_prefix=${PREFIX:Q} +MAKE_FLAGS+= EMACS=${EMACS_BIN:Q} +MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX:Q}/mew +MAKE_FLAGS+= etcdir=${EMACS_ETCPREFIX:Q}/mew +MAKE_FLAGS+= infodir=${EMACS_INFOPREFIX:Q} +MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1 CONFIGURE_ARGS+= --with-etcdir=${EMACS_ETCPREFIX}/mew SUBST_CLASSES+= local diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 2ca279a5d4e..519009e2f2a 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2019/08/22 12:23:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.77 2019/11/02 16:25:23 rillig Exp $ DISTNAME= milter-greylist-4.4.3 PKGREVISION= 14 @@ -36,15 +36,15 @@ INSTALLATION_DIRS+= share/examples/milter-greylist OWN_DIRS_PERMS+= ${VARBASE}/milter-greylist ${MILTER_USER} ${MILTER_GROUP} 0755 -SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= greylist.conf greylist2.conf -SUBST_SED.paths+= -e "s|/var/run|${VARBASE}/run|g" -SUBST_SED.paths+= -e "s|/var/milter-greylist|${VARBASE}/milter-greylist|g" -SUBST_MESSAGE.paths= Fixing paths in conf examples. +SUBST_CLASSES+= paths +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= greylist.conf greylist2.conf +SUBST_SED.paths+= -e "s|/var/run|${VARBASE}/run|g" +SUBST_SED.paths+= -e "s|/var/milter-greylist|${VARBASE}/milter-greylist|g" +SUBST_MESSAGE.paths= Fixing paths in conf examples. -EGDIR= ${PREFIX}/share/examples/milter-greylist -CONF_FILES= ${EGDIR}/greylist.conf ${PKG_SYSCONFDIR}/greylist.conf +EGDIR= ${PREFIX}/share/examples/milter-greylist +CONF_FILES= ${EGDIR}/greylist.conf ${PKG_SYSCONFDIR}/greylist.conf post-install: diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile index 10ee3c9bcb5..533f36e699d 100644 --- a/mail/milter-manager/Makefile +++ b/mail/milter-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/09/14 18:13:50 tsutsui Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/02 16:25:23 rillig Exp $ # DISTNAME= milter-manager-2.0.5 @@ -27,11 +27,11 @@ CONFIGURE_ARGS+= --with-ruby=${RUBY} CONFIGURE_ARGS+= --enable-ruby-milter=${PREFIX}/${RUBY_VENDORLIB} CONFIGURE_ARGS+= --with-bundled-ruby-glib2=no -SUBST_CLASSES+= libev_inc -SUBST_STAGE.libev_inc= pre-configure -SUBST_MESSAGE.libev_inc=Adjust include path for libevent from pkgsrc. -SUBST_FILES.libev_inc= configure -SUBST_SED.libev_inc= 's,/include/ev.h,/include/ev/ev.h,g' +SUBST_CLASSES+= libev_inc +SUBST_STAGE.libev_inc= pre-configure +SUBST_MESSAGE.libev_inc= Adjust include path for libevent from pkgsrc. +SUBST_FILES.libev_inc= configure +SUBST_SED.libev_inc= 's,/include/ev.h,/include/ev/ev.h,g' PKG_SYSCONFSUBDIR= ${PKGBASE} @@ -48,14 +48,14 @@ PKGCONFIG_OVERRIDE+= ruby-milter-client.pc.in PKGCONFIG_OVERRIDE+= ruby-milter-core.pc.in PKGCONFIG_OVERRIDE+= ruby-milter-server.pc.in -MILTER_MANAGER_USER?= _milter -MILTER_MANAGER_GROUP?= _milter -MILTER_MANAGER_SOCKET_GROUP?= mail -PKG_GROUPS= ${MILTER_MANAGER_GROUP} ${MILTER_MANAGER_SOCKET_GROUP} -PKG_USERS= ${MILTER_MANAGER_USER}:${MILTER_MANAGER_GROUP} +MILTER_MANAGER_USER?= _milter +MILTER_MANAGER_GROUP?= _milter +MILTER_MANAGER_SOCKET_GROUP?= mail +PKG_GROUPS= ${MILTER_MANAGER_GROUP} ${MILTER_MANAGER_SOCKET_GROUP} +PKG_USERS= ${MILTER_MANAGER_USER}:${MILTER_MANAGER_GROUP} PKG_GECOS.${MILTER_MANAGER_USER}= Milter Manager -PKG_GROUPS_VARS+= MILTER_MANAGER_GROUP MILTER_MANAGER_SOCKET_GROUP -PKG_USERS_VARS= MILTER_MANAGER_USER +PKG_GROUPS_VARS+= MILTER_MANAGER_GROUP MILTER_MANAGER_SOCKET_GROUP +PKG_USERS_VARS= MILTER_MANAGER_USER FILES_SUBST+= MILTER_MANAGER_USER=${MILTER_MANAGER_USER:Q} FILES_SUBST+= MILTER_MANAGER_GROUP=${MILTER_MANAGER_GROUP:Q} diff --git a/mail/mush/Makefile b/mail/mush/Makefile index 3adbc2278aa..cc32dd6cb54 100644 --- a/mail/mush/Makefile +++ b/mail/mush/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/05/23 19:23:06 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/02 16:25:23 rillig Exp $ DISTNAME= mush-7.2.5 PKGNAME= mush-7.2.6.b4.pl1 @@ -7,9 +7,9 @@ CATEGORIES= mail MASTER_SITES= # ftp://cse.ogi.edu/pub/mush/ EXTRACT_SUFX= .tar.Z -PATCH_SITES= # ftp://cse.ogi.edu/pub/mush/CONTRIB/ +PATCH_SITES= # ftp://cse.ogi.edu/pub/mush/CONTRIB/ PATCH_DIST_ARGS= -s -d ${WRKDIR} -E -p1 -PATCHFILES= patch-7.2.6-alpha-1 \ +PATCHFILES= patch-7.2.6-alpha-1 \ patch-7.2.6-alpha-2 \ patch-7.2.6-alpha-3 \ patch-7.2.6-beta-1 \ diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 9b34031e781..94c2a520d68 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.214 2019/09/21 22:32:41 tron Exp $ +# $NetBSD: Makefile,v 1.215 2019/11/02 16:25:23 rillig Exp $ DISTNAME= mutt-1.12.2 CATEGORIES= mail @@ -60,7 +60,7 @@ SUBST_FILES.paths= doc/Muttrc SUBST_VARS.paths+= DOCDIR PREFIX SUBST_STAGE.paths= pre-configure -SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551 +SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551 INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} .include "../../devel/zlib/buildlink3.mk" diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk index e022f12e1e8..56f533738ca 100644 --- a/mail/mutt/options.mk +++ b/mail/mutt/options.mk @@ -1,18 +1,18 @@ -# $NetBSD: options.mk,v 1.31 2019/01/22 13:19:44 wiz Exp $ +# $NetBSD: options.mk,v 1.32 2019/11/02 16:25:23 rillig Exp $ # Global and legacy options -PKG_OPTIONS_VAR= PKG_OPTIONS.mutt +PKG_OPTIONS_VAR= PKG_OPTIONS.mutt PKG_OPTIONS_REQUIRED_GROUPS= display PKG_OPTIONS_OPTIONAL_GROUPS= ssl PKG_OPTIONS_GROUP.display= curses wide-curses slang -PKG_OPTIONS_GROUP.ssl= gnutls openssl -PKG_SUPPORTED_OPTIONS= debug gpgme idn smime sasl +PKG_OPTIONS_GROUP.ssl= gnutls openssl +PKG_SUPPORTED_OPTIONS= debug gpgme idn smime sasl # TODO: add kyoto cabinet and lmdb backend options for header cache -PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-compressed-mbox tokyocabinet mutt-smtp -PKG_SUPPORTED_OPTIONS+= gssapi -PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime openssl -PKG_SUGGESTED_OPTIONS+= gssapi mutt-compressed-mbox +PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-compressed-mbox tokyocabinet mutt-smtp +PKG_SUPPORTED_OPTIONS+= gssapi +PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime openssl +PKG_SUGGESTED_OPTIONS+= gssapi mutt-compressed-mbox # remove after 2019Q1 PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses PKG_OPTIONS_LEGACY_OPTS+= ssl:openssl @@ -153,7 +153,7 @@ CONFIGURE_ARGS+= --with-idn=no ### .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-debug -CFLAGS+= -g +CFLAGS+= -g .endif ### diff --git a/mail/neomutt/options.mk b/mail/neomutt/options.mk index d3c7c072138..79530018bab 100644 --- a/mail/neomutt/options.mk +++ b/mail/neomutt/options.mk @@ -1,12 +1,12 @@ -# $NetBSD: options.mk,v 1.12 2018/07/04 13:40:24 jperkin Exp $ +# $NetBSD: options.mk,v 1.13 2019/11/02 16:25:23 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt +PKG_OPTIONS_VAR= PKG_OPTIONS.neomutt PKG_OPTIONS_REQUIRED_GROUPS= display PKG_OPTIONS_GROUP.display= curses ncurses ncursesw slang -PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl -PKG_SUPPORTED_OPTIONS+= tokyocabinet -PKG_SUGGESTED_OPTIONS= gpgme gssapi idn ncursesw sasl smime ssl -PKG_SUGGESTED_OPTIONS+= tokyocabinet +PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl +PKG_SUPPORTED_OPTIONS+= tokyocabinet +PKG_SUGGESTED_OPTIONS= gpgme gssapi idn ncursesw sasl smime ssl +PKG_SUGGESTED_OPTIONS+= tokyocabinet .include "../../mk/bsd.options.mk" @@ -127,7 +127,7 @@ CONFIGURE_ARGS+= --disable-idn ### Enable debugging support ### .if !empty(PKG_OPTIONS:Mdebug) -CFLAGS+= -g +CFLAGS+= -g .endif ### diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile index f81dc399a47..cbeccc1f438 100644 --- a/mail/newspipe/Makefile +++ b/mail/newspipe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:06 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:24 rillig Exp $ # DISTNAME= newspipe.1.1.9 @@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text WRKSRC= ${WRKDIR} -NO_BUILD= yes +NO_BUILD= yes REPLACE_PYTHON= *.py SUBST_CLASSES+= bin diff --git a/mail/nullmailer/options.mk b/mail/nullmailer/options.mk index 2f65097f664..912a4d84532 100644 --- a/mail/nullmailer/options.mk +++ b/mail/nullmailer/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2018/10/13 14:38:54 schmonz Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/02 16:25:24 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.nullmailer -PKG_SUPPORTED_OPTIONS= gnutls -PKG_SUGGESTED_OPTIONS= gnutls +PKG_OPTIONS_VAR= PKG_OPTIONS.nullmailer +PKG_SUPPORTED_OPTIONS= gnutls +PKG_SUGGESTED_OPTIONS= gnutls .include "../../mk/bsd.options.mk" diff --git a/mail/oe2mbx/Makefile b/mail/oe2mbx/Makefile index ace90922da3..75f7451743c 100644 --- a/mail/oe2mbx/Makefile +++ b/mail/oe2mbx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2017/09/03 08:36:56 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 16:25:24 rillig Exp $ # DISTNAME= oe2mbx-1.21 @@ -20,7 +20,7 @@ MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \ INSTALL_LIB=${INSTALL_LIB:Q} \ INSTALL_DATA=${INSTALL_DATA:Q} -BUILD_TARGET= liboe oe2mbx +BUILD_TARGET= liboe oe2mbx INSTALLATION_DIRS= bin lib include pre-build: diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index 95d4cf07ea1..b6b2ef0737e 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:06 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:24 rillig Exp $ VERSION= 5.7.3p2 DISTNAME= opensmtpd-${VERSION} @@ -10,8 +10,8 @@ HOMEPAGE= https://www.opensmtpd.org/ COMMENT= The OpenSMTPD mail transfer agent, a replacement for sendmail LICENSE= isc AND modified-bsd AND 2-clause-bsd -CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* -CONFLICTS+= esmtp>=1.2 nullmailer-[0-9]* postfix-[0-9]* +CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* +CONFLICTS+= esmtp>=1.2 nullmailer-[0-9]* postfix-[0-9]* BROKEN_FOR_PLATFORM= OpenBSD-*-* BUILD_DEFS+= VARBASE @@ -31,8 +31,8 @@ PKG_HOME._smtpd= ${SMTPD_HOME} PKG_GECOS._smtpq= OpenSMTPD pseudo-user PKG_HOME._smtpq= ${SMTPD_HOME} -GNU_CONFIGURE= yes -USE_DB185= yes +GNU_CONFIGURE= yes +USE_DB185= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-mantype=man CONFIGURE_ARGS+= --with-privsep-path=${SMTPD_HOME} diff --git a/mail/p5-Catalyst-View-Email/Makefile b/mail/p5-Catalyst-View-Email/Makefile index b8989cf6e6f..8c904ded788 100644 --- a/mail/p5-Catalyst-View-Email/Makefile +++ b/mail/p5-Catalyst-View-Email/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:21:31 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/02 16:25:24 rillig Exp $ DISTNAME= Catalyst-View-Email-0.36 PKGNAME= p5-${DISTNAME} @@ -28,7 +28,7 @@ USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Catalyst/View/Email/.packlist # M:I:AI switch - this is EU:MM module -#MAKE_ENV+= PERL_AUTOINSTALL=--skipdeps +#MAKE_ENV+= PERL_AUTOINSTALL=--skipdeps EXTRACT_USING= gtar diff --git a/mail/p5-Email-Address-XS/Makefile b/mail/p5-Email-Address-XS/Makefile index ae8f7afeca0..f91ba0158dc 100644 --- a/mail/p5-Email-Address-XS/Makefile +++ b/mail/p5-Email-Address-XS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/08/11 13:21:31 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/02 16:25:24 rillig Exp $ DISTNAME= Email-Address-XS-1.04 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/Email-Address-XS COMMENT= Parse and format RFC 2822 email addresses and groups LICENSE= ${PERL5_LICENSE} -PERL5_PACKLIST= auto/Email/Address/XS/.packlist +PERL5_PACKLIST= auto/Email/Address/XS/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/p5-Email-Address/Makefile b/mail/p5-Email-Address/Makefile index 4a2a035490f..18f5769b60c 100644 --- a/mail/p5-Email-Address/Makefile +++ b/mail/p5-Email-Address/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/08/11 13:21:31 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/02 16:25:24 rillig Exp $ DISTNAME= Email-Address-1.912 PKGNAME= p5-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= ${PERL5_LICENSE} #DEPENDS+= {perl>=5.7.3,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple -PERL5_PACKLIST= auto/Email/Address/.packlist +PERL5_PACKLIST= auto/Email/Address/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile index 124e4e28e47..eb2473e5b88 100644 --- a/mail/p5-Email-Folder/Makefile +++ b/mail/p5-Email-Folder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:21:32 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/02 16:25:24 rillig Exp $ DISTNAME= Email-Folder-0.860 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/Email-Folder COMMENT= Perl 5 module to read all the messages from a folder LICENSE= ${PERL5_LICENSE} -PERL5_PACKLIST= auto/Email/Folder/.packlist +PERL5_PACKLIST= auto/Email/Folder/.packlist DEPENDS+= p5-Email-FolderType>=0.6:../../mail/p5-Email-FolderType DEPENDS+= p5-Email-Simple-[0-9]*:../../mail/p5-Email-Simple diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile index 3d0bd8a93c6..707405a9444 100644 --- a/mail/p5-Email-FolderType/Makefile +++ b/mail/p5-Email-FolderType/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/08/11 13:21:32 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:24 rillig Exp $ DISTNAME= Email-FolderType-0.814 PKGNAME= p5-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable -PERL5_PACKLIST= auto/Email/FolderType/.packlist +PERL5_PACKLIST= auto/Email/FolderType/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/p5-Email-LocalDelivery/Makefile b/mail/p5-Email-LocalDelivery/Makefile index 20e2e5a43a3..ce88fbf0828 100644 --- a/mail/p5-Email-LocalDelivery/Makefile +++ b/mail/p5-Email-LocalDelivery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:32 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:25 rillig Exp $ DISTNAME= Email-LocalDelivery-1.200 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/Email-LocalDelivery COMMENT= Perl 5 module to deliver a piece of email - simply LICENSE= ${PERL5_LICENSE} -PERL5_PACKLIST= auto/Email/LocalDelivery/.packlist +PERL5_PACKLIST= auto/Email/LocalDelivery/.packlist DEPENDS+= p5-Email-FolderType>=0.7:../../mail/p5-Email-FolderType DEPENDS+= p5-Email-Simple>=1.998:../../mail/p5-Email-Simple diff --git a/mail/p5-Email-MessageID/Makefile b/mail/p5-Email-MessageID/Makefile index 2047254b3fb..a8bebdbccb8 100644 --- a/mail/p5-Email-MessageID/Makefile +++ b/mail/p5-Email-MessageID/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/11 13:21:33 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/02 16:25:25 rillig Exp $ DISTNAME= Email-MessageID-1.406 PKGNAME= p5-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-Email-Address>=1.80:../../mail/p5-Email-Address #DEPENDS+= {perl>5.7.3,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple -PERL5_PACKLIST= auto/Email/MessageID/.packlist +PERL5_PACKLIST= auto/Email/MessageID/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/p5-Mail-Alias/Makefile b/mail/p5-Mail-Alias/Makefile index 49cc28680dc..f1ff94bf447 100644 --- a/mail/p5-Mail-Alias/Makefile +++ b/mail/p5-Mail-Alias/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:21:35 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:25 rillig Exp $ DISTNAME= Mail-Alias-1.12 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Perl 5 module to manipulate mail alias files LICENSE= ${PERL5_LICENSE} USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Mail/Alias/.packlist +PERL5_PACKLIST= auto/Mail/Alias/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile index 5353516ab9d..c02458d3aea 100644 --- a/mail/p5-Mail-SPF/Makefile +++ b/mail/p5-Mail-SPF/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:21:37 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 16:25:25 rillig Exp $ DISTNAME= Mail-SPF-v2.9.0 PKGNAME= p5-${DISTNAME:S/-v/-/} @@ -12,7 +12,7 @@ COMMENT= Perl implementation of the Sender Policy Framework LICENSE= modified-bsd BUILD_DEPENDS+= p5-Net-DNS-Resolver-Programmable-[0-9]*:../../net/p5-Net-DNS-Resolver-Programmable -#BUILD_DEPENDS+= {perl>=5.6.2,p5-Test-Simple>=0.10}:../../devel/p5-Test-Simple +#BUILD_DEPENDS+= {perl>=5.6.2,p5-Test-Simple>=0.10}:../../devel/p5-Test-Simple #DEPENDS+= {perl>=5.9.0,p5-version-[0-9]*}:../../devel/p5-version DEPENDS+= p5-Error-[0-9]*:../../devel/p5-Error diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile index 46579d08661..aea86ae451d 100644 --- a/mail/p5-Mail-SRS/Makefile +++ b/mail/p5-Mail-SRS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/08/11 13:21:38 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/02 16:25:25 rillig Exp $ DISTNAME= Mail-SRS-0.31 PKGNAME= p5-${DISTNAME} @@ -12,10 +12,10 @@ COMMENT= SMTP envelope sender rewriting for SPF-compliant forwarding CONFLICTS+= libsrs2-[0-9]* -#DEPENDS+= {perl>=5.8.1,p5-DB_File>=1.806}:../../databases/p5-DB_File -DEPENDS+= p5-Digest-HMAC>=1.01:../../security/p5-Digest-HMAC -DEPENDS+= p5-MLDBM>=2.01:../../databases/p5-MLDBM -#DEPENDS+= p5-Storable>=2.04:../../devel/p5-Storable +#DEPENDS+= {perl>=5.8.1,p5-DB_File>=1.806}:../../databases/p5-DB_File +DEPENDS+= p5-Digest-HMAC>=1.01:../../security/p5-Digest-HMAC +DEPENDS+= p5-MLDBM>=2.01:../../databases/p5-MLDBM +#DEPENDS+= p5-Storable>=2.04:../../devel/p5-Storable #BUILD_DEPENDS+= {perl>=5.6.2,p5-Test-Simple>=0.40}:../../devel/p5-Test-Simple PERL5_PACKLIST= auto/Mail/SRS/.packlist diff --git a/mail/p5-Mail-Sender-Easy/Makefile b/mail/p5-Mail-Sender-Easy/Makefile index 5e79d88fa81..f58af33c75e 100644 --- a/mail/p5-Mail-Sender-Easy/Makefile +++ b/mail/p5-Mail-Sender-Easy/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.17 2019/08/11 13:21:38 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:25 rillig Exp $ # DISTNAME= Mail-Sender-Easy-v0.0.5 PKGNAME= p5-${DISTNAME:S:-v:-:} PKGREVISION= 12 CATEGORIES= mail perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DM/DMUEY/} +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DM/DMUEY/} MAINTAINER= abs@NetBSD.org #HOMEPAGE= http://search.cpan.org/~dmuey/Mail-Sender/ COMMENT= Simplified interface to Mail::Sender DEPENDS+= p5-Mail-Sender>=0:../../mail/p5-Mail-Sender -#DEPENDS+= {perl>=5.9.0,p5-version>=0}:../../devel/p5-version +#DEPENDS+= {perl>=5.9.0,p5-version>=0}:../../devel/p5-version PERL5_PACKLIST= auto/Mail/Sender/Easy/.packlist diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile index a6c15dfc547..cf5f7ef860f 100644 --- a/mail/p5-Mail-Sender/Makefile +++ b/mail/p5-Mail-Sender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/08/11 13:21:38 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/02 16:25:25 rillig Exp $ DISTNAME= Mail-Sender-0.903 PKGNAME= p5-${DISTNAME} @@ -15,8 +15,8 @@ LICENSE= ${PERL5_LICENSE} PERL5_PACKLIST= auto/Mail/Sender/.packlist -BUILD_TARGET=pure_all -INSTALL_TARGET=pure_install +BUILD_TARGET= pure_all +INSTALL_TARGET= pure_install .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/perdition/Makefile.common b/mail/perdition/Makefile.common index 50f3d8fd75c..c450439019d 100644 --- a/mail/perdition/Makefile.common +++ b/mail/perdition/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2013/04/08 11:17:16 rodent Exp $ +# $NetBSD: Makefile.common,v 1.10 2019/11/02 16:25:25 rillig Exp $ # # used by mail/perdition-bdb/Makefile # used by mail/perdition-gdbm/Makefile @@ -36,10 +36,10 @@ DEPENDS+= perdition-${PERDITION_VERSION}{,nb*}:../../mail/perdition BUILD_DIRS?= perdition/db/${PERDITION_PKGNAME} .endif -PERDITION_SKIP_DISABLE?=${PERDITION_PKGNAME} +PERDITION_SKIP_DISABLE?= ${PERDITION_PKGNAME} .for f in mysql odbc pg gdbm bdb ldap ldap-doc . if empty(PERDITION_SKIP_DISABLE:M$f) -CONFIGURE_ARGS+= --disable-${f} +CONFIGURE_ARGS+= --disable-${f} . endif .endfor diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile index 8672d3cea49..80432971ed8 100644 --- a/mail/pine-pgp-filters/Makefile +++ b/mail/pine-pgp-filters/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/09/03 08:53:11 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:26 rillig Exp $ # DISTNAME= pine-pgp-filters-1.6 @@ -13,8 +13,8 @@ COMMENT= Filters to integrate Pine with gnupg or pgp HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -DOCDIR= ${PREFIX}/share/doc/pine-pgp-filters -DOCFILES= BUGS CHANGES INSTALL LICENSE README +DOCDIR= ${PREFIX}/share/doc/pine-pgp-filters +DOCFILES= BUGS CHANGES INSTALL LICENSE README DEPENDS+= gnupg>=1.4.9:../../security/gnupg diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 2ef493c888f..746645f3311 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.136 2017/03/23 17:32:39 joerg Exp $ +# $NetBSD: Makefile,v 1.137 2019/11/02 16:25:26 rillig Exp $ DISTNAME= pine4.64 PKGNAME= pine-4.64 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.washington.edu/pine/ COMMENT= Program for Internet News and E-mail LICENSE= pine-license -CONF_FILES= ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf +CONF_FILES= ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf .include "../../mk/compiler.mk" diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile index 0c83b44a55f..6de5fddbf5e 100644 --- a/mail/poppassd/Makefile +++ b/mail/poppassd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/05/23 19:23:07 rillig Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/02 16:25:26 rillig Exp $ # DISTNAME= qpopper${VERSION} @@ -22,8 +22,8 @@ SUBST_VARS.prefix= PREFIX .include "../../mail/qpopper/Makefile.common" CONFIGURE_ARGS+= --enable-poppassd --without-pam -CONFIGURE_ENV+= CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"' -MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q} +CONFIGURE_ENV+= CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"' +MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q} .include "options.mk" diff --git a/mail/postfix/Makefile.common b/mail/postfix/Makefile.common index 99a3ee8b69b..00881e97dcd 100644 --- a/mail/postfix/Makefile.common +++ b/mail/postfix/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2019/09/23 20:00:07 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.21 2019/11/02 16:25:26 rillig Exp $ # used by mail/postfix/Makefile # used by mail/postfix/Makefile.module @@ -121,7 +121,7 @@ CCARGS+= -DNO_NISPLUS CFLAGS.SunOS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DESTDIR_INSTALLOPTIONS=-package install_root="${DESTDIR}" +DESTDIR_INSTALLOPTIONS= -package install_root="${DESTDIR}" do-configure: cd ${WRKSRC} && \ diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile index 8ba43db85b9..5d86923765d 100644 --- a/mail/prayer/Makefile +++ b/mail/prayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2019/08/11 13:21:40 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2019/11/02 16:25:26 rillig Exp $ DISTNAME= prayer-1.3.5 PKGREVISION= 2 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/ COMMENT= Small, fast, web mail interface -LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 BDB_ACCEPTED= db4 db5 USE_TOOLS+= gmake perl @@ -49,7 +49,7 @@ CONF_FILES+= ${EGDIR}/motd.html ${PKG_SYSCONFDIR}/motd.html VAR_PREFIX= ${VARBASE}/spool/prayer -OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750 +OWN_DIRS_PERMS+= ${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750 FILES_SUBST+= OPSYS=${OPSYS} FILES_SUBST+= VAR_PREFIX=${VAR_PREFIX:Q} diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index 19650cb107b..98a5bf7585b 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2019/07/09 15:46:42 riastradh Exp $ +# $NetBSD: Makefile,v 1.52 2019/11/02 16:25:26 rillig Exp $ DISTNAME= procmail-3.22 PKGREVISION= 5 @@ -12,8 +12,8 @@ LICENSE= artistic OR gnu-gpl-v2 MAKE_JOBS_SAFE= no -MAKE_ENV+= SHELL=${SH:Q} CHMOD=${CHMOD:Q} -INSTALL_TARGET= install-suid install.man +MAKE_ENV+= SHELL=${SH:Q} CHMOD=${CHMOD:Q} +INSTALL_TARGET= install-suid install.man UNLIMIT_RESOURCES= datasize SPECIAL_PERMS+= bin/procmail ${SETUID_ROOT_PERMS} @@ -29,7 +29,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ### Inlining functions (implied by -O3 or higher) cause the strstr() test ### to enter an infinite loop so disable it. This fixes PR pkg/30999. -CFLAGS+= -fno-inline-functions +CFLAGS+= -fno-inline-functions pre-configure: ${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}" \ diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile index 8d972cbf390..143949da9a1 100644 --- a/mail/py-libgmail/Makefile +++ b/mail/py-libgmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:56 adam Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:26 rillig Exp $ DISTNAME= libgmail-0.1.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-mechanize-[0-9]*:../../www/py-mechanize USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # py-mechanize +PYTHON_VERSIONS_ACCEPTED= 27 # py-mechanize .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile index f3a610806ba..424a06fb293 100644 --- a/mail/qmail-conf/Makefile +++ b/mail/qmail-conf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2018/07/29 23:20:30 schmonz Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/02 16:25:26 rillig Exp $ # DISTNAME= qmail-conf-0.60 @@ -6,7 +6,7 @@ PKGREVISION= 5 CATEGORIES= mail MASTER_SITES= http://woodsheep.jp/qmail-conf/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX} -SITES.djbdns-1.05.tar.gz=http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/ +SITES.djbdns-1.05.tar.gz= http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://woodsheep.jp/qmail-conf.html diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index ae5ee3995e6..e807eb1c40f 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.114 2019/08/20 02:38:04 schmonz Exp $ +# $NetBSD: Makefile,v 1.115 2019/11/02 16:25:26 rillig Exp $ # DISTNAME= notqmail-1.07 @@ -110,20 +110,20 @@ SUBST_VARS.config= SORT MV CP PKG_SYSCONFDIR QMAIL_QUEUE_EXTRA SUBST_FILES.djbware+= cdb_seek.c dns.c -PKG_USERS_VARS+= QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER -PKG_USERS_VARS+= QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER -PKG_USERS_VARS+= QMAIL_REMOTE_USER QMAIL_SEND_USER -PKG_GROUPS_VARS+= QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP -PKG_GROUPS= ${QMAIL_QMAIL_GROUP} ${QMAIL_NOFILES_GROUP} -PKG_USERS+= ${QMAIL_ALIAS_USER}:${QMAIL_NOFILES_GROUP} -PKG_USERS+= ${QMAIL_DAEMON_USER}:${QMAIL_NOFILES_GROUP} -PKG_USERS+= ${QMAIL_LOG_USER}:${QMAIL_NOFILES_GROUP} -PKG_USERS+= ${QMAIL_PASSWD_USER}:${QMAIL_NOFILES_GROUP} -PKG_USERS+= ${QMAIL_QUEUE_USER}:${QMAIL_QMAIL_GROUP} -PKG_USERS+= ${QMAIL_REMOTE_USER}:${QMAIL_QMAIL_GROUP} -PKG_USERS+= ${QMAIL_SEND_USER}:${QMAIL_QMAIL_GROUP} +PKG_USERS_VARS+= QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER +PKG_USERS_VARS+= QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER +PKG_USERS_VARS+= QMAIL_REMOTE_USER QMAIL_SEND_USER +PKG_GROUPS_VARS+= QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP +PKG_GROUPS= ${QMAIL_QMAIL_GROUP} ${QMAIL_NOFILES_GROUP} +PKG_USERS+= ${QMAIL_ALIAS_USER}:${QMAIL_NOFILES_GROUP} +PKG_USERS+= ${QMAIL_DAEMON_USER}:${QMAIL_NOFILES_GROUP} +PKG_USERS+= ${QMAIL_LOG_USER}:${QMAIL_NOFILES_GROUP} +PKG_USERS+= ${QMAIL_PASSWD_USER}:${QMAIL_NOFILES_GROUP} +PKG_USERS+= ${QMAIL_QUEUE_USER}:${QMAIL_QMAIL_GROUP} +PKG_USERS+= ${QMAIL_REMOTE_USER}:${QMAIL_QMAIL_GROUP} +PKG_USERS+= ${QMAIL_SEND_USER}:${QMAIL_QMAIL_GROUP} .for user in ${PKG_USERS:C/\:.*//} -PKG_HOME.${user}= ${QMAILDIR} +PKG_HOME.${user}= ${QMAILDIR} .endfor PKG_HOME.${QMAIL_ALIAS_USER}= ${QMAILDIR}/alias @@ -141,14 +141,14 @@ QMAILPATCHES+= bigdns:${BIGDNS_PATCH} BIGDNS_PATCH= qmail-103.patch PATCHFILES+= ${BIGDNS_PATCH} SITES.${BIGDNS_PATCH}= https://www.ckdhr.com/ckd/ -PATCH_DIST_STRIP.${BIGDNS_PATCH}=-p1 - -QMAILPATCHES+= maildiruniq:${MAILDIRUNIQ_PATCH} -MAILDIRUNIQ_PATCH= qmail-1.03-maildir-uniq.patch -PATCHFILES+= ${MAILDIRUNIQ_PATCH} -SITES.${MAILDIRUNIQ_PATCH}= http://www.memoryhole.net/qmail/ -PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}=-p1 -PATCH_DIST_CAT.${MAILDIRUNIQ_PATCH}= \ +PATCH_DIST_STRIP.${BIGDNS_PATCH}= -p1 + +QMAILPATCHES+= maildiruniq:${MAILDIRUNIQ_PATCH} +MAILDIRUNIQ_PATCH= qmail-1.03-maildir-uniq.patch +PATCHFILES+= ${MAILDIRUNIQ_PATCH} +SITES.${MAILDIRUNIQ_PATCH}= http://www.memoryhole.net/qmail/ +PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}= -p1 +PATCH_DIST_CAT.${MAILDIRUNIQ_PATCH}= \ ${SED} -e 's|"057"|"\\\\057"|' \ -e 's|"072"|"\\\\072"|' \ < ${MAILDIRUNIQ_PATCH} diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index a59970ad102..31fba1f03b7 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.66 2019/08/20 02:38:04 schmonz Exp $ +# $NetBSD: options.mk,v 1.67 2019/11/02 16:25:26 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tai-system-clock tls @@ -24,11 +24,11 @@ DEPENDS+= checkpassword>=0.90nb1:../../sysutils/checkpassword .endif .if !empty(PKG_OPTIONS:Mqmail-customerror) -QMAILPATCHES+= customerror:${CUSTOMERROR_PATCH} -CUSTOMERROR_PATCH= qmail-queue-custom-error-v2.netqmail-1.05.patch -PATCHFILES+= ${CUSTOMERROR_PATCH} -SITES.${CUSTOMERROR_PATCH}= https://notes.sagredo.eu/files/qmail/patches/ -PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}=-p1 +QMAILPATCHES+= customerror:${CUSTOMERROR_PATCH} +CUSTOMERROR_PATCH= qmail-queue-custom-error-v2.netqmail-1.05.patch +PATCHFILES+= ${CUSTOMERROR_PATCH} +SITES.${CUSTOMERROR_PATCH}= https://notes.sagredo.eu/files/qmail/patches/ +PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}= -p1 PATCH_DIST_CAT.${CUSTOMERROR_PATCH}= ${SED} -e 's|vfork|fork|g' < ${CUSTOMERROR_PATCH} .endif @@ -66,19 +66,19 @@ SUBST_MESSAGE.load= Setting linker flags for syncdir. .endif .if !empty(PKG_OPTIONS:Mtai-system-clock) -QMAILPATCHES+= taileapsecs:${TAILEAPSECS_PATCH} -TAILEAPSECS_PATCH= netqmail-1.05-TAI-leapsecs.patch -PATCHFILES+= ${TAILEAPSECS_PATCH} -SITES.${TAILEAPSECS_PATCH}= https://su.bze.ro/software/ -PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}=-p1 -PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \ +QMAILPATCHES+= taileapsecs:${TAILEAPSECS_PATCH} +TAILEAPSECS_PATCH= netqmail-1.05-TAI-leapsecs.patch +PATCHFILES+= ${TAILEAPSECS_PATCH} +SITES.${TAILEAPSECS_PATCH}= https://su.bze.ro/software/ +PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}= -p1 +PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \ ${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \ < ${TAILEAPSECS_PATCH} -SUBST_CLASSES+= libtai -SUBST_STAGE.libtai= do-configure -SUBST_FILES.libtai= leapsecs_read.c -SUBST_SED.libtai= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g' -DEPENDS+= libtai>=0.60nb5:../../devel/libtai +SUBST_CLASSES+= libtai +SUBST_STAGE.libtai= do-configure +SUBST_FILES.libtai= leapsecs_read.c +SUBST_SED.libtai= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g' +DEPENDS+= libtai>=0.60nb5:../../devel/libtai .endif PLIST_VARS+= tls diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk index 5221ac2b615..d914cba0359 100644 --- a/mail/qpopper/options.mk +++ b/mail/qpopper/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.13 2012/06/12 15:45:58 wiz Exp $ +# $NetBSD: options.mk,v 1.14 2019/11/02 16:25:27 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.qpopper -PKG_SUPPORTED_OPTIONS= drac inet6 kerberos pam qpopper-servermode ssl -PKG_SUGGESTED_OPTIONS= inet6 ssl +PKG_OPTIONS_VAR= PKG_OPTIONS.qpopper +PKG_SUPPORTED_OPTIONS= drac inet6 kerberos pam qpopper-servermode ssl +PKG_SUGGESTED_OPTIONS= inet6 ssl PKG_OPTIONS_LEGACY_VARS+= QPOPPER_SERVERMODE:qpopper-servermode PKG_OPTIONS_LEGACY_VARS+= QPOPPER_USE_DRAC:drac diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile index 51a19137048..4d87ceab02c 100644 --- a/mail/queue-repair/Makefile +++ b/mail/queue-repair/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/04/25 07:33:04 maya Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:27 rillig Exp $ # DISTNAME= queue-repair-0.9.0 @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 SYMLINK3_PATCH= queue-repair-0.9.0-symlink3-20180724.patch PATCHFILES+= ${SYMLINK3_PATCH} -SITES.${SYMLINK3_PATCH}=https://schmonz.com/qmail/queuerepairsymlink3/ +SITES.${SYMLINK3_PATCH}= https://schmonz.com/qmail/queuerepairsymlink3/ REPLACE_PYTHON= queue_repair.py diff --git a/mail/quickml/options.mk b/mail/quickml/options.mk index 0e7d014531d..3e415782da3 100644 --- a/mail/quickml/options.mk +++ b/mail/quickml/options.mk @@ -1,15 +1,15 @@ -# $NetBSD: options.mk,v 1.1.1.1 2011/06/19 10:01:53 obache Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 16:25:27 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.quickml -PKG_SUPPORTED_OPTIONS+= quickml-analog quickml-limit +PKG_SUPPORTED_OPTIONS+= quickml-analog quickml-limit .include "../../mk/bsd.options.mk" PLIST_VARS+= analog .if !empty(PKG_OPTIONS:Mlimit) -LIMIT_PATCH= quickml-0.7-limited.patch -PATCHFILES+= ${LIMIT_PATCH} +LIMIT_PATCH= quickml-0.7-limited.patch +PATCHFILES+= ${LIMIT_PATCH} #SITES.${LIMIT_PATCH}= http://linux.matchy.net/view.xcg?c=plugin;plugin=attach_download;p=QuickMLLimited;file_name= SITES.${LIMIT_PATCH}= http://matchy.s28.xrea.com/hiki.xcg?c=plugin;plugin=attach_download;p=QuickMLLimited;file_name= PATCH_DIST_STRIP.${LIMIT_PATCH}= -p1 @@ -17,10 +17,10 @@ PATCH_DIST_STRIP.${LIMIT_PATCH}= -p1 .if !empty(PKG_OPTIONS:Mquickml-analog) -USE_TOOLS+= gs:run -DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick -DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot -PLIST.analog= yes +USE_TOOLS+= gs:run +DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick +DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot +PLIST.analog= yes .else SUBST_CLASSES+= analog SUBST_STAGE.analog= pre-configure diff --git a/mail/re-alpine/Makefile b/mail/re-alpine/Makefile index af947550f4c..a94362f244f 100644 --- a/mail/re-alpine/Makefile +++ b/mail/re-alpine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2017/09/04 18:08:25 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:27 rillig Exp $ # DISTNAME= re-alpine-2.03 @@ -15,24 +15,24 @@ CONFLICTS= alpine-[0-9]* .include "options.mk" -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} -CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q} -CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include -CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib -CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf -CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed -CONFIGURE_ARGS+= --with-smime +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q} +CONFIGURE_ARGS+= --with-ssl-include-dir=${SSLBASE}/include +CONFIGURE_ARGS+= --with-ssl-lib-dir=${SSLBASE}/lib +CONFIGURE_ARGS+= --with-system-pinerc=${PKG_SYSCONFDIR}/pine.conf +CONFIGURE_ARGS+= --with-system-fixed-pinerc=${PKG_SYSCONFDIR}/pine.conf.fixed +CONFIGURE_ARGS+= --with-smime USE_LIBTOOL= yes -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE= no INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M4.99.*) && empty(OS_VERSION:M[5-9]*) -CONFIGURE_ARGS+= --without-pthread +CONFIGURE_ARGS+= --without-pthread .endif SUBST_CLASSES.MirBSD+= mirbsd diff --git a/mail/re-alpine/options.mk b/mail/re-alpine/options.mk index 8d412dff5b1..4f46ed2ae84 100644 --- a/mail/re-alpine/options.mk +++ b/mail/re-alpine/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.2 2012/10/10 19:49:07 markd Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/02 16:25:27 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.alpine -PKG_SUPPORTED_OPTIONS= ldap kerberos pinepwd -PKG_SUGGESTED_OPTIONS= pinepwd +PKG_OPTIONS_VAR= PKG_OPTIONS.alpine +PKG_SUPPORTED_OPTIONS= ldap kerberos pinepwd +PKG_SUGGESTED_OPTIONS= pinepwd .include "../../mk/bsd.options.mk" @@ -26,5 +26,5 @@ CONFIGURE_ARGS+= --with-ldap .endif .if !empty(PKG_OPTIONS:Mpinepwd) -CONFIGURE_ARGS+= --with-passfile=.pinepwd +CONFIGURE_ARGS+= --with-passfile=.pinepwd .endif diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile index bab578d4789..f7b526fd2d9 100644 --- a/mail/ripmime/Makefile +++ b/mail/ripmime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/12/22 19:35:51 shattered Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/02 16:25:27 rillig Exp $ # DISTNAME= ripmime-1.4.0.10 @@ -10,7 +10,7 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.pldaniels.com/ripmime/ COMMENT= Extract the attached files out of a MIME encoded email package -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE= no MAKE_ENV+= LIBS="${BUILDLINK_LDFLAGS} ${BUILDLINK_LDADD.iconv}" INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/mail/roundcube-plugin-enigma/Makefile b/mail/roundcube-plugin-enigma/Makefile index d50e1b65b89..adae77abe12 100644 --- a/mail/roundcube-plugin-enigma/Makefile +++ b/mail/roundcube-plugin-enigma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/09/01 13:08:55 taca Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/02 16:25:27 rillig Exp $ PLUGIN= enigma @@ -8,7 +8,7 @@ LICENSE= gnu-gpl-v3 # JavaScript dependencies from bin/install-jsdeps.sh SITES.openpgp.min.js= https://raw.githubusercontent.com/openpgpjs/openpgpjs/v2.6.2/dist/ -DISTFILES+= openpgp.min.js +DISTFILES+= openpgp.min.js DEPENDS+= ${PHP_PKG_PREFIX}-pear-Crypt_GPG>=1.4.3:../../security/pear-Crypt_GPG diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index d0fba3c30e9..14d40c59f7e 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2019/08/11 13:21:41 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2019/11/02 16:25:27 rillig Exp $ DISTNAME= rspamd-1.9.4 PKGREVISION= 1 @@ -23,7 +23,7 @@ BUILD_DEFS+= VARBASE # Not really true, but difficult to avoid picking up 5.3 LUA_VERSIONS_ACCEPTED= 53 -CPPFLAGS.SunOS+= -D__EXTENSIONS__ +CPPFLAGS.SunOS+= -D__EXTENSIONS__ BUILDLINK_TRANSFORM.Darwin+= rm:-lrt LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd diff --git a/mail/sma/Makefile b/mail/sma/Makefile index 822c455f980..f30081e489a 100644 --- a/mail/sma/Makefile +++ b/mail/sma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/01/23 12:20:47 tron Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/02 16:25:27 rillig Exp $ DISTNAME= sma-1.4 PKGREVISION= 1 @@ -19,7 +19,7 @@ BUILD_TARGET= sma .include "../../mk/bsd.prefs.mk" .if ${OPSYS} != "IRIX" -CFLAGS+= -DUSE_REGEXP +CFLAGS+= -DUSE_REGEXP .endif INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/doc/sma share/examples/sma diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index e9c663deaac..817d15dfc62 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2019/08/11 13:21:42 wiz Exp $ +# $NetBSD: Makefile,v 1.136 2019/11/02 16:25:28 rillig Exp $ DISTNAME= Mail-SpamAssassin-3.4.2 PKGNAME= spamassassin-3.4.2 @@ -20,13 +20,13 @@ LICENSE= apache-2.0 SMF_METHODS= spamassassin -RULESARCHIVE= Mail-SpamAssassin-rules-3.4.2.r1840640.tgz -#RULESARCHIVEASC=${RULESARCHIVE}.asc -#RULESARCHIVESHA=${RULESARCHIVE}.sha1 -FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} -PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q} -#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} -#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} +RULESARCHIVE= Mail-SpamAssassin-rules-3.4.2.r1840640.tgz +#RULESARCHIVEASC= ${RULESARCHIVE}.asc +#RULESARCHIVESHA= ${RULESARCHIVE}.sha1 +FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} +PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q} +#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} +#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} #DEPENDS+= {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar #DEPENDS+= {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File @@ -173,7 +173,7 @@ SA_UPDATE_FETCH_CMD= ${TOOLS_PLATFORM.curl} SA_UPDATE_FETCH_PROG= fetch SA_UPDATE_FETCH_CMD= ${TOOLS_PLATFORM.fetch} .else -DEPENDS+= wget-[0-9]*:../../net/wget +DEPENDS+= wget-[0-9]*:../../net/wget SA_UPDATE_FETCH_PROG= wget SA_UPDATE_FETCH_CMD= ${PREFIX}/bin/wget diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk index 28d5f5337a1..0fee0b7cf99 100644 --- a/mail/spamassassin/options.mk +++ b/mail/spamassassin/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2019/01/26 18:23:05 abs Exp $ +# $NetBSD: options.mk,v 1.16 2019/11/02 16:25:28 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg1 @@ -54,11 +54,11 @@ DEPENDS+= p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6 # use gnupg2 instead of gnupg1 # .if empty(PKG_OPTIONS:Mgnupg1) -DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2 -GPGPATH= ${PREFIX}/bin/gpg2 +DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2 +GPGPATH= ${PREFIX}/bin/gpg2 .else -DEPENDS+= gnupg>=1.0.0:../../security/gnupg -GPGPATH= ${PREFIX}/bin/gpg +DEPENDS+= gnupg>=1.0.0:../../security/gnupg +GPGPATH= ${PREFIX}/bin/gpg .endif SUBST_CLASSES+= gpgpath SUBST_STAGE.gpgpath= pre-configure diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile index 43dc2bfc5f1..1b421ddfdc2 100644 --- a/mail/ssmtp/Makefile +++ b/mail/ssmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:09 rillig Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/02 16:25:28 rillig Exp $ # # TLS functionality needs testing. Please let me know the result, # and preferably info about your system. @@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} PKG_SYSCONFSUBDIR= ${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} -CONF_FILES= ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf -CONF_FILES+= ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases +CONF_FILES= ${EGDIR}/ssmtp.conf ${PKG_SYSCONFDIR}/ssmtp.conf +CONF_FILES+= ${EGDIR}/revaliases ${PKG_SYSCONFDIR}/revaliases MAKE_DIRS+= ${PKG_SYSCONFDIR} diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index fdcae7120e2..5730f8175a7 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2019/08/11 13:21:42 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2019/11/02 16:25:28 rillig Exp $ DISTNAME= sympa-6.2.16 PKGREVISION= 3 @@ -13,48 +13,48 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= destdir -DEPENDS+= mhonarc-[0-9]*:../../mail/mhonarc -DEPENDS+= p5-Archive-Zip>=1.05:../../archivers/p5-Archive-Zip -DEPENDS+= p5-AuthCAS>=1.5:../../security/p5-AuthCAS -DEPENDS+= p5-CGI>=2.52:../../www/p5-CGI -DEPENDS+= p5-CGI-Fast>=2.10:../../www/p5-CGI-Fast -DEPENDS+= p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber -DEPENDS+= p5-DBD-Sybase>=0.90:../../databases/p5-DBD-Sybase -DEPENDS+= p5-DBI>=1.06:../../databases/p5-DBI -#DEPENDS+= {perl>=5.10,p5-Digest-MD5>=2.00}:../../security/p5-Digest-MD5 -DEPENDS+= p5-Email-Date-Format>=1.002:../../mail/p5-Email-Date-Format -DEPENDS+= p5-FCGI>=0.67:../../www/p5-FCGI -DEPENDS+= p5-File-Copy-Recursive>=0.38:../../sysutils/p5-File-Copy-Recursive -DEPENDS+= p5-HTML-Format>=2.10:../../www/p5-HTML-Format -DEPENDS+= p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser -DEPENDS+= p5-HTML-Tree>=4.2:../../www/p5-HTML-Tree -DEPENDS+= p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL -DEPENDS+= p5-IO-stringy>=1.0:../../devel/p5-IO-stringy -DEPENDS+= p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl -#DEPENDS+= {perl>=5.7.3,p5-MIME-Base64>=1.0}:../../converters/p5-MIME-Base64 -DEPENDS+= p5-MIME-EncWords>=1.014.000:../../mail/p5-MIME-EncWords -DEPENDS+= p5-MIME-Lite-HTML>=1.23:../../mail/p5-MIME-Lite-HTML -DEPENDS+= p5-MIME-tools>=5.209:../../mail/p5-MIME-tools -DEPENDS+= p5-MailTools>=1.51:../../mail/p5-MailTools -#DEPENDS+= {perl>=5.10,p5-Net>=1.0}:../../net/p5-Net -DEPENDS+= p5-Net-Netmask>=1.9015:../../devel/p5-Net-Netmask -DEPENDS+= p5-Net-SSLeay>=1.16:../../security/p5-Net-SSLeay -DEPENDS+= p5-Regexp-Common>=2.120:../../textproc/p5-Regexp-Common -DEPENDS+= p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite -DEPENDS+= p5-Template-Toolkit>=2.20:../../www/p5-Template-Toolkit -DEPENDS+= p5-Term-ProgressBar>=2.09:../../devel/p5-Term-ProgressBar -#DEPENDS+= {perl>=5.15.1,p5-Time-HiRes>=1.9724}:../../time/p5-Time-HiRes -DEPENDS+= p5-Unicode-LineBreak>=2012.02:../../textproc/p5-Unicode-LineBreak -DEPENDS+= p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML -DEPENDS+= p5-libwww>=1.09:../../www/p5-libwww -DEPENDS+= p5-perl-ldap>=0.27:../../databases/p5-perl-ldap -DEPENDS+= p5-DateTime>=1.2000:../../time/p5-DateTime -DEPENDS+= p5-DateTime-Format-Mail>=0.401:../../time/p5-DateTime-Format-Mail -DEPENDS+= p5-Email-Simple>=2.208:../../mail/p5-Email-Simple -DEPENDS+= p5-File-NFSLock>=1.27:../../devel/p5-File-NFSLock -DEPENDS+= p5-Net-CIDR>=0.18:../../devel/p5-Net-CIDR -DEPENDS+= p5-Net-DNS>=1.01:../../net/p5-Net-DNS -DEPENDS+= p5-Proc-ProcessTable>=0.53:../../devel/p5-Proc-ProcessTable +DEPENDS+= mhonarc-[0-9]*:../../mail/mhonarc +DEPENDS+= p5-Archive-Zip>=1.05:../../archivers/p5-Archive-Zip +DEPENDS+= p5-AuthCAS>=1.5:../../security/p5-AuthCAS +DEPENDS+= p5-CGI>=2.52:../../www/p5-CGI +DEPENDS+= p5-CGI-Fast>=2.10:../../www/p5-CGI-Fast +DEPENDS+= p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber +DEPENDS+= p5-DBD-Sybase>=0.90:../../databases/p5-DBD-Sybase +DEPENDS+= p5-DBI>=1.06:../../databases/p5-DBI +#DEPENDS+= {perl>=5.10,p5-Digest-MD5>=2.00}:../../security/p5-Digest-MD5 +DEPENDS+= p5-Email-Date-Format>=1.002:../../mail/p5-Email-Date-Format +DEPENDS+= p5-FCGI>=0.67:../../www/p5-FCGI +DEPENDS+= p5-File-Copy-Recursive>=0.38:../../sysutils/p5-File-Copy-Recursive +DEPENDS+= p5-HTML-Format>=2.10:../../www/p5-HTML-Format +DEPENDS+= p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser +DEPENDS+= p5-HTML-Tree>=4.2:../../www/p5-HTML-Tree +DEPENDS+= p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL +DEPENDS+= p5-IO-stringy>=1.0:../../devel/p5-IO-stringy +DEPENDS+= p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl +#DEPENDS+= {perl>=5.7.3,p5-MIME-Base64>=1.0}:../../converters/p5-MIME-Base64 +DEPENDS+= p5-MIME-EncWords>=1.014.000:../../mail/p5-MIME-EncWords +DEPENDS+= p5-MIME-Lite-HTML>=1.23:../../mail/p5-MIME-Lite-HTML +DEPENDS+= p5-MIME-tools>=5.209:../../mail/p5-MIME-tools +DEPENDS+= p5-MailTools>=1.51:../../mail/p5-MailTools +#DEPENDS+= {perl>=5.10,p5-Net>=1.0}:../../net/p5-Net +DEPENDS+= p5-Net-Netmask>=1.9015:../../devel/p5-Net-Netmask +DEPENDS+= p5-Net-SSLeay>=1.16:../../security/p5-Net-SSLeay +DEPENDS+= p5-Regexp-Common>=2.120:../../textproc/p5-Regexp-Common +DEPENDS+= p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite +DEPENDS+= p5-Template-Toolkit>=2.20:../../www/p5-Template-Toolkit +DEPENDS+= p5-Term-ProgressBar>=2.09:../../devel/p5-Term-ProgressBar +#DEPENDS+= {perl>=5.15.1,p5-Time-HiRes>=1.9724}:../../time/p5-Time-HiRes +DEPENDS+= p5-Unicode-LineBreak>=2012.02:../../textproc/p5-Unicode-LineBreak +DEPENDS+= p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML +DEPENDS+= p5-libwww>=1.09:../../www/p5-libwww +DEPENDS+= p5-perl-ldap>=0.27:../../databases/p5-perl-ldap +DEPENDS+= p5-DateTime>=1.2000:../../time/p5-DateTime +DEPENDS+= p5-DateTime-Format-Mail>=0.401:../../time/p5-DateTime-Format-Mail +DEPENDS+= p5-Email-Simple>=2.208:../../mail/p5-Email-Simple +DEPENDS+= p5-File-NFSLock>=1.27:../../devel/p5-File-NFSLock +DEPENDS+= p5-Net-CIDR>=0.18:../../devel/p5-Net-CIDR +DEPENDS+= p5-Net-DNS>=1.01:../../net/p5-Net-DNS +DEPENDS+= p5-Proc-ProcessTable>=0.53:../../devel/p5-Proc-ProcessTable #DEPENDS.SunOS+= {perl>=5.10,p5-DB_File>=1.75}:../../databases/p5-DB_File OPSYSVARS+= DEPENDS @@ -144,13 +144,13 @@ OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/outgoing ${SYMPA_USER} ${SYMPA_GROUP} 770 OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/task ${SYMPA_USER} ${SYMPA_GROUP} 770 OWN_DIRS_PERMS+= ${SYMPA_SPOOL}/tmp ${SYMPA_USER} ${SYMPA_GROUP} 770 -SPECIAL_PERMS+= ${SYMPA_BIN}/sympa_newaliases-wrapper ${REAL_ROOT_USER} ${SYMPA_GROUP} 4550 -SPECIAL_PERMS+= ${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555 -SPECIAL_PERMS+= ${SYMPA_BIN}/familyqueue ${SYMPA_USER} ${SYMPA_GROUP} 4555 -SPECIAL_PERMS+= ${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555 -SPECIAL_PERMS+= ${SYMPA_PREFIX}/libexec/cgi-bin/wwsympa-wrapper.fcgi \ +SPECIAL_PERMS+= ${SYMPA_BIN}/sympa_newaliases-wrapper ${REAL_ROOT_USER} ${SYMPA_GROUP} 4550 +SPECIAL_PERMS+= ${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555 +SPECIAL_PERMS+= ${SYMPA_BIN}/familyqueue ${SYMPA_USER} ${SYMPA_GROUP} 4555 +SPECIAL_PERMS+= ${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555 +SPECIAL_PERMS+= ${SYMPA_PREFIX}/libexec/cgi-bin/wwsympa-wrapper.fcgi \ ${SYMPA_USER} ${SYMPA_GROUP} 6555 -SPECIAL_PERMS+= ${SYMPA_PREFIX}/libexec/cgi-bin/sympa_soap_server-wrapper.fcgi \ +SPECIAL_PERMS+= ${SYMPA_PREFIX}/libexec/cgi-bin/sympa_soap_server-wrapper.fcgi \ ${SYMPA_USER} ${SYMPA_GROUP} 6555 CONF_FILES= ${PREFIX}/share/examples/sympa/sympa.conf \ diff --git a/mail/thunderbird-enigmail/Makefile b/mail/thunderbird-enigmail/Makefile index f163236d00f..590e9ff8b48 100644 --- a/mail/thunderbird-enigmail/Makefile +++ b/mail/thunderbird-enigmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/10/10 13:38:05 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 16:25:28 rillig Exp $ DISTNAME= enigmail-2.1.2 PKGNAME= thunderbird-${DISTNAME} @@ -28,9 +28,9 @@ DEPENDS+= pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2 REPLACE_PERL+= util/fixlang.pl REPLACE_PERL+= util/make-lang-xpi.pl -PYTHON_VERSIONS_ACCEPTED= 27 # as of 2.1.2 -REPLACE_PYTHON+= util/checkFiles.py -REPLACE_PYTHON+= util/run-tests.py +PYTHON_VERSIONS_ACCEPTED= 27 # as of 2.1.2 +REPLACE_PYTHON+= util/checkFiles.py +REPLACE_PYTHON+= util/run-tests.py WRKSRC= ${WRKDIR}/enigmail GNU_CONFIGURE= yes diff --git a/mail/thunderbird-l10n/Makefile b/mail/thunderbird-l10n/Makefile index 3dc41215900..1560ed31094 100644 --- a/mail/thunderbird-l10n/Makefile +++ b/mail/thunderbird-l10n/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2019/11/02 13:04:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.84 2019/11/02 16:25:28 rillig Exp $ # TB_VER= 68.2.1 @@ -18,7 +18,7 @@ NO_BUILD= yes INSTALLATION_DIRS= lib/thunderbird/extensions -TB_LOCALES= ar ast be bg br ca cs cy \ +TB_LOCALES= ar ast be bg br ca cs cy \ da de dsb el en-GB en-US es-AR es-ES et \ eu fi fr fy-NL ga-IE gd gl he hr hsb \ hy-AM hu id is it ja ko \ diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 485a1aa6b62..47db819b89b 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.233 2019/11/02 13:02:55 ryoon Exp $ +# $NetBSD: Makefile,v 1.234 2019/11/02 16:25:28 rillig Exp $ DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird-${TB_VER} @@ -31,16 +31,16 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${MOZILLA} .include "../../mk/bsd.prefs.mk" -#SUBST_CLASSES+= ext-compat -#SUBST_STAGE.ext-compat= pre-configure +#SUBST_CLASSES+= ext-compat +#SUBST_STAGE.ext-compat= pre-configure #SUBST_MESSAGE.ext-compat= Fixing extension compatibility -#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf +#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf #SUBST_FILES.ext-compat+= calendar/*/install.rdf #SUBST_FILES.ext-compat+= calendar/*/*/install.rdf #SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g' -CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html -CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/messenger/content/messenger/buildconfig.html +CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html +CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/messenger/content/messenger/buildconfig.html post-extract: ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c diff --git a/mail/thunderbird52-l10n/Makefile b/mail/thunderbird52-l10n/Makefile index 11ee923f41a..59eb38f4ae6 100644 --- a/mail/thunderbird52-l10n/Makefile +++ b/mail/thunderbird52-l10n/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/12/16 08:31:20 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:28 rillig Exp $ # TB_VER= 52.9.1 @@ -16,7 +16,7 @@ DISTFILES= ${XPI_FILES} NO_BUILD= yes -TB_LOCALES= ar ast be bg bn-BD br ca cs cy \ +TB_LOCALES= ar ast be bg bn-BD br ca cs cy \ da de dsb el en-GB en-US es-AR es-ES et \ eu fi fr fy-NL ga-IE gd gl he hr hsb \ hy-AM hu id is it ja ko \ diff --git a/mail/thunderbird52/Makefile b/mail/thunderbird52/Makefile index 03a62afce51..c8bb3fc1b00 100644 --- a/mail/thunderbird52/Makefile +++ b/mail/thunderbird52/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/09/18 14:17:12 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/02 16:25:28 rillig Exp $ DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird${TB_VER:C/\..*$//}-${TB_VER} @@ -34,10 +34,10 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} .include "../../mk/bsd.prefs.mk" -#SUBST_CLASSES+= ext-compat -#SUBST_STAGE.ext-compat= pre-configure +#SUBST_CLASSES+= ext-compat +#SUBST_STAGE.ext-compat= pre-configure #SUBST_MESSAGE.ext-compat= Fixing extension compatibility -#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf +#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf #SUBST_FILES.ext-compat+= calendar/*/install.rdf #SUBST_FILES.ext-compat+= calendar/*/*/install.rdf #SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g' @@ -48,7 +48,7 @@ SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp SUBST_VARS.sys-dic= LOCALBASE -CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html +CHECK_WRKREF_SKIP+= lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html post-extract: mv ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.s \ diff --git a/mail/thunderbird60-l10n/Makefile b/mail/thunderbird60-l10n/Makefile index 80f1ef58c84..d53c9b4a530 100644 --- a/mail/thunderbird60-l10n/Makefile +++ b/mail/thunderbird60-l10n/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/09/21 11:25:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:29 rillig Exp $ # TB_VER= 60.9.0 @@ -18,7 +18,7 @@ NO_BUILD= yes INSTALLATION_DIRS= lib/thunderbird60/extensions -TB_LOCALES= ar ast be bg br ca cs cy \ +TB_LOCALES= ar ast be bg br ca cs cy \ da de dsb el en-GB en-US es-AR es-ES et \ eu fi fr fy-NL ga-IE gd gl he hr hsb \ hy-AM hu id is it ja ko \ diff --git a/mail/thunderbird60/Makefile b/mail/thunderbird60/Makefile index 8b8ed937f41..2c16cf243de 100644 --- a/mail/thunderbird60/Makefile +++ b/mail/thunderbird60/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/09/21 11:23:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/02 16:25:29 rillig Exp $ DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird60-${TB_VER} @@ -32,15 +32,15 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${MOZILLA} .include "../../mk/bsd.prefs.mk" -#SUBST_CLASSES+= ext-compat -#SUBST_STAGE.ext-compat= pre-configure +#SUBST_CLASSES+= ext-compat +#SUBST_STAGE.ext-compat= pre-configure #SUBST_MESSAGE.ext-compat= Fixing extension compatibility -#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf +#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf #SUBST_FILES.ext-compat+= calendar/*/install.rdf #SUBST_FILES.ext-compat+= calendar/*/*/install.rdf #SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g' -CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html +CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html post-extract: mv ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.s \ diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile index 6a2e2eed3a0..9946a002e5e 100644 --- a/mail/tmda/Makefile +++ b/mail/tmda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2019/09/02 13:19:56 adam Exp $ +# $NetBSD: Makefile,v 1.64 2019/11/02 16:25:29 rillig Exp $ DISTNAME= tmda-1.1.12 PKGREVISION= 6 @@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Python-based SPAM reduction system REPLACE_PYTHON= ${TMDA_PROGRAMS} -PY_PATCHPLIST= yes +PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.1.12 PKG_SYSCONFSUBDIR= ${PKGBASE} diff --git a/mail/turba/options.mk b/mail/turba/options.mk index f31ce16fd0b..791a1070c96 100644 --- a/mail/turba/options.mk +++ b/mail/turba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2016/09/11 17:03:26 taca Exp $ +# $NetBSD: options.mk,v 1.6 2019/11/02 16:25:29 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.turba PKG_SUPPORTED_OPTIONS= ldap mysql @@ -17,6 +17,6 @@ DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.3:../../databases/php-ldap ### Use MySQL for storing data ### .if !empty(PKG_OPTIONS:Mmysql) -DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql PHP_VERSIONS_ACCEPTED= 56 .endif diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile index 7495246784f..62800b605db 100644 --- a/mail/up-imapproxy/Makefile +++ b/mail/up-imapproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:09 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/02 16:25:29 rillig Exp $ DISTNAME= up-imapproxy-1.2.5 PKGREVISION= 7 @@ -21,7 +21,7 @@ SUBST_MESSAGE.paths= Fixing hard coded paths. CONF_FILES= ${PREFIX}/share/examples/up-imapproxy/imapproxy.conf \ ${PKG_SYSCONFDIR}/imapproxy.conf -INSTALLATION_DIRS+= sbin share/doc/up-imapproxy share/examples/up-imapproxy +INSTALLATION_DIRS+= sbin share/doc/up-imapproxy share/examples/up-imapproxy INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} .include "../../security/openssl/buildlink3.mk" diff --git a/mail/wl-snapshot/Makefile b/mail/wl-snapshot/Makefile index 0d0546f7b4a..60f5a283f35 100644 --- a/mail/wl-snapshot/Makefile +++ b/mail/wl-snapshot/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2019/10/22 03:55:12 mef Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/02 16:25:29 rillig Exp $ -DISTNAME= wl-beta_2.15.9+0.20190919 +DISTNAME= wl-beta_2.15.9+0.20190919 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/beta_//:S/+0//} CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/wl-beta/} diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile index 911aa2a46ba..7e66189a221 100644 --- a/mail/xmailwatcher/Makefile +++ b/mail/xmailwatcher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/08 12:19:35 asau Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 16:25:29 rillig Exp $ DISTNAME= xmailwatcher PKGNAME= ${DISTNAME}-1.6 @@ -6,7 +6,7 @@ PKGREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.dcs.ed.ac.uk/home/gdmr/X11/ -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Mailbox checker which displays sender and subject lines of mails USE_IMAKE= yes |