Update mail/courier-maildirmake to 0.44.2. Changes from version 0.37.1

include adding a new utility, maildirkw, that manipulates the keywords
on messages in Courier's extended Maildir format.

6 files changed, 61 insertions, 36 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index ec9910eb5f1..ec55349c500 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4941 2004/02/21 14:43:18 jlam Exp $
+$NetBSD: CHANGES,v 1.4942 2004/02/21 14:45:25 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -959,3 +959,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated courier-authldap to 0.44.2 [jlam 2004-02-21]
 	Updated courier-authmysql to 0.44.2 [jlam 2004-02-21]
 	Updated courier-authpgsql to 0.44.2 [jlam 2004-02-21]
+	Updated courier-maildirmake to 0.44.2 [jlam 2004-02-21]
diff --git a/mail/courier-maildirmake/DEINSTALL b/mail/courier-maildirmake/DEINSTALL
index 10c85f23b3a..b1a84397181 100644
--- a/mail/courier-maildirmake/DEINSTALL
+++ b/mail/courier-maildirmake/DEINSTALL
@@ -1,6 +1,6 @@
-# $NetBSD: DEINSTALL,v 1.1 2002/01/23 02:21:20 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2004/02/21 14:45:22 jlam Exp $
 
-# Additional files that are may be created for courier-maildirmake.
+# Additional files that may be created for courier-maildirmake.
 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"
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index ee0c7a1f53d..8b4e1f43704 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,36 +1,39 @@
-# $NetBSD: Makefile,v 1.14 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/02/21 14:45:22 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
-PKGREVISION?=	1
 COMMENT=	Courier Maildir utilities
 
-PERL5_REQD+=	5.6.0
-USE_PERL5=	build
-REPLACE_PERL=	sysconftool
-
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
-.include "../../mail/courier-auth/Makefile.common"
+.include "../courier-auth/Makefile.common"
 
+# WRKSRC_FILES is copied from ../courier-auth/Makefile.authdaemond.
 WRKSRC_FILES=		config.guess config.sub configure		\
-			install-sh mkinstalldirs
-WRKSRC_FILES+=		dbobj.h.in dbobj.config.in sysconftool
-WRKSRC_SUBDIRS=		bdbobj gdbmobj numlib unicode rfc822
+			install-sh mkinstalldirs			\
+			depcomp 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.
+#
+WRKSRC_SUBDIRS=		bdbobj gdbmobj numlib liblock unicode rfc822
+
+# These are the parts of courier that we will be building and installing.
 WRKSRC_SUBDIRS+=	maildir
 
 EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
 EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 
 BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
+INSTALL_DIRS=		${WRKSRC}/maildir
 
 .if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
 INSTALL_TARGET=		install-strip
 .endif
 
-CONF_FILES=		${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
-
-pre-configure: configure-init
+CONF_FILES=	${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
@@ -41,5 +44,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.txt	\
 		${DOCDIR}/README.sharedfolders
 
-.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildirmake/PLIST b/mail/courier-maildirmake/PLIST
index 2d5ef2f1b12..87d41a7bb58 100644
--- a/mail/courier-maildirmake/PLIST
+++ b/mail/courier-maildirmake/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/23 02:21:20 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/21 14:45:22 jlam Exp $
 bin/deliverquota
+bin/maildirkw
 bin/maildirmake
-man/man1/deliverquota.8
+man/man1/maildirkw.1
 man/man1/maildirmake.1
-man/man1/maildirquota.7
+man/man5/maildir.5
+man/man7/maildirquota.7
+man/man8/deliverquota.8
 share/doc/courier/README.maildirquota
 share/doc/courier/README.sharedfolders
 share/examples/courier/quotawarnmsg
diff --git a/mail/courier-maildirmake/distinfo b/mail/courier-maildirmake/distinfo
index e0092df8c51..e4d3a5b9d7f 100644
--- a/mail/courier-maildirmake/distinfo
+++ b/mail/courier-maildirmake/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2002/01/22 22:06:43 jlam Exp $
+$NetBSD: distinfo,v 1.2 2004/02/21 14:45:22 jlam Exp $
 
-SHA1 (courier-0.37.1.tar.gz) = d1649ef994e43484e9cd966d988c1493bfefde9e
-Size (courier-0.37.1.tar.gz) = 3225792 bytes
-SHA1 (patch-aa) = d0d0fe68e800b4bd9ef67b1a74cae8d2dc13a7a2
+SHA1 (courier-0.44.2.tar.bz2) = 8ea25894c5b2cfe841171b47da8e33b24cdca56d
+Size (courier-0.44.2.tar.bz2) = 4001993 bytes
+SHA1 (patch-aa) = c5b6b29b81a0fcdad73615246f5dc92de7662f47
diff --git a/mail/courier-maildirmake/patches/patch-aa b/mail/courier-maildirmake/patches/patch-aa
index 800d605c731..f3c175eb8aa 100644
--- a/mail/courier-maildirmake/patches/patch-aa
+++ b/mail/courier-maildirmake/patches/patch-aa
@@ -1,34 +1,53 @@
-$NetBSD: patch-aa,v 1.1 2002/01/22 22:06:08 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/21 14:45:22 jlam Exp $
 
---- maildir/Makefile.in.orig	Tue Jan 22 10:58:02 2002
+--- maildir/Makefile.in.orig	Sat Nov 15 12:54:41 2003
 +++ maildir/Makefile.in
-@@ -388,9 +388,29 @@
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -664,6 +664,36 @@ uninstall: uninstall-am
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
- install-exec-am:
++install-exec-local:
 +	$(mkinstalldirs) $(DESTDIR)$(bindir)
 +	rm -f $(DESTDIR)$(bindir)/deliverquota
 +	$(INSTALL_PROGRAM) deliverquota $(DESTDIR)$(bindir)/deliverquota
++	rm -f $(DESTDIR)$(bindir)/maildirkw
++	$(INSTALL_PROGRAM) maildirmake $(DESTDIR)$(bindir)/maildirkw
 +	rm -f $(DESTDIR)$(bindir)/maildirmake
 +	$(INSTALL_PROGRAM) maildirmake $(DESTDIR)$(bindir)/maildirmake
 +
- install-exec: install-exec-am
- 
 +man1dir = @mandir@/man1
++man5dir = @mandir@/man5
 +man7dir = @mandir@/man7
 +man8dir = @mandir@/man8
 +
- install-data-am:
++install-data-local:
 +	$(mkinstalldirs) $(DESTDIR)$(man1dir)
++	rm -f $(DESTDIR)$(man1dir)/maildirkw.1
++	$(INSTALL_DATA) maildirkw.1 $(DESTDIR)$(man1dir)/maildirkw.1
 +	rm -f $(DESTDIR)$(man1dir)/maildirmake.1
 +	$(INSTALL_DATA) maildirmake.1 $(DESTDIR)$(man1dir)/maildirmake.1
++	$(mkinstalldirs) $(DESTDIR)$(man5dir)
++	rm -f $(DESTDIR)$(man5dir)/maildir.5
++	$(INSTALL_DATA) maildir.5 $(DESTDIR)$(man5dir)/maildir.5
 +	$(mkinstalldirs) $(DESTDIR)$(man7dir)
 +	rm -f $(DESTDIR)$(man7dir)/maildirquota.7
-+	$(INSTALL_DATA) maildirquota.7 $(DESTDIR)$(man1dir)/maildirquota.7
++	$(INSTALL_DATA) maildirquota.7 $(DESTDIR)$(man7dir)/maildirquota.7
 +	$(mkinstalldirs) $(DESTDIR)$(man8dir)
 +	rm -f $(DESTDIR)$(man8dir)/deliverquota.8
-+	$(INSTALL_DATA) deliverquota.8 $(DESTDIR)$(man1dir)/deliverquota.8
++	$(INSTALL_DATA) deliverquota.8 $(DESTDIR)$(man8dir)/deliverquota.8
 +
- install-data: install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+@@ -702,9 +732,9 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am:
++install-data-am: install-data-local
+ 
+-install-exec-am:
++install-exec-am: install-exec-local
+ 
+ install-info: install-info-am
  
- install-am: all-am