Remove the following packages from the "mail" category which were

obsoleted by the security/courier-authlib package:

    courier-auth, courier-authldap, courier-authmysql, courier-authpgsql

32 files changed, 6 insertions, 783 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index c7741599a4a..5a86ad164e3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.9251 2005/02/21 21:58:11 adrianp Exp $
+$NetBSD: CHANGES,v 1.9252 2005/02/21 22:10:38 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -1010,3 +1010,7 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated dtcpclient-20040923nb1 [hamajima 2005-02-21]
 	Updated xorg-server to 6.8.1nb3 [hira 2005-02-21]
 	Added ap2-auth-ldap-2.16 [adrianp 2005-02-21]
+	Removed courier-auth [jlam 2005-02-21]
+	Removed courier-authldap [jlam 2005-02-21]
+	Removed courier-authmysql [jlam 2005-02-21]
+	Removed courier-authpgsql [jlam 2005-02-21]
diff --git a/mail/Makefile b/mail/Makefile
index 01d4ce66c58..e74a7f6480d 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.246 2005/01/25 00:20:25 simonb Exp $
+# $NetBSD: Makefile,v 1.247 2005/02/21 22:10:34 jlam Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -19,10 +19,6 @@ SUBDIR+=	clamav
 SUBDIR+=	clamsmtp
 SUBDIR+=	columba
 SUBDIR+=	coolmail
-SUBDIR+=	courier-auth
-SUBDIR+=	courier-authldap
-SUBDIR+=	courier-authmysql
-SUBDIR+=	courier-authpgsql
 SUBDIR+=	courier-imap
 SUBDIR+=	courier-maildir
 SUBDIR+=	cucipop
diff --git a/mail/courier-auth/DEINSTALL b/mail/courier-auth/DEINSTALL
deleted file mode 100644
index 3122e83d2f1..00000000000
--- a/mail/courier-auth/DEINSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2004/07/14 20:07:07 jlam Exp $
-
-# Additional files that are may be created by the sysadmin.
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/userdb"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/userdb.dat"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/userdbshadow.dat"
-
-case ${STAGE} in
-POST-DEINSTALL)
-	#
-	# Unconditionally remove authdaemon state directory as it contains
-	# files and sockets that authdaemond creates every time it is
-	# started.
-	#
-	${RM} -rf @AUTHDAEMONVAR@
-esac
diff --git a/mail/courier-auth/DESCR b/mail/courier-auth/DESCR
deleted file mode 100644
index 0f1083e1624..00000000000
--- a/mail/courier-auth/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains the authentication daemon, modules, and utilities
-for the Courier mail packages.
diff --git a/mail/courier-auth/INSTALL b/mail/courier-auth/INSTALL
deleted file mode 100644
index 35bab0b5f52..00000000000
--- a/mail/courier-auth/INSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2004/07/14 20:07:07 jlam Exp $
-
-SYSCONFTOOL="@SYSCONFTOOL@"
-EGDIR=${PKG_PREFIX}/share/examples/courier
-GEN_FILES="@GEN_FILES@"
-
-case ${STAGE} in
-POST-INSTALL)
-	eval set -- ${GEN_FILES}
-	for file
-	do
-		# Merge new config files with the old ones.
-		${CP} ${EGDIR}/${file}.dist ${PKG_SYSCONFDIR}/${file}.dist
-		${SYSCONFTOOL} ${PKG_SYSCONFDIR}/${file}
-		${CHMOD} 0600 ${PKG_SYSCONFDIR}/${file}
-		${RM} -f ${PKG_SYSCONFDIR}/${file}.dist
-	done
-	;;
-esac
diff --git a/mail/courier-auth/MESSAGE b/mail/courier-auth/MESSAGE
deleted file mode 100644
index 2fc3a943506..00000000000
--- a/mail/courier-auth/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/07/14 20:07:07 jlam Exp $
-
-To enable changing the system password via a Courier authentication module,
-the following packages will need to be installed:
-
-    tcl-expect	Tcl extension for scripting of interactive programs
-===========================================================================
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
deleted file mode 100644
index 1f37dce92a9..00000000000
--- a/mail/courier-auth/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2005/02/13 20:44:27 zuntum Exp $
-
-PKGNAME=	courier-auth-${BASE_VERS}
-PKGREVISION=	1
-CATEGORIES=	security
-COMMENT=	authentication modules for Courier mail packages
-
-CONFLICTS=	courier-imap<=1.4.0
-CONFLICTS+=	courier-imap-ldap-[0-9]*
-
-USE_PERL5=		yes
-REPLACE_PERL=		sysconftool
-
-USE_PKGINSTALL=		yes
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-auth
-
-.include "../courier-auth/Makefile.authdaemond"
-
-WRKSRC_FILES+=		imap/system-auth.authpam
-
-INSTALL_DIRS=		${WRKSRC}/liblog ${WRKSRC}/makedat		\
-			${WRKSRC}/userdb ${WRKSRC}/authlib
-
-GEN_FILES=		authdaemonrc
-FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
-
-OWN_DIRS_PERMS=		${AUTHDAEMONVAR} ${ROOT_USER} ${ROOT_GROUP} 700
-CONF_FILES_PERMS=	# empty
-.for FILE in ${GEN_FILES}
-CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
-			${ROOT_USER} ${ROOT_GROUP} 0600
-.endfor
-RCD_SCRIPTS=		authdaemond
-
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/README.authdebug.html ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/authdaemonrc			\
-		${EGDIR}/authdaemonrc.dist
-	${INSTALL_DATA} ${WRKSRC}/imap/system-auth.authpam ${EGDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
deleted file mode 100644
index f81f8ea0522..00000000000
--- a/mail/courier-auth/Makefile.authdaemond
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile.authdaemond,v 1.15 2005/02/07 11:35:42 jlam Exp $
-
-USE_BUILDLINK3=		yes
-USE_LANGUAGES=		c c++
-
-.include "../courier-auth/Makefile.common"
-
-PERL5_REQD+=		5.6.0
-USE_PERL5?=		build
-
-# These are files needed by the configure scripts or are needed by the
-# build process.
-#
-WRKSRC_FILES=		config.guess config.sub configure		\
-			install-sh mkinstalldirs			\
-			depcomp missing sysconftool
-
-# These are the inputs for the files generated by the top-level configure
-# script.
-#
-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 the authentication daemon.
-#
-WRKSRC_SUBDIRS=		afx bdbobj gdbmobj numlib soxwrap md5 sha1	\
-			libhmac random128 unicode rfc822 rfc1035	\
-			rfc2045 liblock liblog
-
-# These are the parts of courier that we will be building and installing.
-WRKSRC_SUBDIRS+=	makedat userdb authlib
-
-EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
-EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
-
-DISTINFO_FILE=		${.CURDIR}/../courier-auth/distinfo
-PATCHDIR=		${.CURDIR}/../courier-auth/patches
-
-# The top-level configure script will call all of the other configure
-# scripts in the subdirectories, so we don't need to set CONFIGURE_DIRS.
-# However, we need to build in each subdirectory on our own.
-#
-BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
-
-.include "../../mk/bdb.buildlink3.mk"
-
-PKG_SUPPORTED_OPTIONS=	PAM
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:MPAM)
-.  include "../../mk/pam.buildlink3.mk"
-.endif
diff --git a/mail/courier-auth/Makefile.common b/mail/courier-auth/Makefile.common
deleted file mode 100644
index 8d23e99a74e..00000000000
--- a/mail/courier-auth/Makefile.common
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile.common,v 1.13 2004/07/14 20:07:07 jlam Exp $
-
-DISTNAME?=	courier-${DIST_VERS}
-CATEGORIES+=	mail
-MASTER_SITES?=	${MASTER_SITE_SOURCEFORGE:=courier/}
-EXTRACT_SUFX?=	.tar.bz2
-
-MAINTAINER?=	jlam@NetBSD.org
-HOMEPAGE?=	http://www.courier-mta.org/
-
-# Version numbering scheme:
-#
-# DIST_VERS	version number on the distfile
-# BASE_BERS	pkgsrc-manged version number
-#
-DIST_VERS=	0.45.6
-BASE_VERS=	${DIST_VERS}
-
-USE_GNU_TOOLS+=		make
-
-PKG_SYSCONFSUBDIR?=	courier
-DATADIR=		${PREFIX}/share/courier
-LIBEXECDIR=		${PREFIX}/libexec/courier
-AUTHLIBDIR=		${LIBEXECDIR}/authlib
-DOCDIR=			${PREFIX}/share/doc/courier
-HTMLDIR=		${PREFIX}/share/doc/html/courier
-EGDIR=			${PREFIX}/share/examples/courier
-
-SYSCONFTOOL=		${DATADIR}/sysconftool
-FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--datadir=${DATADIR}
-CONFIGURE_ARGS+=	--libexecdir=${LIBEXECDIR}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-
-CONFIGURE_ARGS+=	--enable-unicode
-CONFIGURE_ARGS+=	--with-authchangepwdir=${LIBEXECDIR}
-
-CONFIGURE_ARGS+=	--with-db=db
-CONFIGURE_ARGS+=	--with-userdb=${PKG_SYSCONFDIR}/userdb
-CONFIGURE_ARGS+=	--with-makedatprog=${LIBEXECDIR}/makedatprog
-CONFIGURE_ARGS+=	--disable-root-check
-
-# Workaround a Solaris bug noted in:
-#	http://www.inter7.com/courierimap/FAQ.html#solarisbug
-#
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--with-waitfunc=wait3
-.endif
-
-# Build authdaemon, but explicitly disable certain methods (ldap, mysql,
-# pgsql) that are built in separate packages.  We also disable authcustom
-# since it's just a sample template authentication method, and authvchkpw
-# since vpopmail is very explicitly *not* officially supported by the
-# Courier author (though it's possible to work around this deficiency by
-# using vchkpw2userdb(8)).
-#
-AUTHDAEMONVAR?=		${VARBASE}/authdaemon
-FILES_SUBST+=		AUTHDAEMONVAR=${AUTHDAEMONVAR}
-CONFIGURE_ARGS+=	--with-authdaemon
-CONFIGURE_ARGS+=	--with-authdaemonvar=${AUTHDAEMONVAR}
-CONFIGURE_ARGS+=	--without-authcustom
-CONFIGURE_ARGS+=	--without-authldap
-CONFIGURE_ARGS+=	--without-authmysql
-CONFIGURE_ARGS+=	--without-authpgsql
-CONFIGURE_ARGS+=	--without-authvchkpw
-
-CONFIGURE_ENV+=		EXPECT=${LOCALBASE}/bin/expect
-CONFIGURE_ENV+=		PERL=${PERL5}
diff --git a/mail/courier-auth/PLIST b/mail/courier-auth/PLIST
deleted file mode 100644
index 810d911697e..00000000000
--- a/mail/courier-auth/PLIST
+++ /dev/null
@@ -1,46 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/07/14 20:07:07 jlam Exp $
-libexec/courier/authdaemon.passwd
-libexec/courier/authlib/authdaemon
-libexec/courier/authlib/authdaemond
-libexec/courier/authlib/authdaemond.plain
-libexec/courier/authsystem.passwd
-libexec/courier/makedatprog
-man/man1/courierlogger.1
-man/man7/authcram.7
-man/man7/authdaemon.7
-man/man7/authdaemond.7
-man/man7/authldap.7
-man/man7/authlib.7
-man/man7/authmysql.7
-man/man7/authpam.7
-man/man7/authpwd.7
-man/man7/authshadow.7
-man/man7/authuserdb.7
-man/man7/authvchkpw.7
-man/man8/makeuserdb.8
-man/man8/pw2userdb.8
-man/man8/userdb.8
-man/man8/userdbpw.8
-man/man8/vchkpw2userdb.8
-sbin/authenumerate
-sbin/authinfo
-sbin/courierlogger
-sbin/makeuserdb
-sbin/pw2userdb
-sbin/userdb
-sbin/userdbpw
-sbin/vchkpw2userdb
-share/courier/authsystem.passwd
-share/courier/makeuserdb
-share/courier/pw2userdb
-share/courier/sysconftool
-share/courier/userdb
-share/courier/vchkpw2userdb
-share/doc/courier/README.authdebug.html
-share/examples/courier/authdaemonrc.dist
-share/examples/courier/system-auth.authpam
-@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}
-@unexec ${RMDIR} -p %D/libexec/courier/authlib 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/libexec/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-auth/distinfo b/mail/courier-auth/distinfo
deleted file mode 100644
index 46254003937..00000000000
--- a/mail/courier-auth/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.5 2004/07/14 20:07:07 jlam Exp $
-
-SHA1 (courier-0.45.6.tar.bz2) = 0d8e36211af42e7b539cf53fe1f596e1ecb15117
-Size (courier-0.45.6.tar.bz2) = 4310616 bytes
-SHA1 (patch-aa) = c98d26c09d7c783783aad0050895db0e52e51054
-SHA1 (patch-ab) = fe2fdca8fbf00ea8404af49b62d1aa48e77f704f
-SHA1 (patch-ac) = 882528d0be8b807b9eb24f7c54da5ec455d4d0a3
-SHA1 (patch-ae) = 50fc5bbfda430c28171ab2527233f7d922536f8a
-SHA1 (patch-af) = 9606816c7035dde2db87634f678f6eb281555c61
-SHA1 (patch-ag) = b628ca5f8287e50db4e9f4131d67cb48e7a70697
-SHA1 (patch-ah) = 67edc2090b713d9d6224a0a92854c9c497e6688e
-SHA1 (patch-ai) = e2acc313dd3fb577059b5daf22760b0095b246d3
diff --git a/mail/courier-auth/files/authdaemond.sh b/mail/courier-auth/files/authdaemond.sh
deleted file mode 100644
index 894d9ce23b5..00000000000
--- a/mail/courier-auth/files/authdaemond.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: authdaemond.sh,v 1.9 2004/07/15 08:28:33 jlam Exp $
-#
-# Courier user authentication daemon
-#
-# PROVIDE: authdaemond
-# REQUIRE: LOGIN
-
-if [ -f /etc/rc.subr ]; then
-        . /etc/rc.subr
-fi
-
-name="authdaemond"
-rcvar=${name}
-command="@PREFIX@/sbin/courierlogger"
-ctl_command="@PREFIX@/libexec/courier/authlib/authdaemond"
-pidfile="@AUTHDAEMONVAR@/pid"
-required_files="@PKG_SYSCONFDIR@/authdaemonrc"
-
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
-
-courier_doit()
-{
-	action=$1
-	case ${action} in
-	start)
-		for f in $required_files; do
-			if [ ! -r "$f" ]; then
-				@ECHO@ 1>&2 "$0: WARNING: $f is not readable"
-				if [ -z $rc_force ]; then
-					return 1
-				fi
-			fi
-		done
-		@ECHO@ "Starting ${name}."
-		;;
-	stop)
-		@ECHO@ "Stopping ${name}."
-		;;
-	esac
-
-	${ctl_command} ${action}
-}
-
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${start_cmd}
-fi
diff --git a/mail/courier-auth/patches/patch-aa b/mail/courier-auth/patches/patch-aa
deleted file mode 100644
index 2c174ec89e4..00000000000
--- a/mail/courier-auth/patches/patch-aa
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/07/14 20:07:07 jlam Exp $
-
---- authlib/Makefile.in.orig	Mon May 24 22:34:24 2004
-+++ authlib/Makefile.in	Tue Jul 13 03:20:40 2004
-@@ -54,7 +54,7 @@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- 
--AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/../automake.fix @AUTOMAKE@
-+AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-@@ -1313,7 +1313,7 @@
- 
- install-data-am: install-data-local
- 
--install-exec-am:
-+install-exec-am: install-exec-local
- 
- install-info: install-info-am
- 
-@@ -1521,9 +1521,40 @@
- authdaemondstaticlist.c: config.status
- 	@SHELL@ $(srcdir)/mkmodulelist.sh @DAEMON_STATIC_LIST@ >authdaemondstaticlist.c
- 
-+# This target installs the authlib daemons and password programs and is
-+# largely copied from the install-exec-hook target in ../courier/Makefile.in.
-+#
-+install-exec-local:
-+	for d in $(sbindir) $(libexecdir) $(libexecdir)/authlib ; do \
-+			$(mkinstalldirs) $(DESTDIR)$$d || exit 1; done
-+	for f in authenumerate authinfo ; do \
-+		rm -rf $(DESTDIR)$(sbindir)/$$f; \
-+		$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$f \
-+			$(DESTDIR)$(sbindir)/$$f ; done
-+	for f in `cat ../authlib/installlist`; do test -z "$$f" && continue; \
-+		test -f ../authlib/$$f || continue; \
-+		$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) ../authlib/$$f \
-+			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
-+	for f in `cat ../authlib/installlist.sh`; do test -z "$$f" && continue; \
-+		test -f ../authlib/$$f || continue; \
-+		$(INSTALL_SCRIPT) ../authlib/$$f \
-+			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
-+	$(mkinstalldirs) $(DESTDIR)@authchangepwdir@
-+	. ../authlib/authpwdprogs ; for f in `echo $$PWPROGS dummy` ; do \
-+		test "$$f" = "dummy" && continue ; \
-+		$(INSTALL_PROGRAM) ../authlib/$$f \
-+			$(DESTDIR)@authchangepwdir@/$$f ; done
-+	. ../authlib/authpwdprogs ; for f in `echo $$PWSCRIPTS dummy` ; do \
-+		test "$$f" = "dummy" && continue ; \
-+		$(INSTALL_SCRIPT) ../authlib/$$f \
-+			$(DESTDIR)$(datadir)/$$f ; \
-+		rm -f $(DESTDIR)@authchangepwdir@/$$f ; \
-+		$(LN_S) $(datadir)/$$f \
-+			$(DESTDIR)@authchangepwdir@/$$f ; done
-+
- # automake still a bit stupid...
- 
--install-data-local: install-authldaprc install-authdaemonrc install-authmysqlrc install-authpgsqlrc
-+install-data-local: install-authldaprc install-authmysqlrc install-authpgsqlrc
- 	test "$(man_LINKS)" = "" && exit 0; \
- 	$(mkinstalldirs) $(DESTDIR)$(man7dir) ; \
- 	for f in $(man_MANS) "" ; do \
-@@ -1533,7 +1564,6 @@
- 		for f in $(man_LINKS) "" ; do \
- 			test "$$f" = "" && continue ; \
- 			rm -f $$f; $(LN_S) authlib.7 $$f ; \
--			test -w /etc && chown bin $$f && chgrp bin $$f ; \
- 			done ; exit 0
- 
- uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
diff --git a/mail/courier-auth/patches/patch-ab b/mail/courier-auth/patches/patch-ab
deleted file mode 100644
index 91f40236a28..00000000000
--- a/mail/courier-auth/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/07/14 20:07:07 jlam Exp $
-
---- authlib/configure.in.orig	Tue May 25 02:32:38 2004
-+++ authlib/configure.in
-@@ -440,8 +440,6 @@ then
- 	STATIC_LIST="authldap_info $STATIC_LIST"
- 	LIBAUTH="$LIBAUTH libauth-authldap.a"
- 	echo authldaprc.dist >>authconfiglist
--else
--	authldaprc=""
- fi
- AC_SUBST(LDAPLIBS)
- 
-@@ -724,7 +722,7 @@ AC_PATH_PROGS(MYSQL_CONFIG, mysql_config
- if test -x "$MYSQL_CONFIG"
- then
- 	MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
--	MYSQL_LIBS="`mysql_config --libs`"
-+	MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
- 
- 	eval "MYSQL_CFLAGS=\"\`echo $MYSQL_CFLAGS\`\""
- 	eval "MYSQL_LIBS=\"\`echo $MYSQL_LIBS\`\""
diff --git a/mail/courier-auth/patches/patch-ac b/mail/courier-auth/patches/patch-ac
deleted file mode 100644
index ec352ee6580..00000000000
--- a/mail/courier-auth/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/07/14 20:07:07 jlam Exp $
-
---- authlib/configure.orig	Tue May 25 02:34:25 2004
-+++ authlib/configure
-@@ -5550,8 +5550,6 @@ then
- 	STATIC_LIST="authldap_info $STATIC_LIST"
- 	LIBAUTH="$LIBAUTH libauth-authldap.a"
- 	echo authldaprc.dist >>authconfiglist
--else
--	authldaprc=""
- fi
- 
- 
-@@ -6804,7 +6802,7 @@ test -n "$MYSQL_CONFIG" || MYSQL_CONFIG=
- if test -x "$MYSQL_CONFIG"
- then
- 	MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
--	MYSQL_LIBS="`mysql_config --libs`"
-+	MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
- 
- 	eval "MYSQL_CFLAGS=\"\`echo $MYSQL_CFLAGS\`\""
- 	eval "MYSQL_LIBS=\"\`echo $MYSQL_LIBS\`\""
diff --git a/mail/courier-auth/patches/patch-ae b/mail/courier-auth/patches/patch-ae
deleted file mode 100644
index 00a154b50ee..00000000000
--- a/mail/courier-auth/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/02/21 14:43:16 jlam Exp $
-
---- makedat/Makefile.in.orig	Sat Nov 15 12:54:52 2003
-+++ makedat/Makefile.in
-@@ -413,6 +413,11 @@ uninstall: uninstall-am
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- 
-+install-exec-local:
-+	$(mkinstalldirs) $(DESTDIR)`dirname $(makedatprogpath)`
-+	rm -f $(DESTDIR)$(makedatprogpath)
-+	$(INSTALL_PROGRAM) makedatprog $(DESTDIR)$(makedatprogpath)
-+
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-@@ -450,7 +455,7 @@ info-am:
- 
- install-data-am:
- 
--install-exec-am:
-+install-exec-am: install-exec-local
- 
- install-info: install-info-am
- 
diff --git a/mail/courier-auth/patches/patch-af b/mail/courier-auth/patches/patch-af
deleted file mode 100644
index 68083f5879e..00000000000
--- a/mail/courier-auth/patches/patch-af
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/02/21 14:43:16 jlam Exp $
-
---- userdb/Makefile.in.orig	Sat Nov 15 12:54:43 2003
-+++ userdb/Makefile.in
-@@ -462,6 +462,30 @@ uninstall: uninstall-am
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- 
-+install-exec-local:
-+	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-+	$(INSTALL_PROGRAM) userdbpw $(DESTDIR)$(sbindir)/userdbpw
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	cp userdb.pl userdb
-+	for f in makeuserdb userdb pw2userdb vchkpw2userdb; do \
-+	  $(INSTALL_SCRIPT) $$f $(DESTDIR)$(datadir)/$$f; \
-+	  rm -f $(DESTDIR)$(sbindir)/$$f; \
-+	  $(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f; \
-+	done
-+
-+man8dir=@mandir@/man8
-+
-+install-data-local:
-+	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-+	for i in $(man8); do \
-+	  echo " $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i"; \
-+	  $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
-+	done
-+	cd $(DESTDIR)$(man8dir) ; \
-+		rm -f pw2userdb.8 vchkpw2userdb.8; \
-+		$(LN_S) makeuserdb.8 pw2userdb.8 ; \
-+		$(LN_S) makeuserdb.8 vchkpw2userdb.8
-+
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-@@ -500,9 +524,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
- 
diff --git a/mail/courier-auth/patches/patch-ag b/mail/courier-auth/patches/patch-ag
deleted file mode 100644
index c9c21c01e05..00000000000
--- a/mail/courier-auth/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/01/24 16:02:49 jlam Exp $
-
---- authlib/authsystem.passwd.in.orig	Sat Jun 16 18:16:25 2001
-+++ authlib/authsystem.passwd.in
-@@ -54,6 +54,8 @@
- 	-re "dictionary" { exit 1 }
- 	-re "common" { exit 1 }
- 	-re "short" { exit 1 }
-+	-re "longer" { exit 1 }
-+	-re "lower case" { exit 1 }
- 	-re "word:" { sleep 2; send "$newpass\n" }
- 	eof { exit 1 }
- 	timeout { exit 1 }
diff --git a/mail/courier-auth/patches/patch-ah b/mail/courier-auth/patches/patch-ah
deleted file mode 100644
index 6b7fbfc6d21..00000000000
--- a/mail/courier-auth/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/07/14 20:07:07 jlam Exp $
-
---- authlib/authdaemonrc.in.orig	Tue Jul 13 03:52:51 2004
-+++ authlib/authdaemonrc.in	Tue Jul 13 03:55:12 2004
-@@ -66,3 +66,16 @@
- # used by various configuration and build scripts, so don't touch it!
- 
- authdaemonvar=@authdaemonvar@
-+
-+##NAME: DEBUG_LOGIN:0
-+#
-+# Dump additional login diagnostics to syslog
-+#
-+# DEBUG_LOGIN=0   - turn off login debugging
-+# DEBUG_LOGIN=1   - turn on login debugging
-+# DEBUG_LOGIN=2   - turn on login debugging + log passwords too
-+#
-+# Note that most information is sent to syslog at level 'debug', so
-+# you may need to modify your /etc/syslog.conf to be able to see it.
-+
-+DEBUG_LOGIN=0
diff --git a/mail/courier-auth/patches/patch-ai b/mail/courier-auth/patches/patch-ai
deleted file mode 100644
index 1db6831aca4..00000000000
--- a/mail/courier-auth/patches/patch-ai
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/07/14 20:07:07 jlam Exp $
-
---- liblog/Makefile.in.orig	Tue Jul 13 18:14:32 2004
-+++ liblog/Makefile.in	Tue Jul 13 18:19:45 2004
-@@ -447,15 +447,30 @@
- 
- 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-man:
- 
- installcheck-am:
-+
-+man1 = courierlogger.1
-+man1dir = @mandir@/man1
-+
-+install-data-local:
-+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-+	for i in $(man1); do \
-+	  echo " $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i"; \
-+	  $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
-+	done
-+
-+install-exec-local:
-+	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-+	rm -f $(DESTDIR)$(sbindir)/courierlogger
-+	$(INSTALL_PROGRAM) courierlogger $(DESTDIR)$(sbindir)/courierlogger
- 
- maintainer-clean: maintainer-clean-am
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
diff --git a/mail/courier-authldap/DESCR b/mail/courier-authldap/DESCR
deleted file mode 100644
index 198a571e56d..00000000000
--- a/mail/courier-authldap/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the Courier authenticiation module that can
-authenticate against a list of mail accounts stored in an external LDAP
-directory.
diff --git a/mail/courier-authldap/MESSAGE b/mail/courier-authldap/MESSAGE
deleted file mode 100644
index 7cb620c73f8..00000000000
--- a/mail/courier-authldap/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2002/01/27 22:09:50 jlam Exp $
-
-To use ${PKGNAME}, you will need to make the following
-changes to ${PKG_SYSCONFDIR}/authdaemonrc:
-
-     1) Add "authldap" to the lists of available authentication modules
-	in "authmodulelist" and "authmodulelistorig", and
-
-     2) Set version="authdaemond.ldap" to start the correct authentication
-	daemon.
-===========================================================================
diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
deleted file mode 100644
index ea78dd521ec..00000000000
--- a/mail/courier-authldap/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2005/02/13 20:44:27 zuntum Exp $
-
-PKGNAME=	courier-authldap-${BASE_VERS}
-PKGREVISION=	1
-COMMENT=	Courier LDAP authentication module
-
-CONFLICTS=	courier-imap-ldap-[0-9]*
-
-DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-authldap
-
-.include "../courier-auth/Makefile.authdaemond"
-
-USE_PKGINSTALL=		yes
-INSTALL_EXTRA_TMPL=	${.CURDIR}/../../mail/courier-auth/INSTALL
-
-CONFIGURE_ARGS+=	--with-authldap
-
-GEN_FILES=		authldaprc
-FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
-
-CONF_FILES_PERMS=	# empty
-.for FILE in ${GEN_FILES}
-CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
-			${ROOT_USER} ${ROOT_GROUP} 0600
-.endfor
-
-.include "../../databases/openldap/buildlink3.mk"
-
-do-install:
-	${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authdaemond.ldap ${AUTHLIBDIR}
-	${INSTALL_MAN_DIR} ${DOCDIR}
-	${INSTALL_MAN} ${WRKSRC}/authlib/README.ldap ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/authldap.schema ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/authldaprc ${EGDIR}/authldaprc.dist
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authldap/PLIST b/mail/courier-authldap/PLIST
deleted file mode 100644
index 2533eccf7dd..00000000000
--- a/mail/courier-authldap/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/11 16:45:26 jlam Exp $
-libexec/courier/authlib/authdaemond.ldap
-share/doc/courier/README.ldap
-share/examples/courier/authldap.schema
-share/examples/courier/authldaprc.dist
-@unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-authmysql/DESCR b/mail/courier-authmysql/DESCR
deleted file mode 100644
index f4835821fef..00000000000
--- a/mail/courier-authmysql/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains the Courier authenticiation module that can
-authenticate against a list of mail accounts stored in a MySQL database.
diff --git a/mail/courier-authmysql/MESSAGE b/mail/courier-authmysql/MESSAGE
deleted file mode 100644
index 5580a072cbc..00000000000
--- a/mail/courier-authmysql/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/01/27 22:39:14 jlam Exp $
-
-To use ${PKGNAME}, you will need to make the following
-changes to ${PKG_SYSCONFDIR}/authdaemonrc:
-
-     1) Add "authmysql" to the lists of available authentication modules
-	in "authmodulelist" and "authmodulelistorig", and
-
-     2) Set version="authdaemond.mysql" to start the correct authentication
-	daemon.
-===========================================================================
diff --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
deleted file mode 100644
index 3218ee7eef0..00000000000
--- a/mail/courier-authmysql/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2005/02/13 20:44:27 zuntum Exp $
-
-PKGNAME=	courier-authmysql-${BASE_VERS}
-PKGREVISION=	1
-COMMENT=	Courier MySQL authentication module
-
-DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
-
-PKG_OPTION_VARS=	PKG_OPTIONS.courier-authmysql
-
-.include "../courier-auth/Makefile.authdaemond"
-
-USE_PKGINSTALL=		yes
-INSTALL_EXTRA_TMPL=	${.CURDIR}/../courier-auth/INSTALL
-
-CONFIGURE_ARGS+=	--with-authmysql
-
-GEN_FILES=		authmysqlrc
-FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
-
-CONF_FILES_PERMS=	# empty
-.for FILE in ${GEN_FILES}
-CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
-			${ROOT_USER} ${ROOT_GROUP} 0600
-.endfor
-
-.include "../../mk/mysql.buildlink3.mk"
-
-do-install:
-	${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authdaemond.mysql ${AUTHLIBDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/authmysqlrc ${EGDIR}/authmysqlrc.dist
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/README.authmysql.html	${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authmysql/PLIST b/mail/courier-authmysql/PLIST
deleted file mode 100644
index 549251fcd43..00000000000
--- a/mail/courier-authmysql/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/14 21:43:48 jlam Exp $
-libexec/courier/authlib/authdaemond.mysql
-share/doc/courier/README.authmysql.html
-share/examples/courier/authmysqlrc.dist
-@unexec ${RMDIR} -p %D/share/doc/html/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-authpgsql/DESCR b/mail/courier-authpgsql/DESCR
deleted file mode 100644
index 88c7f712d77..00000000000
--- a/mail/courier-authpgsql/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the Courier authenticiation module that can
-authenticate against a list of mail accounts stored in a PostgreSQL
-database.
diff --git a/mail/courier-authpgsql/MESSAGE b/mail/courier-authpgsql/MESSAGE
deleted file mode 100644
index 400edc44099..00000000000
--- a/mail/courier-authpgsql/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/01/27 22:39:56 jlam Exp $
-
-To use ${PKGNAME}, you will need to make the following
-changes to ${PKG_SYSCONFDIR}/authdaemonrc:
-
-     1) Add "authpgsql" to the lists of available authentication modules
-	in "authmodulelist" and "authmodulelistorig", and
-
-     2) Set version="authdaemond.pgsql" to start the correct authentication
-	daemon.
-===========================================================================
diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
deleted file mode 100644
index c656b0af911..00000000000
--- a/mail/courier-authpgsql/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2005/02/13 20:44:27 zuntum Exp $
-
-PKGNAME=	courier-authpgsql-${BASE_VERS}
-COMMENT=	Courier PostgreSQL authentication module
-
-DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-authpgsql
-
-.include "../courier-auth/Makefile.authdaemond"
-
-USE_PKGINSTALL=		yes
-INSTALL_EXTRA_TMPL=	${.CURDIR}/../courier-auth/INSTALL
-
-CONFIGURE_ARGS+=	--with-authpgsql
-CONFIGURE_ARGS+=	--with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql
-CONFIGURE_ARGS+=	--with-pgsql-libs=${PGSQL_PREFIX}/lib
-
-GEN_FILES=		authpgsqlrc
-FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
-
-CONF_FILES_PERMS=	# empty
-.for FILE in ${GEN_FILES}
-CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
-			${ROOT_USER} ${ROOT_GROUP} 0600
-.endfor
-
-.include "../../mk/pgsql.buildlink3.mk"
-
-post-build:
-	cd ${WRKSRC}/authlib;						\
-	${SED}	-e "s,mysql,pgsql,g"					\
-		-e "s,MYSQL,PGSQL,g"					\
-		-e "s,MySQL,PostgreSQL,g"				\
-		README.authmysql.html > README.authpgsql.html
-	for file in README.authpostgres.html; do			\
-		${SED}	-e "s,mysql,pgsql,g"				\
-			$$file > $$file.new;				\
-		${MV} -f $$file.new $$file;				\
-	done
-
-do-install:
-	${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authdaemond.pgsql ${AUTHLIBDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/authpgsqlrc ${EGDIR}/authpgsqlrc.dist
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/README.authpgsql.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/authlib/README.authpostgres.html ${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authpgsql/PLIST b/mail/courier-authpgsql/PLIST
deleted file mode 100644
index 3263c780f46..00000000000
--- a/mail/courier-authpgsql/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/14 21:43:48 jlam Exp $
-libexec/courier/authlib/authdaemond.pgsql
-share/doc/courier/README.authpgsql.html
-share/doc/courier/README.authpostgres.html
-share/examples/courier/authpgsqlrc.dist
-@unexec ${RMDIR} -p %D/share/doc/html/courier 2>/dev/null || ${TRUE}