[pkgsrc/trunk]: pkgsrc/mail/courier-maildir Update mail/courier-maildir to 0....

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/courier-maildir Update mail/courier-maildir to 0....
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:22:04 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ee09c7ffe79
branches:  trunk
changeset: 489233:7ee09c7ffe79
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 18 22:12:50 2005 +0000

description:
Update mail/courier-maildir to 0.48.2.  Changes from version 0.45.6
include minor bugfixes, and fixing a major typo where the maildiracl
and maildirkw utilities were actually just copies of the maildirmake
utility.

diffstat:

 mail/courier-maildir/DEINSTALL                  |   23 ++++-
 mail/courier-maildir/MESSAGE                    |   13 +-
 mail/courier-maildir/Makefile                   |  100 ++++++++++++++++-------
 mail/courier-maildir/Makefile.common            |   33 +++++++
 mail/courier-maildir/PLIST                      |   17 ++-
 mail/courier-maildir/distinfo                   |    8 +-
 mail/courier-maildir/files/sharedindexupdate.sh |    9 +-
 mail/courier-maildir/patches/patch-aa           |   62 --------------
 mail/courier-maildir/patches/patch-ab           |   13 +++
 9 files changed, 157 insertions(+), 121 deletions(-)

diffs (truncated from 382 to 300 lines):

diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/DEINSTALL
--- a/mail/courier-maildir/DEINSTALL    Fri Feb 18 22:12:46 2005 +0000
+++ b/mail/courier-maildir/DEINSTALL    Fri Feb 18 22:12:50 2005 +0000
@@ -1,6 +1,19 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2005/02/18 22:12:50 jlam Exp $
 
-# Additional files that may be created for courier-maildir.
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/autoresponsesquota"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/maildirfilterconfig"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/maildirshared"
+case ${STAGE} in
+DEINSTALL)
+       #
+       # Note some additional files that may be created by the sysadmin
+       # that can probably be removed.
+       #
+       if ${TEST} -x ./+FILES; then
+               for file in                                             \
+                       ${PKG_SYSCONFDIR}/autoresponsesquota            \
+                       ${PKG_SYSCONFDIR}/maildirfilterconfig           \
+                       ${PKG_SYSCONFDIR}/maildirshared
+               do
+                       ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
+               done
+       fi
+       ;;
+esac
diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/MESSAGE
--- a/mail/courier-maildir/MESSAGE      Fri Feb 18 22:12:46 2005 +0000
+++ b/mail/courier-maildir/MESSAGE      Fri Feb 18 22:12:50 2005 +0000
@@ -1,11 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2005/02/18 22:12:50 jlam Exp $
 
-If you are planning on using Courier-IMAP or SqWebMail to serve mail on
-the system and you will be using shared maildirs, then you should create
-a cron job that runs at regular intervals (once ever few hours is fine)
-that executes the following script to update the shared folder index:
+If you are planning on using Courier-IMAP or SqWebMail to serve mail
+on the system and you will be using shared maildirs, then you should
+create a cron job that runs at regular intervals (once every few hours
+is fine) that executes the following script to update the shared folder
+index:
 
-    ${PREFIX}/share/courier/sharedindexupdate
+    ${PKG_SYSCONFDIR}/sharedindexupdate
 
 ===========================================================================
diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/Makefile
--- a/mail/courier-maildir/Makefile     Fri Feb 18 22:12:46 2005 +0000
+++ b/mail/courier-maildir/Makefile     Fri Feb 18 22:12:50 2005 +0000
@@ -1,61 +1,99 @@
-# $NetBSD: Makefile,v 1.2 2004/07/15 06:49:33 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/18 22:12:50 jlam Exp $
 
-PKGNAME=       courier-maildir-${BASE_VERS}
+DISTNAME=      courier-0.48.2
+PKGNAME=       ${DISTNAME:S/-/-maildir-/}
+PKGBASE=       ${PKGNAME:C/-[^-]*$//}
+CATEGORIES=    mail
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    jlam%NetBSD.org@localhost
 COMMENT=       Courier maildir utilities
+HOMEPAGE=      http://www.courier-mta.org/
 
 CONFLICTS=     courier-maildirmake-[0-9]*
 
+USE_GNU_TOOLS+=                make
 USE_BUILDLINK3=                yes
 USE_LANGUAGES=         c c++
-USE_PKGINSTALL=                yes
 USE_PERL5=             yes
 PERL5_REQD+=           5.8.0
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 
-.include "../courier-auth/Makefile.common"
+.include "Makefile.common"
 
-FILES_SUBST+=          DATADIR=${DATADIR}
+# This package doesn't need to depend on courier-authlib -- just fake
+# out the top-level configure script that thinks it needs
+# courierauthconfig.
+#
+CONFIGURE_ENV+=                ac_cv_path_COURIERAUTHCONFIG=${TRUE:Q}
 
-# WRKSRC_FILES is copied from ../courier-auth/Makefile.authdaemond.
-WRKSRC_FILES=          config.guess config.sub configure               \
-                       install-sh mkinstalldirs                        \
-                       depcomp missing sysconftool
+# These are files required by the Courier configure scripts.
+WRKSRC_FILES=          config.guess config.sub configure depcomp       \
+                       install-sh ltmain.sh missing sysconftool
 WRKSRC_FILES+=         Makefile.in courier.spec.in courier.sysvinit.in \
                        dbobj.h.in dbobj.config.in courier/courier.c
 
-# These are subdirectories of courier that build auxiliary libraries
-# used by courier-maildirmake.
+# These are subdirectories containing libraries used by courier-maildir.
 #
-WRKSRC_SUBDIRS=                bdbobj gdbmobj numlib liblock unicode rfc822
-
-# These are the parts of courier that we will be building and installing.
-WRKSRC_SUBDIRS+=       maildir
+WRKSRC_SUBDIRS=                bdbobj numlib liblock unicode rfc822 maildir
 
 EXTRACT_ELEMENTS=      ${WRKSRC_FILES:S/^/${DISTNAME}\//}
 EXTRACT_ELEMENTS+=     ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 
 BUILD_DIRS=            ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
-INSTALL_DIRS=          ${WRKSRC}/maildir
+INSTALLATION_DIRS=     bin man/man1 man/man5 man/man5 man/man7 man/man8 sbin
 
-OWN_DIRS=      ${PKG_SYSCONFDIR}/shared
-OWN_DIRS+=     ${PKG_SYSCONFDIR}/shared.tmp
-CONF_FILES=    ${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
-
-.include "../../mk/bdb.buildlink3.mk"
+USE_PKGINSTALL=                yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+OWN_DIRS=              ${PKG_SYSCONFDIR}/shared
+OWN_DIRS+=             ${PKG_SYSCONFDIR}/shared.tmp
+CONF_FILES=            ${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
+CONF_FILES_PERMS=      ${EGDIR}/sharedindexupdate                      \
+                       ${PKG_SYSCONFDIR}/sharedindexupdate             \
+                       ${ROOT_USER} ${ROOT_GROUP} 0755
 
 post-build:
        ${SED} ${FILES_SUBST_SED} ${FILESDIR}/sharedindexupdate.sh      \
                > ${WRKDIR}/sharedindexupdate.sh
 
-post-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh                \
-               ${DATADIR}/sharedindexupdate
+do-install:
+       ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg ${EGDIR}/quotawarnmsg
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirquota.txt       \
-               ${DOCDIR}/README.maildirquota.txt
-       ${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.txt      \
-               ${DOCDIR}/README.sharedfolders.txt
+       ${INSTALL_PROGRAM} ${WRKSRC}/maildir/deliverquota               \
+               ${PREFIX}/bin/deliverquota
+       ${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildiracl                 \
+               ${PREFIX}/bin/courier-maildiracl
+       ${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirkw                  \
+               ${PREFIX}/bin/courier-maildirkw
+       ${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirmake                \
+               ${PREFIX}/bin/courier-maildirmake
+       ${INSTALL_MAN} ${WRKSRC}/maildir/maildiracl.1                   \
+               ${PREFIX}/man/man1/courier-maildiracl.1
+       ${INSTALL_MAN} ${WRKSRC}/maildir/maildirkw.1                    \
+               ${PREFIX}/man/man1/courier-maildirkw.1
+       ${INSTALL_MAN} ${WRKSRC}/maildir/maildirmake.1                  \
+               ${PREFIX}/man/man1/courier-maildirmake.1
+       ${INSTALL_MAN} ${WRKSRC}/maildir/maildir.5                      \
+               ${PREFIX}/man/man5/courier-maildir.5
+       ${INSTALL_MAN} ${WRKSRC}/maildir/maildirquota.7                 \
+               ${PREFIX}/man/man7/maildirquota.7
+       ${INSTALL_MAN} ${WRKSRC}/maildir/deliverquota.8                 \
+               ${PREFIX}/man/man8/deliverquota.8
+       ${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg                  \
+               ${EGDIR}/quotawarnmsg
+       ${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexinstall          \
+               ${PREFIX}/sbin/sharedindexinstall
+       ${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexsplit            \
+               ${PREFIX}/sbin/sharedindexsplit
+       ${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh                \
+               ${EGDIR}/sharedindexupdate
+       ${INSTALL_DATA} ${WRKSRC}/maildir/README.imapkeywords.html      \
+               ${DOCDIR}/README.imapkeywords.html
+       ${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirfilter.html     \
+               ${DOCDIR}/README.maildirfilter.html
+       ${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirquota.html      \
+               ${DOCDIR}/README.maildirquota.html
+       ${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.html     \
+               ${DOCDIR}/README.sharedfolders.html
 
 .include "../../mk/bsd.pkg.mk"
diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/courier-maildir/Makefile.common      Fri Feb 18 22:12:50 2005 +0000
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile.common,v 1.1 2005/02/18 22:12:50 jlam Exp $
+#
+# Package Makefiles should include this file after setting PKGBASE and
+# PKG_SUPPORTED_OPTIONS.
+
+PKG_SYSCONFSUBDIR?=    courier
+DOCDIR=                        ${PREFIX}/share/doc/courier
+EGDIR=                 ${PREFIX}/share/examples/courier
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+
+CONFIGURE_ARGS+=       --disable-root-check
+CONFIGURE_ARGS+=       --enable-unicode
+CONFIGURE_ARGS+=       --with-trashquota
+
+USE_DB185=             yes
+CONFIGURE_ARGS+=       --with-db=db
+.include "../../mk/bdb.buildlink3.mk"
+
+CONFIGURE_ENV+=                PERL=${PERL5}
+CONFIGURE_ENV+=                SYSCONFTOOL_PERL=${PERL5}
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.${PKGBASE}
+PKG_SUPPORTED_OPTIONS+=        fam
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mfam)
+.  include "../../sysutils/fam/buildlink3.mk"
+.endif
diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/PLIST
--- a/mail/courier-maildir/PLIST        Fri Feb 18 22:12:46 2005 +0000
+++ b/mail/courier-maildir/PLIST        Fri Feb 18 22:12:50 2005 +0000
@@ -1,20 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
-bin/deliverquota
+@comment $NetBSD: PLIST,v 1.2 2005/02/18 22:12:50 jlam Exp $
 bin/courier-maildiracl
 bin/courier-maildirkw
 bin/courier-maildirmake
+bin/deliverquota
 man/man1/courier-maildiracl.1
 man/man1/courier-maildirkw.1
 man/man1/courier-maildirmake.1
 man/man5/courier-maildir.5
 man/man7/maildirquota.7
 man/man8/deliverquota.8
-share/courier/sharedindexinstall
-share/courier/sharedindexsplit
-share/courier/sharedindexupdate
-share/doc/courier/README.maildirquota.txt
-share/doc/courier/README.sharedfolders.txt
+sbin/sharedindexinstall
+sbin/sharedindexsplit
+share/doc/courier/README.imapkeywords.html
+share/doc/courier/README.maildirfilter.html
+share/doc/courier/README.maildirquota.html
+share/doc/courier/README.sharedfolders.html
 share/examples/courier/quotawarnmsg
+share/examples/courier/sharedindexupdate
 @unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/distinfo
--- a/mail/courier-maildir/distinfo     Fri Feb 18 22:12:46 2005 +0000
+++ b/mail/courier-maildir/distinfo     Fri Feb 18 22:12:50 2005 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+$NetBSD: distinfo,v 1.2 2005/02/18 22:12:50 jlam Exp $
 
-SHA1 (courier-0.45.6.tar.bz2) = 0d8e36211af42e7b539cf53fe1f596e1ecb15117
-Size (courier-0.45.6.tar.bz2) = 4310616 bytes
-SHA1 (patch-aa) = 2c44b5cdff95ecff28f08469a11663957ce76cb5
+SHA1 (courier-0.48.2.tar.bz2) = eaa5b4bd184b28ea676034a3df915d86ff82b0fd
+Size (courier-0.48.2.tar.bz2) = 5874592 bytes
+SHA1 (patch-ab) = 7308011a5e2753ec881aa76111f2473bf8830b90
diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/files/sharedindexupdate.sh
--- a/mail/courier-maildir/files/sharedindexupdate.sh   Fri Feb 18 22:12:46 2005 +0000
+++ b/mail/courier-maildir/files/sharedindexupdate.sh   Fri Feb 18 22:12:50 2005 +0000
@@ -1,24 +1,23 @@
 #!@SH@
 #
-# $NetBSD: sharedindexupdate.sh,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+# $NetBSD: sharedindexupdate.sh,v 1.2 2005/02/18 22:12:50 jlam Exp $
 #
 # This script updates the index of shared folders on the system and is
 # only needed if Courier-IMAP or SqWebMail used to serve mail and shared
 # folders are used.  If so, then this script should be run regularly as a
 # system process to ensure the shared folder index is kept up-to-date.
 #
-# The courier-auth package must be separately installed to provide the
+# The courier-authlib package must be separately installed to provide the
 # "authenumerate" program used in this script.
 
 sysconfdir="@PKG_SYSCONFDIR@"
 sbindir="@PREFIX@/sbin"
-datadir="@DATADIR@"
 
 @RM@ -rf $sysconfdir/shared.tmp
 @MKDIR@ $sysconfdir/shared.tmp || exit 1
 
 @TEST@ -x $sbindir/authenumerate || exit 1
 $sbindir/authenumerate > $sysconfdir/shared.tmp/.tmplist || exit 1
-$datadir/sharedindexsplit $sysconfdir/shared.tmp 1 < $sysconfdir/shared.tmp/.tmplist || exit 1
+$sysconfdir/sharedindexsplit $sysconfdir/shared.tmp 1 < $sysconfdir/shared.tmp/.tmplist || exit 1
 @RM@ -f $sysconfdir/shared.tmp/.tmplist
-$datadir/sharedindexinstall
+$sysconfdir/sharedindexinstall
diff -r d253ce1bc14f -r 7ee09c7ffe79 mail/courier-maildir/patches/patch-aa
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/courier-authlib Update security/courier-authl...
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/maildrop Update mail/maildrop to version 1.8.0. ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/courier-authlib Update security/courier-authl...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/maildrop Update mail/maildrop to version 1.8.0. ...
Indexes:
Home | Main Index | Thread Index | Old Index