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

that it's no longer a wrapper script.  The installed maildirmake is the
executable that is built from the latest courier sources.  The version
number of this package will now track the version number of the released
courier sources.

6 files changed, 91 insertions, 42 deletions

diff --git a/mail/courier-maildirmake/DESCR b/mail/courier-maildirmake/DESCR
index 40e88a75fe3..9869b91d5e3 100644
--- a/mail/courier-maildirmake/DESCR
+++ b/mail/courier-maildirmake/DESCR
@@ -1,2 +1,2 @@
-This package contains a wrapper script named "maildirmake" to call any of the
-maildirmake executables installed by Courier-IMAP or Maildrop.
+This package contains the utilities used to manipulate the extended Maildirs 
+used by the Courier mail packages.
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 4cd73d792ff..c4c4e3e9b02 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,25 +1,51 @@
-# $NetBSD: Makefile,v 1.3 2002/01/02 19:26:01 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/01/22 22:06:06 jlam Exp $
 
-DISTNAME=	courier-maildirmake-0.3
-CATEGORIES=	mail
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
+PKGNAME=	courier-maildirmake-${BASE_VERS}
+PKGREVISION?=	# empty
+COMMENT=	Courier Maildir utilities
 
-MAINTAINER=	jlam@netbsd.org
-COMMENT=	Wrapper to execute maildirmake
+PERL5_REQD=	5.6.0
+BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
 
-USE_BUILDLINK_ONLY=	# defined
-NO_CHECKSUM=		# defined
-FILES_SUBST=		LOCALBASE=${LOCALBASE}
-FILES_SUBST+=		ECHO=${ECHO}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+USE_BUILDLINK_ONLY=	yes
+REPLACE_PERL=		sysconftool
+
+.include "../../mail/courier-auth/Makefile.common"
+
+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
+WRKSRC_SUBDIRS+=	maildir
+
+EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
+EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
+
+.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+INSTALL_TARGET=		install-strip
+.else
+INSTALL_TARGET=		install
+.endif
+
+pre-configure: configure-init
 
 do-build:
-	${SED} ${FILES_SUBST_SED} \
-		${FILESDIR}/maildirmake.sh > ${WRKDIR}/maildirmake.sh
+.for DIR in ${WRKSRC_SUBDIRS}
+	@cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${ALL_TARGET}
+.endfor
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/maildirmake.sh ${PREFIX}/bin/maildirmake
+.for DIR in ${WRKSRC_SUBDIRS}
+	@cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${INSTALL_TARGET}
+.endfor
+
+post-install:
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirquota.txt	\
+		${DOCDIR}/README.maildirquota
+	${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.txt	\
+		${DOCDIR}/README.sharedfolders
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildirmake/PLIST b/mail/courier-maildirmake/PLIST
index 6b2812a2d5a..1c680da7277 100644
--- a/mail/courier-maildirmake/PLIST
+++ b/mail/courier-maildirmake/PLIST
@@ -1,2 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/22 22:06:06 jlam Exp $
+bin/deliverquota
 bin/maildirmake
+man/man1/deliverquota.8
+man/man1/maildirmake.1
+man/man1/maildirquota.7
+share/doc/courier/README.maildirquota
+share/doc/courier/README.sharedfolders
+@unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-maildirmake/distinfo b/mail/courier-maildirmake/distinfo
new file mode 100644
index 00000000000..e0092df8c51
--- /dev/null
+++ b/mail/courier-maildirmake/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2002/01/22 22:06:43 jlam Exp $
+
+SHA1 (courier-0.37.1.tar.gz) = d1649ef994e43484e9cd966d988c1493bfefde9e
+Size (courier-0.37.1.tar.gz) = 3225792 bytes
+SHA1 (patch-aa) = d0d0fe68e800b4bd9ef67b1a74cae8d2dc13a7a2
diff --git a/mail/courier-maildirmake/files/maildirmake.sh b/mail/courier-maildirmake/files/maildirmake.sh
deleted file mode 100644
index 6facb730ba6..00000000000
--- a/mail/courier-maildirmake/files/maildirmake.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: maildirmake.sh,v 1.3 2002/01/02 19:26:02 jlam Exp $
-#
-# Wrapper to execute maildirmake from amongst any installed maildirmake
-# executable.
-
-maildirmake=
-for file in @LOCALBASE@/bin/maildirmake.* @LOCALBASE@/bin/*.maildirmake
-do
-	if [ -x ${file} ]
-	then
-		maildirmake=${file}
-	fi
-done
-
-if [ -z "${maildirmake}" ]
-then
-	@ECHO@ "$0: can't find a valid maildirmake executable"
-	exit 1
-fi
-
-exec ${maildirmake} $*
diff --git a/mail/courier-maildirmake/patches/patch-aa b/mail/courier-maildirmake/patches/patch-aa
new file mode 100644
index 00000000000..800d605c731
--- /dev/null
+++ b/mail/courier-maildirmake/patches/patch-aa
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.1 2002/01/22 22:06:08 jlam Exp $
+
+--- maildir/Makefile.in.orig	Tue Jan 22 10:58:02 2002
++++ maildir/Makefile.in
+@@ -388,9 +388,29 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ install-exec-am:
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	rm -f $(DESTDIR)$(bindir)/deliverquota
++	$(INSTALL_PROGRAM) deliverquota $(DESTDIR)$(bindir)/deliverquota
++	rm -f $(DESTDIR)$(bindir)/maildirmake
++	$(INSTALL_PROGRAM) maildirmake $(DESTDIR)$(bindir)/maildirmake
++
+ install-exec: install-exec-am
+ 
++man1dir = @mandir@/man1
++man7dir = @mandir@/man7
++man8dir = @mandir@/man8
++
+ install-data-am:
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
++	rm -f $(DESTDIR)$(man1dir)/maildirmake.1
++	$(INSTALL_DATA) maildirmake.1 $(DESTDIR)$(man1dir)/maildirmake.1
++	$(mkinstalldirs) $(DESTDIR)$(man7dir)
++	rm -f $(DESTDIR)$(man7dir)/maildirquota.7
++	$(INSTALL_DATA) maildirquota.7 $(DESTDIR)$(man1dir)/maildirquota.7
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
++	rm -f $(DESTDIR)$(man8dir)/deliverquota.8
++	$(INSTALL_DATA) deliverquota.8 $(DESTDIR)$(man1dir)/deliverquota.8
++
+ install-data: install-data-am
+ 
+ install-am: all-am