move mail/courier-authlib to security/courier-authlib which is a meta-port now.

Submitted by:		Yarema <yds@CoolRat.org>
In corporation with:	Jose M Rodriguez <josemi@freebsd.jazztel.es>, Milan Obuch <ports@dino.sk>, myself

45 files changed, 36 insertions, 2576 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 40449b1dd15b..4210d50c3fe1 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -11,6 +11,10 @@
     SUBDIR += bbdb-emacs20
     SUBDIR += cdb
     SUBDIR += clip
+    SUBDIR += courier-authlib-mysql
+    SUBDIR += courier-authlib-pgsql
+    SUBDIR += courier-authlib-userdb
+    SUBDIR += courier-authlib-usergdbm
     SUBDIR += cyrus-imspd
     SUBDIR += cyrus-smlacapd
     SUBDIR += db
diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index 902b25be6031..1b18bc45de0f 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/databases/courier-authlib-mysql/Makefile
@@ -1,177 +1,15 @@
-# New ports collection makefile for:	courier-authdaemon
-# Date created:				19 Dec 2004
-# Whom:					Oliver Lehmann
+# New ports collection makefile for:	courier-authlib-mysql
+# Date created:				02 Apr 2005
+# Whom:					Yarema <yds@CoolRat.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	courier-authlib
-PORTVERSION=	0.55
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	courier
+PKGNAMESUFFIX=	-mysql
 
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	Authentication library used by courier ports
+COMMENT=	MySQL support for the Courier authentication library
+CATEGORIES=	databases mail
 
-CONFLICTS=	courier-0.*
+MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
-USE_BZIP2=	yes
-USE_REINPLACE=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_RC_SUBR=	yes
-USE_LIBTOOL_VER=15
-USE_LIBLTDL=	yes
-
-#
-# options available:
-#
-# WITH_MAILUSER:		The user running authlib
-# WITH_MAILGROUP:		The group running authlib
-# WITH_SYSLOG_FACILITY:		The syslogfacility to use
-#
-
-OPTIONS=	PAM		"Build with PAM support"		on \
-		VPOPMAIL	"Build in vpopmail support"		off \
-		MYSQL		"Build in mysql support"		off \
-		POSTGRESQL	"Build in postgresql support"		off \
-		LDAP		"Build in ldap support with openldap"	off \
-		GDBM		"Use gdbm files instead of bdb"		off \
-		AUTHUSERDB	"Build with authuserdb"			on \
-		MERGECFGS	"Merge new Options into old auth-rc files" on
-
-VPOPMAILDIR?=	${LOCALBASE}/vpopmail
-WITH_MAILUSER?=	daemon
-WITH_MAILGROUP?=daemon
-CONFDIR?=	${PREFIX}/etc
-USERDB?=	${PREFIX}/etc/userdb
-
-PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
-
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
-		--without-authshadow \
-		--without-authcustom \
-		--enable-unicode \
-		--enable-ltdl-install=no \
-		--with-mailuser=${WITH_MAILUSER} \
-		--with-mailgroup=${WITH_MAILGROUP} \
-		--with-authdaemonvar=/var/run/authdaemond
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SYSLOG_FACILITY)
-CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
-.endif
-
-.if defined(WITH_GDBM)
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=--with-db=gdbm
-.else
-CONFIGURE_ARGS+=--with-db=db
-.endif
-
-.if !defined(WITH_VPOPMAIL)
-CONFIGURE_ARGS+=--without-authvchkpw
-PLIST_SUB+=	VPOPMAILFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-authvchkpw
-BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-PLIST_SUB+=	VPOPMAILFLAG=""
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-authldap
-PLIST_SUB+=	LDAPFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authldap
-PLIST_SUB+=	LDAPFLAG="@comment "
-.endif
-
-.if !defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--without-authmysql
-PLIST_SUB+=	MYSQLFLAG="@comment "
-.else
-USE_MYSQL=	YES
-PLIST_SUB+=	MYSQLFLAG=""
-CONFIGURE_ARGS+=--with-authmysql \
-		--with-mysql-libs=${LOCALBASE}/lib/mysql \
-		--with-mysql-includes=${LOCALBASE}/include/mysql
-.endif
-
-.if !defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=--without-authpgsql
-PLIST_SUB+=	PGSQLFLAG="@comment "
-.else
-USE_PGSQL=	YES
-PLIST_SUB+=	PGSQLFLAG=""
-.endif
-
-.if !defined(WITHOUT_PAM)
-CONFIGURE_ARGS+=--with-authpam
-PLIST_SUB+=	PAMFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authpam
-PLIST_SUB+=	PAMFLAG="@comment "
-.endif
-
-.if defined(WITHOUT_AUTHUSERDB)
-CONFIGURE_ARGS+=--without-authuserdb
-PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-userdb=${USERDB}
-PLIST_SUB+=     AUTHUSERDBFLAG=""
-.endif
-
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP}
-
-MAN1=		courierlogger.1
-
-MAN3=		authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
-		auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
-
-MAN8=		makeuserdb.8 userdb.8 userdbpw.8
-
-EXTRA_DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
-		README.authdebug.html README.authmysql.html \
-		README.authmysql.myownquery README.authpostgres.html \
-		README.ldap README_authlib.html
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/liblog/Makefile.in \
-		${WRKSRC}/userdb/Makefile.in
-	@${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \
-		${WRKSRC}/authdaemonrc.in
-	@${REINPLACE_CMD} -e 's|conftest.lock|/tmp/courier-authlib.locktest|g' \
-		${WRKSRC}/liblock/locktest.c
-
-post-configure:
-	@${RM} -f /tmp/courier-authlib.locktest
-
-post-install:
-	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/courier-authdaemond.sh > ${WRKDIR}/courier-authdaemond.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/courier-authdaemond.sh ${PREFIX}/etc/rc.d/courier-authdaemond.sh
-.if defined(WITH_MERGECFGS)
-	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
-.endif
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for a in ${EXTRA_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-mysql/distinfo b/databases/courier-authlib-mysql/distinfo
deleted file mode 100644
index f4e92b503fbb..000000000000
--- a/databases/courier-authlib-mysql/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
-SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/databases/courier-authlib-mysql/files/courier-authdaemond.sh b/databases/courier-authlib-mysql/files/courier-authdaemond.sh
deleted file mode 100644
index c13b5d921c40..000000000000
--- a/databases/courier-authlib-mysql/files/courier-authdaemond.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for courier-authdaemond service.
-
-# PROVIDE: courier_authdaemond
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-# Define these courier_authdaemond_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_authdaemond
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_authdaemond_enable=${courier_authdaemond_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_authdaemond"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/authdaemond"
-
-start_cmd="authdaemond_cmd start"
-stop_cmd="authdaemond_cmd stop"
-restart_cmd="authdaemond_cmd stop && authdaemond_cmd start"
-rundir=/var/run/authdaemond
-pidfile="${rundir}/pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-load_rc_config $name
-
-authdaemond_cmd () {
-	case $1 in
-	start)
-		if [ ! -d "${rundir}" ] ; then
-			mkdir -p -m 0750 "${rundir}" && chown %%MAILUSER%%:%%MAILGROUP%% "${rundir}"
-			if [ $? -ne 0 ] ; then
-				echo "creating ${rundir} with the correct permissions was not possible!"
-				return 1
-			fi
-		fi
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		if [ $? -eq 0 ] ; then
-			[ -f "${pidfile}" ]       && rm -f "$pidfile"
-			[ -f "${pidfile}.lock" ]  && rm -f "${pidfile}.lock"
-			[ -S "${rundir}/socket" ] && rm -f "${rundir}/socket"
-			return 0
-		fi
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/databases/courier-authlib-mysql/files/patch-Makefile.in b/databases/courier-authlib-mysql/files/patch-Makefile.in
deleted file mode 100644
index 03046540f679..000000000000
--- a/databases/courier-authlib-mysql/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Sat Dec 18 17:25:16 2004
-+++ Makefile.in	Sat Dec 18 17:27:50 2004
-@@ -992,8 +992,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
- 	done
- uninstall-man3:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-mysql/files/patch-ldap b/databases/courier-authlib-mysql/files/patch-ldap
deleted file mode 100644
index 1cae12242d67..000000000000
--- a/databases/courier-authlib-mysql/files/patch-ldap
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Wed Mar  3 05:54:13 2004
-+++ configure	Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/databases/courier-authlib-mysql/files/patch-liblog::Makefile.in b/databases/courier-authlib-mysql/files/patch-liblog::Makefile.in
deleted file mode 100644
index 301ba9c2efba..000000000000
--- a/databases/courier-authlib-mysql/files/patch-liblog::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- liblog/Makefile.in.orig	Sat Dec 18 18:31:57 2004
-+++ liblog/Makefile.in	Sat Dec 18 18:32:18 2004
-@@ -346,8 +346,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- uninstall-man1:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-mysql/files/patch-mysql b/databases/courier-authlib-mysql/files/patch-mysql
deleted file mode 100644
index 17f6042e3a47..000000000000
--- a/databases/courier-authlib-mysql/files/patch-mysql
+++ /dev/null
@@ -1,182 +0,0 @@
---- configure.orig	Sat Dec 18 17:28:54 2004
-+++ configure	Sat Dec 18 17:30:51 2004
-@@ -23821,9 +23821,9 @@
- if test "$doauthmysql" = ""
- then
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -23832,12 +23832,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -23847,7 +23847,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -23856,14 +23856,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -23872,7 +23872,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -23899,19 +23899,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   doauthmysql="yes"
- 
- fi
-@@ -24021,9 +24021,9 @@
- else
- 	saveLIBS="$LIBS"
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -24032,12 +24032,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -24047,7 +24047,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -24056,14 +24056,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -24072,7 +24072,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -24099,19 +24099,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   LIBAUTHMYSQL="libauthmysql.la"
- 		HAVE_AUTHMYSQL=1
- else
diff --git a/databases/courier-authlib-mysql/files/patch-userdb::Makefile.in b/databases/courier-authlib-mysql/files/patch-userdb::Makefile.in
deleted file mode 100644
index c4c62ce68aa3..000000000000
--- a/databases/courier-authlib-mysql/files/patch-userdb::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- userdb/Makefile.in.orig	Sat Dec 18 18:33:08 2004
-+++ userdb/Makefile.in	Sat Dec 18 18:34:09 2004
-@@ -378,8 +378,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
- uninstall-man8:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-mysql/files/patch-userdb::pw2userdb.in b/databases/courier-authlib-mysql/files/patch-userdb::pw2userdb.in
deleted file mode 100644
index 7cb79aa49b02..000000000000
--- a/databases/courier-authlib-mysql/files/patch-userdb::pw2userdb.in
+++ /dev/null
@@ -1,104 +0,0 @@
---- userdb/pw2userdb.in.orig	Wed Jul 19 13:55:15 2000
-+++ userdb/pw2userdb.in	Tue Mar  1 21:58:51 2005
-@@ -7,6 +7,8 @@
- # Copyright 1998 - 1999 Double Precision, Inc.  See COPYING for
- # distribution information.
- 
-+# Adapted to BSD master.passwd
-+
- use Getopt::Long;
- 
- #
-@@ -22,42 +24,66 @@
- 	if $vpopuid;
- 
- $passwd="/etc/passwd" unless $passwd =~ /./;
--$shadow="/etc/shadow" unless $shadow =~ /./;
-+$shadow="/etc/master.passwd" unless $shadow =~ /./;
- 
- $domain="" unless $domain =~ /./;
- $domain="\@$domain" if $domain =~ /./;
- 
--open(PASSWD, $passwd) || die "$!\n";
--
--while (<PASSWD>)
-+if (! $noshadow && $shadow =~ /master.passwd$/)
- {
--	chop if /\n$/;
--	next if /^#/;
--	($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
--
--	($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
--
--	$PASSWORD{$acct}=$passwd if $passwd ne "x";
--	$UID{$acct}=$uid;
--	$GID{$acct}=$gid;
--	$HOME{$acct}=$home;
--	$SHELL{$acct}=$shell;
--
--	$name =~ s/\|/./g;	# Just in case
--	$GECOS{$acct}=$name;
--}
--close (PASSWD);
-+	open(PASSWD, $shadow) || die "$!\n";
- 
--if ( -f $shadow && ! $noshadow)
--{
--	open (SHADOW, $shadow) || die "$!\n";
--	while (<SHADOW>)
-+	while (<PASSWD>)
- 	{
-+		chop if /\n$/;
- 		next if /^#/;
--		($acct,$passwd,$dummy)=split(/:/);
-+		($acct,$passwd,$uid,$gid,$class,$change,$expire,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+		$name =~ s/\|/./g;      # Just in case
-+
- 		$PASSWORD{$acct}=$passwd;
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+} else {
-+	open(PASSWD, $passwd) || die "$!\n";
-+
-+	while (<PASSWD>)
-+	{
-+		chop if /\n$/;
-+		next if /^#/;
-+		($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+
-+		$PASSWORD{$acct}=$passwd if $passwd ne "x";
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+
-+		$name =~ s/\|/./g;	# Just in case
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+
-+	if ( -f $shadow && ! $noshadow)
-+	{
-+		open (SHADOW, $shadow) || die "$!\n";
-+		while (<SHADOW>)
-+		{
-+		
-+			next if /^#/;
-+			($acct,$passwd,$dummy)=split(/:/);
-+			$PASSWORD{$acct}=$passwd;
-+		}
-+		close (SHADOW);
- 	}
--	close (SHADOW);
- }
- 
- while ( defined ($key=each %UID))
diff --git a/databases/courier-authlib-mysql/pkg-descr b/databases/courier-authlib-mysql/pkg-descr
deleted file mode 100644
index 1b44b9f42019..000000000000
--- a/databases/courier-authlib-mysql/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The Courier Authentication Library is a generic authentication API that
-encapsulates the process of validating account passwords. In addition to
-reading the traditional account passwords from /etc/passwd, the account
-information can alternatively be obtained from an LDAP directory; a MySQL
-or a PostgreSQL database; or a GDBM or a DB file.
-
-WWW:	http://www.courier-mta.org/authlib/
diff --git a/databases/courier-authlib-mysql/pkg-plist b/databases/courier-authlib-mysql/pkg-plist
deleted file mode 100644
index e9626f569ca8..000000000000
--- a/databases/courier-authlib-mysql/pkg-plist
+++ /dev/null
@@ -1,67 +0,0 @@
-@unexec [ ! -f /var/run/authdaemond/pid ] || %D/etc/rc.d/courier-authdaemond.sh stop || true
-bin/courierauthconfig
-etc/rc.d/courier-authdaemond.sh
-%%MYSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authmysqlrc.dist %D/%%CONFDIR%%/authlib/authmysqlrc; then rm -f %D/%%CONFDIR%%/authlib/authmysqlrc; fi
-%%PGSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authpgsqlrc.dist %D/%%CONFDIR%%/authlib/authpgsqlrc; then rm -f %D/%%CONFDIR%%/authlib/authpgsqlrc; fi
-%%LDAPFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authldaprc.dist %D/%%CONFDIR%%/authlib/authldaprc; then rm -f %D/%%CONFDIR%%/authlib/authldaprc; fi
-@unexec if cmp -s %D/%%CONFDIR%%/authlib/authdaemonrc.dist %D/%%CONFDIR%%/authlib/authdaemonrc; then rm -f %D/%%CONFDIR%%/authlib/authdaemonrc; fi
-%%CONFDIR%%/authlib/authdaemonrc.dist
-include/courier_auth_config.h
-include/courierauth.h
-include/courierauthsasl.h
-include/courierauthsaslclient.h
-include/courierauthdebug.h
-lib/courier-authlib/libcourierauth.so.0
-lib/courier-authlib/libcourierauth.so
-lib/courier-authlib/libcourierauth.a
-lib/courier-authlib/libcourierauthsasl.so.0
-lib/courier-authlib/libcourierauthsasl.so
-lib/courier-authlib/libcourierauthsasl.a
-lib/courier-authlib/libcourierauthsaslclient.so.0
-lib/courier-authlib/libcourierauthsaslclient.so
-lib/courier-authlib/libcourierauthsaslclient.a
-lib/courier-authlib/libcourierauthcommon.so.0
-lib/courier-authlib/libcourierauthcommon.so
-lib/courier-authlib/libcourierauthcommon.a
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so.0
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so.0
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so.0
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
-libexec/courier-authlib/authsystem.passwd
-libexec/courier-authlib/authdaemond
-%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
-sbin/authtest
-sbin/authdaemond
-sbin/authenumerate
-sbin/courierlogger
-%%AUTHUSERDBFLAG%%sbin/pw2userdb
-%%AUTHUSERDBFLAG%%sbin/makeuserdb
-%%AUTHUSERDBFLAG%%sbin/userdb
-%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
-%%AUTHUSERDBFLAG%%sbin/userdbpw
-%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery
-%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
-%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir /var/run/authdaemond 2>/dev/null || true
-@unexec rmdir %D/%%CONFDIR%%/authlib 2>/dev/null || true
-@dirrm lib/courier-authlib
-@dirrm libexec/courier-authlib
diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile
index 902b25be6031..cec87d002a24 100644
--- a/databases/courier-authlib-pgsql/Makefile
+++ b/databases/courier-authlib-pgsql/Makefile
@@ -1,177 +1,15 @@
-# New ports collection makefile for:	courier-authdaemon
-# Date created:				19 Dec 2004
-# Whom:					Oliver Lehmann
+# New ports collection makefile for:	courier-authlib-pgsql
+# Date created:				02 Apr 2005
+# Whom:					Yarema <yds@CoolRat.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	courier-authlib
-PORTVERSION=	0.55
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	courier
+PKGNAMESUFFIX=	-pgsql
 
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	Authentication library used by courier ports
+COMMENT=	PostgreSQL support for the Courier authentication library
+CATEGORIES=	databases mail
 
-CONFLICTS=	courier-0.*
+MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
-USE_BZIP2=	yes
-USE_REINPLACE=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_RC_SUBR=	yes
-USE_LIBTOOL_VER=15
-USE_LIBLTDL=	yes
-
-#
-# options available:
-#
-# WITH_MAILUSER:		The user running authlib
-# WITH_MAILGROUP:		The group running authlib
-# WITH_SYSLOG_FACILITY:		The syslogfacility to use
-#
-
-OPTIONS=	PAM		"Build with PAM support"		on \
-		VPOPMAIL	"Build in vpopmail support"		off \
-		MYSQL		"Build in mysql support"		off \
-		POSTGRESQL	"Build in postgresql support"		off \
-		LDAP		"Build in ldap support with openldap"	off \
-		GDBM		"Use gdbm files instead of bdb"		off \
-		AUTHUSERDB	"Build with authuserdb"			on \
-		MERGECFGS	"Merge new Options into old auth-rc files" on
-
-VPOPMAILDIR?=	${LOCALBASE}/vpopmail
-WITH_MAILUSER?=	daemon
-WITH_MAILGROUP?=daemon
-CONFDIR?=	${PREFIX}/etc
-USERDB?=	${PREFIX}/etc/userdb
-
-PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
-
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
-		--without-authshadow \
-		--without-authcustom \
-		--enable-unicode \
-		--enable-ltdl-install=no \
-		--with-mailuser=${WITH_MAILUSER} \
-		--with-mailgroup=${WITH_MAILGROUP} \
-		--with-authdaemonvar=/var/run/authdaemond
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SYSLOG_FACILITY)
-CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
-.endif
-
-.if defined(WITH_GDBM)
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=--with-db=gdbm
-.else
-CONFIGURE_ARGS+=--with-db=db
-.endif
-
-.if !defined(WITH_VPOPMAIL)
-CONFIGURE_ARGS+=--without-authvchkpw
-PLIST_SUB+=	VPOPMAILFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-authvchkpw
-BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-PLIST_SUB+=	VPOPMAILFLAG=""
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-authldap
-PLIST_SUB+=	LDAPFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authldap
-PLIST_SUB+=	LDAPFLAG="@comment "
-.endif
-
-.if !defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--without-authmysql
-PLIST_SUB+=	MYSQLFLAG="@comment "
-.else
-USE_MYSQL=	YES
-PLIST_SUB+=	MYSQLFLAG=""
-CONFIGURE_ARGS+=--with-authmysql \
-		--with-mysql-libs=${LOCALBASE}/lib/mysql \
-		--with-mysql-includes=${LOCALBASE}/include/mysql
-.endif
-
-.if !defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=--without-authpgsql
-PLIST_SUB+=	PGSQLFLAG="@comment "
-.else
-USE_PGSQL=	YES
-PLIST_SUB+=	PGSQLFLAG=""
-.endif
-
-.if !defined(WITHOUT_PAM)
-CONFIGURE_ARGS+=--with-authpam
-PLIST_SUB+=	PAMFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authpam
-PLIST_SUB+=	PAMFLAG="@comment "
-.endif
-
-.if defined(WITHOUT_AUTHUSERDB)
-CONFIGURE_ARGS+=--without-authuserdb
-PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-userdb=${USERDB}
-PLIST_SUB+=     AUTHUSERDBFLAG=""
-.endif
-
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP}
-
-MAN1=		courierlogger.1
-
-MAN3=		authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
-		auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
-
-MAN8=		makeuserdb.8 userdb.8 userdbpw.8
-
-EXTRA_DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
-		README.authdebug.html README.authmysql.html \
-		README.authmysql.myownquery README.authpostgres.html \
-		README.ldap README_authlib.html
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/liblog/Makefile.in \
-		${WRKSRC}/userdb/Makefile.in
-	@${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \
-		${WRKSRC}/authdaemonrc.in
-	@${REINPLACE_CMD} -e 's|conftest.lock|/tmp/courier-authlib.locktest|g' \
-		${WRKSRC}/liblock/locktest.c
-
-post-configure:
-	@${RM} -f /tmp/courier-authlib.locktest
-
-post-install:
-	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/courier-authdaemond.sh > ${WRKDIR}/courier-authdaemond.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/courier-authdaemond.sh ${PREFIX}/etc/rc.d/courier-authdaemond.sh
-.if defined(WITH_MERGECFGS)
-	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
-.endif
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for a in ${EXTRA_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-pgsql/distinfo b/databases/courier-authlib-pgsql/distinfo
deleted file mode 100644
index f4e92b503fbb..000000000000
--- a/databases/courier-authlib-pgsql/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
-SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/databases/courier-authlib-pgsql/files/courier-authdaemond.sh b/databases/courier-authlib-pgsql/files/courier-authdaemond.sh
deleted file mode 100644
index c13b5d921c40..000000000000
--- a/databases/courier-authlib-pgsql/files/courier-authdaemond.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for courier-authdaemond service.
-
-# PROVIDE: courier_authdaemond
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-# Define these courier_authdaemond_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_authdaemond
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_authdaemond_enable=${courier_authdaemond_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_authdaemond"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/authdaemond"
-
-start_cmd="authdaemond_cmd start"
-stop_cmd="authdaemond_cmd stop"
-restart_cmd="authdaemond_cmd stop && authdaemond_cmd start"
-rundir=/var/run/authdaemond
-pidfile="${rundir}/pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-load_rc_config $name
-
-authdaemond_cmd () {
-	case $1 in
-	start)
-		if [ ! -d "${rundir}" ] ; then
-			mkdir -p -m 0750 "${rundir}" && chown %%MAILUSER%%:%%MAILGROUP%% "${rundir}"
-			if [ $? -ne 0 ] ; then
-				echo "creating ${rundir} with the correct permissions was not possible!"
-				return 1
-			fi
-		fi
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		if [ $? -eq 0 ] ; then
-			[ -f "${pidfile}" ]       && rm -f "$pidfile"
-			[ -f "${pidfile}.lock" ]  && rm -f "${pidfile}.lock"
-			[ -S "${rundir}/socket" ] && rm -f "${rundir}/socket"
-			return 0
-		fi
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/databases/courier-authlib-pgsql/files/patch-Makefile.in b/databases/courier-authlib-pgsql/files/patch-Makefile.in
deleted file mode 100644
index 03046540f679..000000000000
--- a/databases/courier-authlib-pgsql/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Sat Dec 18 17:25:16 2004
-+++ Makefile.in	Sat Dec 18 17:27:50 2004
-@@ -992,8 +992,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
- 	done
- uninstall-man3:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-pgsql/files/patch-ldap b/databases/courier-authlib-pgsql/files/patch-ldap
deleted file mode 100644
index 1cae12242d67..000000000000
--- a/databases/courier-authlib-pgsql/files/patch-ldap
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Wed Mar  3 05:54:13 2004
-+++ configure	Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/databases/courier-authlib-pgsql/files/patch-liblog::Makefile.in b/databases/courier-authlib-pgsql/files/patch-liblog::Makefile.in
deleted file mode 100644
index 301ba9c2efba..000000000000
--- a/databases/courier-authlib-pgsql/files/patch-liblog::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- liblog/Makefile.in.orig	Sat Dec 18 18:31:57 2004
-+++ liblog/Makefile.in	Sat Dec 18 18:32:18 2004
-@@ -346,8 +346,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- uninstall-man1:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-pgsql/files/patch-mysql b/databases/courier-authlib-pgsql/files/patch-mysql
deleted file mode 100644
index 17f6042e3a47..000000000000
--- a/databases/courier-authlib-pgsql/files/patch-mysql
+++ /dev/null
@@ -1,182 +0,0 @@
---- configure.orig	Sat Dec 18 17:28:54 2004
-+++ configure	Sat Dec 18 17:30:51 2004
-@@ -23821,9 +23821,9 @@
- if test "$doauthmysql" = ""
- then
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -23832,12 +23832,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -23847,7 +23847,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -23856,14 +23856,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -23872,7 +23872,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -23899,19 +23899,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   doauthmysql="yes"
- 
- fi
-@@ -24021,9 +24021,9 @@
- else
- 	saveLIBS="$LIBS"
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -24032,12 +24032,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -24047,7 +24047,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -24056,14 +24056,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -24072,7 +24072,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -24099,19 +24099,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   LIBAUTHMYSQL="libauthmysql.la"
- 		HAVE_AUTHMYSQL=1
- else
diff --git a/databases/courier-authlib-pgsql/files/patch-userdb::Makefile.in b/databases/courier-authlib-pgsql/files/patch-userdb::Makefile.in
deleted file mode 100644
index c4c62ce68aa3..000000000000
--- a/databases/courier-authlib-pgsql/files/patch-userdb::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- userdb/Makefile.in.orig	Sat Dec 18 18:33:08 2004
-+++ userdb/Makefile.in	Sat Dec 18 18:34:09 2004
-@@ -378,8 +378,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
- uninstall-man8:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-pgsql/files/patch-userdb::pw2userdb.in b/databases/courier-authlib-pgsql/files/patch-userdb::pw2userdb.in
deleted file mode 100644
index 7cb79aa49b02..000000000000
--- a/databases/courier-authlib-pgsql/files/patch-userdb::pw2userdb.in
+++ /dev/null
@@ -1,104 +0,0 @@
---- userdb/pw2userdb.in.orig	Wed Jul 19 13:55:15 2000
-+++ userdb/pw2userdb.in	Tue Mar  1 21:58:51 2005
-@@ -7,6 +7,8 @@
- # Copyright 1998 - 1999 Double Precision, Inc.  See COPYING for
- # distribution information.
- 
-+# Adapted to BSD master.passwd
-+
- use Getopt::Long;
- 
- #
-@@ -22,42 +24,66 @@
- 	if $vpopuid;
- 
- $passwd="/etc/passwd" unless $passwd =~ /./;
--$shadow="/etc/shadow" unless $shadow =~ /./;
-+$shadow="/etc/master.passwd" unless $shadow =~ /./;
- 
- $domain="" unless $domain =~ /./;
- $domain="\@$domain" if $domain =~ /./;
- 
--open(PASSWD, $passwd) || die "$!\n";
--
--while (<PASSWD>)
-+if (! $noshadow && $shadow =~ /master.passwd$/)
- {
--	chop if /\n$/;
--	next if /^#/;
--	($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
--
--	($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
--
--	$PASSWORD{$acct}=$passwd if $passwd ne "x";
--	$UID{$acct}=$uid;
--	$GID{$acct}=$gid;
--	$HOME{$acct}=$home;
--	$SHELL{$acct}=$shell;
--
--	$name =~ s/\|/./g;	# Just in case
--	$GECOS{$acct}=$name;
--}
--close (PASSWD);
-+	open(PASSWD, $shadow) || die "$!\n";
- 
--if ( -f $shadow && ! $noshadow)
--{
--	open (SHADOW, $shadow) || die "$!\n";
--	while (<SHADOW>)
-+	while (<PASSWD>)
- 	{
-+		chop if /\n$/;
- 		next if /^#/;
--		($acct,$passwd,$dummy)=split(/:/);
-+		($acct,$passwd,$uid,$gid,$class,$change,$expire,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+		$name =~ s/\|/./g;      # Just in case
-+
- 		$PASSWORD{$acct}=$passwd;
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+} else {
-+	open(PASSWD, $passwd) || die "$!\n";
-+
-+	while (<PASSWD>)
-+	{
-+		chop if /\n$/;
-+		next if /^#/;
-+		($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+
-+		$PASSWORD{$acct}=$passwd if $passwd ne "x";
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+
-+		$name =~ s/\|/./g;	# Just in case
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+
-+	if ( -f $shadow && ! $noshadow)
-+	{
-+		open (SHADOW, $shadow) || die "$!\n";
-+		while (<SHADOW>)
-+		{
-+		
-+			next if /^#/;
-+			($acct,$passwd,$dummy)=split(/:/);
-+			$PASSWORD{$acct}=$passwd;
-+		}
-+		close (SHADOW);
- 	}
--	close (SHADOW);
- }
- 
- while ( defined ($key=each %UID))
diff --git a/databases/courier-authlib-pgsql/pkg-descr b/databases/courier-authlib-pgsql/pkg-descr
deleted file mode 100644
index 1b44b9f42019..000000000000
--- a/databases/courier-authlib-pgsql/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The Courier Authentication Library is a generic authentication API that
-encapsulates the process of validating account passwords. In addition to
-reading the traditional account passwords from /etc/passwd, the account
-information can alternatively be obtained from an LDAP directory; a MySQL
-or a PostgreSQL database; or a GDBM or a DB file.
-
-WWW:	http://www.courier-mta.org/authlib/
diff --git a/databases/courier-authlib-pgsql/pkg-plist b/databases/courier-authlib-pgsql/pkg-plist
deleted file mode 100644
index e9626f569ca8..000000000000
--- a/databases/courier-authlib-pgsql/pkg-plist
+++ /dev/null
@@ -1,67 +0,0 @@
-@unexec [ ! -f /var/run/authdaemond/pid ] || %D/etc/rc.d/courier-authdaemond.sh stop || true
-bin/courierauthconfig
-etc/rc.d/courier-authdaemond.sh
-%%MYSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authmysqlrc.dist %D/%%CONFDIR%%/authlib/authmysqlrc; then rm -f %D/%%CONFDIR%%/authlib/authmysqlrc; fi
-%%PGSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authpgsqlrc.dist %D/%%CONFDIR%%/authlib/authpgsqlrc; then rm -f %D/%%CONFDIR%%/authlib/authpgsqlrc; fi
-%%LDAPFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authldaprc.dist %D/%%CONFDIR%%/authlib/authldaprc; then rm -f %D/%%CONFDIR%%/authlib/authldaprc; fi
-@unexec if cmp -s %D/%%CONFDIR%%/authlib/authdaemonrc.dist %D/%%CONFDIR%%/authlib/authdaemonrc; then rm -f %D/%%CONFDIR%%/authlib/authdaemonrc; fi
-%%CONFDIR%%/authlib/authdaemonrc.dist
-include/courier_auth_config.h
-include/courierauth.h
-include/courierauthsasl.h
-include/courierauthsaslclient.h
-include/courierauthdebug.h
-lib/courier-authlib/libcourierauth.so.0
-lib/courier-authlib/libcourierauth.so
-lib/courier-authlib/libcourierauth.a
-lib/courier-authlib/libcourierauthsasl.so.0
-lib/courier-authlib/libcourierauthsasl.so
-lib/courier-authlib/libcourierauthsasl.a
-lib/courier-authlib/libcourierauthsaslclient.so.0
-lib/courier-authlib/libcourierauthsaslclient.so
-lib/courier-authlib/libcourierauthsaslclient.a
-lib/courier-authlib/libcourierauthcommon.so.0
-lib/courier-authlib/libcourierauthcommon.so
-lib/courier-authlib/libcourierauthcommon.a
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so.0
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so.0
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so.0
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
-libexec/courier-authlib/authsystem.passwd
-libexec/courier-authlib/authdaemond
-%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
-sbin/authtest
-sbin/authdaemond
-sbin/authenumerate
-sbin/courierlogger
-%%AUTHUSERDBFLAG%%sbin/pw2userdb
-%%AUTHUSERDBFLAG%%sbin/makeuserdb
-%%AUTHUSERDBFLAG%%sbin/userdb
-%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
-%%AUTHUSERDBFLAG%%sbin/userdbpw
-%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery
-%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
-%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir /var/run/authdaemond 2>/dev/null || true
-@unexec rmdir %D/%%CONFDIR%%/authlib 2>/dev/null || true
-@dirrm lib/courier-authlib
-@dirrm libexec/courier-authlib
diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile
index 902b25be6031..9a867c647f53 100644
--- a/databases/courier-authlib-userdb/Makefile
+++ b/databases/courier-authlib-userdb/Makefile
@@ -1,177 +1,15 @@
-# New ports collection makefile for:	courier-authdaemon
-# Date created:				19 Dec 2004
-# Whom:					Oliver Lehmann
+# New ports collection makefile for:	courier-authlib-userdb
+# Date created:				02 Apr 2005
+# Whom:					Yarema <yds@CoolRat.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	courier-authlib
-PORTVERSION=	0.55
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	courier
+PKGNAMESUFFIX=	-userdb
 
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	Authentication library used by courier ports
+COMMENT=	Userdb support for the Courier authentication library
+CATEGORIES=	databases mail
 
-CONFLICTS=	courier-0.*
+MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
-USE_BZIP2=	yes
-USE_REINPLACE=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_RC_SUBR=	yes
-USE_LIBTOOL_VER=15
-USE_LIBLTDL=	yes
-
-#
-# options available:
-#
-# WITH_MAILUSER:		The user running authlib
-# WITH_MAILGROUP:		The group running authlib
-# WITH_SYSLOG_FACILITY:		The syslogfacility to use
-#
-
-OPTIONS=	PAM		"Build with PAM support"		on \
-		VPOPMAIL	"Build in vpopmail support"		off \
-		MYSQL		"Build in mysql support"		off \
-		POSTGRESQL	"Build in postgresql support"		off \
-		LDAP		"Build in ldap support with openldap"	off \
-		GDBM		"Use gdbm files instead of bdb"		off \
-		AUTHUSERDB	"Build with authuserdb"			on \
-		MERGECFGS	"Merge new Options into old auth-rc files" on
-
-VPOPMAILDIR?=	${LOCALBASE}/vpopmail
-WITH_MAILUSER?=	daemon
-WITH_MAILGROUP?=daemon
-CONFDIR?=	${PREFIX}/etc
-USERDB?=	${PREFIX}/etc/userdb
-
-PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
-
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
-		--without-authshadow \
-		--without-authcustom \
-		--enable-unicode \
-		--enable-ltdl-install=no \
-		--with-mailuser=${WITH_MAILUSER} \
-		--with-mailgroup=${WITH_MAILGROUP} \
-		--with-authdaemonvar=/var/run/authdaemond
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SYSLOG_FACILITY)
-CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
-.endif
-
-.if defined(WITH_GDBM)
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=--with-db=gdbm
-.else
-CONFIGURE_ARGS+=--with-db=db
-.endif
-
-.if !defined(WITH_VPOPMAIL)
-CONFIGURE_ARGS+=--without-authvchkpw
-PLIST_SUB+=	VPOPMAILFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-authvchkpw
-BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-PLIST_SUB+=	VPOPMAILFLAG=""
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-authldap
-PLIST_SUB+=	LDAPFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authldap
-PLIST_SUB+=	LDAPFLAG="@comment "
-.endif
-
-.if !defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--without-authmysql
-PLIST_SUB+=	MYSQLFLAG="@comment "
-.else
-USE_MYSQL=	YES
-PLIST_SUB+=	MYSQLFLAG=""
-CONFIGURE_ARGS+=--with-authmysql \
-		--with-mysql-libs=${LOCALBASE}/lib/mysql \
-		--with-mysql-includes=${LOCALBASE}/include/mysql
-.endif
-
-.if !defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=--without-authpgsql
-PLIST_SUB+=	PGSQLFLAG="@comment "
-.else
-USE_PGSQL=	YES
-PLIST_SUB+=	PGSQLFLAG=""
-.endif
-
-.if !defined(WITHOUT_PAM)
-CONFIGURE_ARGS+=--with-authpam
-PLIST_SUB+=	PAMFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authpam
-PLIST_SUB+=	PAMFLAG="@comment "
-.endif
-
-.if defined(WITHOUT_AUTHUSERDB)
-CONFIGURE_ARGS+=--without-authuserdb
-PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-userdb=${USERDB}
-PLIST_SUB+=     AUTHUSERDBFLAG=""
-.endif
-
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP}
-
-MAN1=		courierlogger.1
-
-MAN3=		authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
-		auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
-
-MAN8=		makeuserdb.8 userdb.8 userdbpw.8
-
-EXTRA_DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
-		README.authdebug.html README.authmysql.html \
-		README.authmysql.myownquery README.authpostgres.html \
-		README.ldap README_authlib.html
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/liblog/Makefile.in \
-		${WRKSRC}/userdb/Makefile.in
-	@${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \
-		${WRKSRC}/authdaemonrc.in
-	@${REINPLACE_CMD} -e 's|conftest.lock|/tmp/courier-authlib.locktest|g' \
-		${WRKSRC}/liblock/locktest.c
-
-post-configure:
-	@${RM} -f /tmp/courier-authlib.locktest
-
-post-install:
-	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/courier-authdaemond.sh > ${WRKDIR}/courier-authdaemond.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/courier-authdaemond.sh ${PREFIX}/etc/rc.d/courier-authdaemond.sh
-.if defined(WITH_MERGECFGS)
-	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
-.endif
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for a in ${EXTRA_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-userdb/distinfo b/databases/courier-authlib-userdb/distinfo
deleted file mode 100644
index f4e92b503fbb..000000000000
--- a/databases/courier-authlib-userdb/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
-SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/databases/courier-authlib-userdb/files/courier-authdaemond.sh b/databases/courier-authlib-userdb/files/courier-authdaemond.sh
deleted file mode 100644
index c13b5d921c40..000000000000
--- a/databases/courier-authlib-userdb/files/courier-authdaemond.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for courier-authdaemond service.
-
-# PROVIDE: courier_authdaemond
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-# Define these courier_authdaemond_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_authdaemond
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_authdaemond_enable=${courier_authdaemond_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_authdaemond"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/authdaemond"
-
-start_cmd="authdaemond_cmd start"
-stop_cmd="authdaemond_cmd stop"
-restart_cmd="authdaemond_cmd stop && authdaemond_cmd start"
-rundir=/var/run/authdaemond
-pidfile="${rundir}/pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-load_rc_config $name
-
-authdaemond_cmd () {
-	case $1 in
-	start)
-		if [ ! -d "${rundir}" ] ; then
-			mkdir -p -m 0750 "${rundir}" && chown %%MAILUSER%%:%%MAILGROUP%% "${rundir}"
-			if [ $? -ne 0 ] ; then
-				echo "creating ${rundir} with the correct permissions was not possible!"
-				return 1
-			fi
-		fi
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		if [ $? -eq 0 ] ; then
-			[ -f "${pidfile}" ]       && rm -f "$pidfile"
-			[ -f "${pidfile}.lock" ]  && rm -f "${pidfile}.lock"
-			[ -S "${rundir}/socket" ] && rm -f "${rundir}/socket"
-			return 0
-		fi
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/databases/courier-authlib-userdb/files/patch-Makefile.in b/databases/courier-authlib-userdb/files/patch-Makefile.in
deleted file mode 100644
index 03046540f679..000000000000
--- a/databases/courier-authlib-userdb/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Sat Dec 18 17:25:16 2004
-+++ Makefile.in	Sat Dec 18 17:27:50 2004
-@@ -992,8 +992,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
- 	done
- uninstall-man3:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-userdb/files/patch-ldap b/databases/courier-authlib-userdb/files/patch-ldap
deleted file mode 100644
index 1cae12242d67..000000000000
--- a/databases/courier-authlib-userdb/files/patch-ldap
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Wed Mar  3 05:54:13 2004
-+++ configure	Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/databases/courier-authlib-userdb/files/patch-liblog::Makefile.in b/databases/courier-authlib-userdb/files/patch-liblog::Makefile.in
deleted file mode 100644
index 301ba9c2efba..000000000000
--- a/databases/courier-authlib-userdb/files/patch-liblog::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- liblog/Makefile.in.orig	Sat Dec 18 18:31:57 2004
-+++ liblog/Makefile.in	Sat Dec 18 18:32:18 2004
-@@ -346,8 +346,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- uninstall-man1:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-userdb/files/patch-mysql b/databases/courier-authlib-userdb/files/patch-mysql
deleted file mode 100644
index 17f6042e3a47..000000000000
--- a/databases/courier-authlib-userdb/files/patch-mysql
+++ /dev/null
@@ -1,182 +0,0 @@
---- configure.orig	Sat Dec 18 17:28:54 2004
-+++ configure	Sat Dec 18 17:30:51 2004
-@@ -23821,9 +23821,9 @@
- if test "$doauthmysql" = ""
- then
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -23832,12 +23832,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -23847,7 +23847,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -23856,14 +23856,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -23872,7 +23872,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -23899,19 +23899,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   doauthmysql="yes"
- 
- fi
-@@ -24021,9 +24021,9 @@
- else
- 	saveLIBS="$LIBS"
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -24032,12 +24032,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -24047,7 +24047,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -24056,14 +24056,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -24072,7 +24072,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -24099,19 +24099,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   LIBAUTHMYSQL="libauthmysql.la"
- 		HAVE_AUTHMYSQL=1
- else
diff --git a/databases/courier-authlib-userdb/files/patch-userdb::Makefile.in b/databases/courier-authlib-userdb/files/patch-userdb::Makefile.in
deleted file mode 100644
index c4c62ce68aa3..000000000000
--- a/databases/courier-authlib-userdb/files/patch-userdb::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- userdb/Makefile.in.orig	Sat Dec 18 18:33:08 2004
-+++ userdb/Makefile.in	Sat Dec 18 18:34:09 2004
-@@ -378,8 +378,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
- uninstall-man8:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-userdb/files/patch-userdb::pw2userdb.in b/databases/courier-authlib-userdb/files/patch-userdb::pw2userdb.in
deleted file mode 100644
index 7cb79aa49b02..000000000000
--- a/databases/courier-authlib-userdb/files/patch-userdb::pw2userdb.in
+++ /dev/null
@@ -1,104 +0,0 @@
---- userdb/pw2userdb.in.orig	Wed Jul 19 13:55:15 2000
-+++ userdb/pw2userdb.in	Tue Mar  1 21:58:51 2005
-@@ -7,6 +7,8 @@
- # Copyright 1998 - 1999 Double Precision, Inc.  See COPYING for
- # distribution information.
- 
-+# Adapted to BSD master.passwd
-+
- use Getopt::Long;
- 
- #
-@@ -22,42 +24,66 @@
- 	if $vpopuid;
- 
- $passwd="/etc/passwd" unless $passwd =~ /./;
--$shadow="/etc/shadow" unless $shadow =~ /./;
-+$shadow="/etc/master.passwd" unless $shadow =~ /./;
- 
- $domain="" unless $domain =~ /./;
- $domain="\@$domain" if $domain =~ /./;
- 
--open(PASSWD, $passwd) || die "$!\n";
--
--while (<PASSWD>)
-+if (! $noshadow && $shadow =~ /master.passwd$/)
- {
--	chop if /\n$/;
--	next if /^#/;
--	($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
--
--	($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
--
--	$PASSWORD{$acct}=$passwd if $passwd ne "x";
--	$UID{$acct}=$uid;
--	$GID{$acct}=$gid;
--	$HOME{$acct}=$home;
--	$SHELL{$acct}=$shell;
--
--	$name =~ s/\|/./g;	# Just in case
--	$GECOS{$acct}=$name;
--}
--close (PASSWD);
-+	open(PASSWD, $shadow) || die "$!\n";
- 
--if ( -f $shadow && ! $noshadow)
--{
--	open (SHADOW, $shadow) || die "$!\n";
--	while (<SHADOW>)
-+	while (<PASSWD>)
- 	{
-+		chop if /\n$/;
- 		next if /^#/;
--		($acct,$passwd,$dummy)=split(/:/);
-+		($acct,$passwd,$uid,$gid,$class,$change,$expire,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+		$name =~ s/\|/./g;      # Just in case
-+
- 		$PASSWORD{$acct}=$passwd;
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+} else {
-+	open(PASSWD, $passwd) || die "$!\n";
-+
-+	while (<PASSWD>)
-+	{
-+		chop if /\n$/;
-+		next if /^#/;
-+		($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+
-+		$PASSWORD{$acct}=$passwd if $passwd ne "x";
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+
-+		$name =~ s/\|/./g;	# Just in case
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+
-+	if ( -f $shadow && ! $noshadow)
-+	{
-+		open (SHADOW, $shadow) || die "$!\n";
-+		while (<SHADOW>)
-+		{
-+		
-+			next if /^#/;
-+			($acct,$passwd,$dummy)=split(/:/);
-+			$PASSWORD{$acct}=$passwd;
-+		}
-+		close (SHADOW);
- 	}
--	close (SHADOW);
- }
- 
- while ( defined ($key=each %UID))
diff --git a/databases/courier-authlib-userdb/pkg-descr b/databases/courier-authlib-userdb/pkg-descr
deleted file mode 100644
index 1b44b9f42019..000000000000
--- a/databases/courier-authlib-userdb/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The Courier Authentication Library is a generic authentication API that
-encapsulates the process of validating account passwords. In addition to
-reading the traditional account passwords from /etc/passwd, the account
-information can alternatively be obtained from an LDAP directory; a MySQL
-or a PostgreSQL database; or a GDBM or a DB file.
-
-WWW:	http://www.courier-mta.org/authlib/
diff --git a/databases/courier-authlib-userdb/pkg-plist b/databases/courier-authlib-userdb/pkg-plist
deleted file mode 100644
index e9626f569ca8..000000000000
--- a/databases/courier-authlib-userdb/pkg-plist
+++ /dev/null
@@ -1,67 +0,0 @@
-@unexec [ ! -f /var/run/authdaemond/pid ] || %D/etc/rc.d/courier-authdaemond.sh stop || true
-bin/courierauthconfig
-etc/rc.d/courier-authdaemond.sh
-%%MYSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authmysqlrc.dist %D/%%CONFDIR%%/authlib/authmysqlrc; then rm -f %D/%%CONFDIR%%/authlib/authmysqlrc; fi
-%%PGSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authpgsqlrc.dist %D/%%CONFDIR%%/authlib/authpgsqlrc; then rm -f %D/%%CONFDIR%%/authlib/authpgsqlrc; fi
-%%LDAPFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authldaprc.dist %D/%%CONFDIR%%/authlib/authldaprc; then rm -f %D/%%CONFDIR%%/authlib/authldaprc; fi
-@unexec if cmp -s %D/%%CONFDIR%%/authlib/authdaemonrc.dist %D/%%CONFDIR%%/authlib/authdaemonrc; then rm -f %D/%%CONFDIR%%/authlib/authdaemonrc; fi
-%%CONFDIR%%/authlib/authdaemonrc.dist
-include/courier_auth_config.h
-include/courierauth.h
-include/courierauthsasl.h
-include/courierauthsaslclient.h
-include/courierauthdebug.h
-lib/courier-authlib/libcourierauth.so.0
-lib/courier-authlib/libcourierauth.so
-lib/courier-authlib/libcourierauth.a
-lib/courier-authlib/libcourierauthsasl.so.0
-lib/courier-authlib/libcourierauthsasl.so
-lib/courier-authlib/libcourierauthsasl.a
-lib/courier-authlib/libcourierauthsaslclient.so.0
-lib/courier-authlib/libcourierauthsaslclient.so
-lib/courier-authlib/libcourierauthsaslclient.a
-lib/courier-authlib/libcourierauthcommon.so.0
-lib/courier-authlib/libcourierauthcommon.so
-lib/courier-authlib/libcourierauthcommon.a
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so.0
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so.0
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so.0
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
-libexec/courier-authlib/authsystem.passwd
-libexec/courier-authlib/authdaemond
-%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
-sbin/authtest
-sbin/authdaemond
-sbin/authenumerate
-sbin/courierlogger
-%%AUTHUSERDBFLAG%%sbin/pw2userdb
-%%AUTHUSERDBFLAG%%sbin/makeuserdb
-%%AUTHUSERDBFLAG%%sbin/userdb
-%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
-%%AUTHUSERDBFLAG%%sbin/userdbpw
-%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery
-%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
-%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir /var/run/authdaemond 2>/dev/null || true
-@unexec rmdir %D/%%CONFDIR%%/authlib 2>/dev/null || true
-@dirrm lib/courier-authlib
-@dirrm libexec/courier-authlib
diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile
index 902b25be6031..eb1761797ba4 100644
--- a/databases/courier-authlib-usergdbm/Makefile
+++ b/databases/courier-authlib-usergdbm/Makefile
@@ -1,177 +1,15 @@
-# New ports collection makefile for:	courier-authdaemon
-# Date created:				19 Dec 2004
-# Whom:					Oliver Lehmann
+# New ports collection makefile for:	courier-authlib-usergdbm
+# Date created:				02 Apr 2005
+# Whom:					Yarema <yds@CoolRat.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	courier-authlib
-PORTVERSION=	0.55
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	courier
+PKGNAMESUFFIX=	-usergdbm
 
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	Authentication library used by courier ports
+COMMENT=	Userdb support for the Courier authentication library
+CATEGORIES=	databases mail
 
-CONFLICTS=	courier-0.*
+MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
-USE_BZIP2=	yes
-USE_REINPLACE=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_RC_SUBR=	yes
-USE_LIBTOOL_VER=15
-USE_LIBLTDL=	yes
-
-#
-# options available:
-#
-# WITH_MAILUSER:		The user running authlib
-# WITH_MAILGROUP:		The group running authlib
-# WITH_SYSLOG_FACILITY:		The syslogfacility to use
-#
-
-OPTIONS=	PAM		"Build with PAM support"		on \
-		VPOPMAIL	"Build in vpopmail support"		off \
-		MYSQL		"Build in mysql support"		off \
-		POSTGRESQL	"Build in postgresql support"		off \
-		LDAP		"Build in ldap support with openldap"	off \
-		GDBM		"Use gdbm files instead of bdb"		off \
-		AUTHUSERDB	"Build with authuserdb"			on \
-		MERGECFGS	"Merge new Options into old auth-rc files" on
-
-VPOPMAILDIR?=	${LOCALBASE}/vpopmail
-WITH_MAILUSER?=	daemon
-WITH_MAILGROUP?=daemon
-CONFDIR?=	${PREFIX}/etc
-USERDB?=	${PREFIX}/etc/userdb
-
-PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
-
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
-		--without-authshadow \
-		--without-authcustom \
-		--enable-unicode \
-		--enable-ltdl-install=no \
-		--with-mailuser=${WITH_MAILUSER} \
-		--with-mailgroup=${WITH_MAILGROUP} \
-		--with-authdaemonvar=/var/run/authdaemond
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SYSLOG_FACILITY)
-CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
-.endif
-
-.if defined(WITH_GDBM)
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=--with-db=gdbm
-.else
-CONFIGURE_ARGS+=--with-db=db
-.endif
-
-.if !defined(WITH_VPOPMAIL)
-CONFIGURE_ARGS+=--without-authvchkpw
-PLIST_SUB+=	VPOPMAILFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-authvchkpw
-BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-PLIST_SUB+=	VPOPMAILFLAG=""
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-authldap
-PLIST_SUB+=	LDAPFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authldap
-PLIST_SUB+=	LDAPFLAG="@comment "
-.endif
-
-.if !defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--without-authmysql
-PLIST_SUB+=	MYSQLFLAG="@comment "
-.else
-USE_MYSQL=	YES
-PLIST_SUB+=	MYSQLFLAG=""
-CONFIGURE_ARGS+=--with-authmysql \
-		--with-mysql-libs=${LOCALBASE}/lib/mysql \
-		--with-mysql-includes=${LOCALBASE}/include/mysql
-.endif
-
-.if !defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=--without-authpgsql
-PLIST_SUB+=	PGSQLFLAG="@comment "
-.else
-USE_PGSQL=	YES
-PLIST_SUB+=	PGSQLFLAG=""
-.endif
-
-.if !defined(WITHOUT_PAM)
-CONFIGURE_ARGS+=--with-authpam
-PLIST_SUB+=	PAMFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authpam
-PLIST_SUB+=	PAMFLAG="@comment "
-.endif
-
-.if defined(WITHOUT_AUTHUSERDB)
-CONFIGURE_ARGS+=--without-authuserdb
-PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--with-userdb=${USERDB}
-PLIST_SUB+=     AUTHUSERDBFLAG=""
-.endif
-
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP}
-
-MAN1=		courierlogger.1
-
-MAN3=		authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
-		auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
-
-MAN8=		makeuserdb.8 userdb.8 userdbpw.8
-
-EXTRA_DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
-		README.authdebug.html README.authmysql.html \
-		README.authmysql.myownquery README.authpostgres.html \
-		README.ldap README_authlib.html
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/liblog/Makefile.in \
-		${WRKSRC}/userdb/Makefile.in
-	@${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \
-		${WRKSRC}/authdaemonrc.in
-	@${REINPLACE_CMD} -e 's|conftest.lock|/tmp/courier-authlib.locktest|g' \
-		${WRKSRC}/liblock/locktest.c
-
-post-configure:
-	@${RM} -f /tmp/courier-authlib.locktest
-
-post-install:
-	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/courier-authdaemond.sh > ${WRKDIR}/courier-authdaemond.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/courier-authdaemond.sh ${PREFIX}/etc/rc.d/courier-authdaemond.sh
-.if defined(WITH_MERGECFGS)
-	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
-.endif
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for a in ${EXTRA_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-usergdbm/distinfo b/databases/courier-authlib-usergdbm/distinfo
deleted file mode 100644
index f4e92b503fbb..000000000000
--- a/databases/courier-authlib-usergdbm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
-SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/databases/courier-authlib-usergdbm/files/courier-authdaemond.sh b/databases/courier-authlib-usergdbm/files/courier-authdaemond.sh
deleted file mode 100644
index c13b5d921c40..000000000000
--- a/databases/courier-authlib-usergdbm/files/courier-authdaemond.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for courier-authdaemond service.
-
-# PROVIDE: courier_authdaemond
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-# Define these courier_authdaemond_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_authdaemond
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_authdaemond_enable=${courier_authdaemond_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_authdaemond"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/authdaemond"
-
-start_cmd="authdaemond_cmd start"
-stop_cmd="authdaemond_cmd stop"
-restart_cmd="authdaemond_cmd stop && authdaemond_cmd start"
-rundir=/var/run/authdaemond
-pidfile="${rundir}/pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-load_rc_config $name
-
-authdaemond_cmd () {
-	case $1 in
-	start)
-		if [ ! -d "${rundir}" ] ; then
-			mkdir -p -m 0750 "${rundir}" && chown %%MAILUSER%%:%%MAILGROUP%% "${rundir}"
-			if [ $? -ne 0 ] ; then
-				echo "creating ${rundir} with the correct permissions was not possible!"
-				return 1
-			fi
-		fi
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		if [ $? -eq 0 ] ; then
-			[ -f "${pidfile}" ]       && rm -f "$pidfile"
-			[ -f "${pidfile}.lock" ]  && rm -f "${pidfile}.lock"
-			[ -S "${rundir}/socket" ] && rm -f "${rundir}/socket"
-			return 0
-		fi
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
diff --git a/databases/courier-authlib-usergdbm/files/patch-Makefile.in b/databases/courier-authlib-usergdbm/files/patch-Makefile.in
deleted file mode 100644
index 03046540f679..000000000000
--- a/databases/courier-authlib-usergdbm/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Sat Dec 18 17:25:16 2004
-+++ Makefile.in	Sat Dec 18 17:27:50 2004
-@@ -992,8 +992,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
- 	done
- uninstall-man3:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-usergdbm/files/patch-ldap b/databases/courier-authlib-usergdbm/files/patch-ldap
deleted file mode 100644
index 1cae12242d67..000000000000
--- a/databases/courier-authlib-usergdbm/files/patch-ldap
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Wed Mar  3 05:54:13 2004
-+++ configure	Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/databases/courier-authlib-usergdbm/files/patch-liblog::Makefile.in b/databases/courier-authlib-usergdbm/files/patch-liblog::Makefile.in
deleted file mode 100644
index 301ba9c2efba..000000000000
--- a/databases/courier-authlib-usergdbm/files/patch-liblog::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- liblog/Makefile.in.orig	Sat Dec 18 18:31:57 2004
-+++ liblog/Makefile.in	Sat Dec 18 18:32:18 2004
-@@ -346,8 +346,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- uninstall-man1:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-usergdbm/files/patch-mysql b/databases/courier-authlib-usergdbm/files/patch-mysql
deleted file mode 100644
index 17f6042e3a47..000000000000
--- a/databases/courier-authlib-usergdbm/files/patch-mysql
+++ /dev/null
@@ -1,182 +0,0 @@
---- configure.orig	Sat Dec 18 17:28:54 2004
-+++ configure	Sat Dec 18 17:30:51 2004
-@@ -23821,9 +23821,9 @@
- if test "$doauthmysql" = ""
- then
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -23832,12 +23832,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -23847,7 +23847,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -23856,14 +23856,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -23872,7 +23872,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -23899,19 +23899,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   doauthmysql="yes"
- 
- fi
-@@ -24021,9 +24021,9 @@
- else
- 	saveLIBS="$LIBS"
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -24032,12 +24032,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -24047,7 +24047,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -24056,14 +24056,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -24072,7 +24072,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -24099,19 +24099,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   LIBAUTHMYSQL="libauthmysql.la"
- 		HAVE_AUTHMYSQL=1
- else
diff --git a/databases/courier-authlib-usergdbm/files/patch-userdb::Makefile.in b/databases/courier-authlib-usergdbm/files/patch-userdb::Makefile.in
deleted file mode 100644
index c4c62ce68aa3..000000000000
--- a/databases/courier-authlib-usergdbm/files/patch-userdb::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- userdb/Makefile.in.orig	Sat Dec 18 18:33:08 2004
-+++ userdb/Makefile.in	Sat Dec 18 18:34:09 2004
-@@ -378,8 +378,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
- uninstall-man8:
- 	@$(NORMAL_UNINSTALL)
diff --git a/databases/courier-authlib-usergdbm/files/patch-userdb::pw2userdb.in b/databases/courier-authlib-usergdbm/files/patch-userdb::pw2userdb.in
deleted file mode 100644
index 7cb79aa49b02..000000000000
--- a/databases/courier-authlib-usergdbm/files/patch-userdb::pw2userdb.in
+++ /dev/null
@@ -1,104 +0,0 @@
---- userdb/pw2userdb.in.orig	Wed Jul 19 13:55:15 2000
-+++ userdb/pw2userdb.in	Tue Mar  1 21:58:51 2005
-@@ -7,6 +7,8 @@
- # Copyright 1998 - 1999 Double Precision, Inc.  See COPYING for
- # distribution information.
- 
-+# Adapted to BSD master.passwd
-+
- use Getopt::Long;
- 
- #
-@@ -22,42 +24,66 @@
- 	if $vpopuid;
- 
- $passwd="/etc/passwd" unless $passwd =~ /./;
--$shadow="/etc/shadow" unless $shadow =~ /./;
-+$shadow="/etc/master.passwd" unless $shadow =~ /./;
- 
- $domain="" unless $domain =~ /./;
- $domain="\@$domain" if $domain =~ /./;
- 
--open(PASSWD, $passwd) || die "$!\n";
--
--while (<PASSWD>)
-+if (! $noshadow && $shadow =~ /master.passwd$/)
- {
--	chop if /\n$/;
--	next if /^#/;
--	($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
--
--	($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
--
--	$PASSWORD{$acct}=$passwd if $passwd ne "x";
--	$UID{$acct}=$uid;
--	$GID{$acct}=$gid;
--	$HOME{$acct}=$home;
--	$SHELL{$acct}=$shell;
--
--	$name =~ s/\|/./g;	# Just in case
--	$GECOS{$acct}=$name;
--}
--close (PASSWD);
-+	open(PASSWD, $shadow) || die "$!\n";
- 
--if ( -f $shadow && ! $noshadow)
--{
--	open (SHADOW, $shadow) || die "$!\n";
--	while (<SHADOW>)
-+	while (<PASSWD>)
- 	{
-+		chop if /\n$/;
- 		next if /^#/;
--		($acct,$passwd,$dummy)=split(/:/);
-+		($acct,$passwd,$uid,$gid,$class,$change,$expire,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+		$name =~ s/\|/./g;      # Just in case
-+
- 		$PASSWORD{$acct}=$passwd;
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+} else {
-+	open(PASSWD, $passwd) || die "$!\n";
-+
-+	while (<PASSWD>)
-+	{
-+		chop if /\n$/;
-+		next if /^#/;
-+		($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ );
-+
-+		($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid;
-+
-+		$PASSWORD{$acct}=$passwd if $passwd ne "x";
-+		$UID{$acct}=$uid;
-+		$GID{$acct}=$gid;
-+		$HOME{$acct}=$home;
-+		$SHELL{$acct}=$shell;
-+
-+		$name =~ s/\|/./g;	# Just in case
-+		$GECOS{$acct}=$name;
-+	}
-+	close (PASSWD);
-+
-+	if ( -f $shadow && ! $noshadow)
-+	{
-+		open (SHADOW, $shadow) || die "$!\n";
-+		while (<SHADOW>)
-+		{
-+		
-+			next if /^#/;
-+			($acct,$passwd,$dummy)=split(/:/);
-+			$PASSWORD{$acct}=$passwd;
-+		}
-+		close (SHADOW);
- 	}
--	close (SHADOW);
- }
- 
- while ( defined ($key=each %UID))
diff --git a/databases/courier-authlib-usergdbm/pkg-descr b/databases/courier-authlib-usergdbm/pkg-descr
deleted file mode 100644
index 1b44b9f42019..000000000000
--- a/databases/courier-authlib-usergdbm/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The Courier Authentication Library is a generic authentication API that
-encapsulates the process of validating account passwords. In addition to
-reading the traditional account passwords from /etc/passwd, the account
-information can alternatively be obtained from an LDAP directory; a MySQL
-or a PostgreSQL database; or a GDBM or a DB file.
-
-WWW:	http://www.courier-mta.org/authlib/
diff --git a/databases/courier-authlib-usergdbm/pkg-plist b/databases/courier-authlib-usergdbm/pkg-plist
deleted file mode 100644
index e9626f569ca8..000000000000
--- a/databases/courier-authlib-usergdbm/pkg-plist
+++ /dev/null
@@ -1,67 +0,0 @@
-@unexec [ ! -f /var/run/authdaemond/pid ] || %D/etc/rc.d/courier-authdaemond.sh stop || true
-bin/courierauthconfig
-etc/rc.d/courier-authdaemond.sh
-%%MYSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authmysqlrc.dist %D/%%CONFDIR%%/authlib/authmysqlrc; then rm -f %D/%%CONFDIR%%/authlib/authmysqlrc; fi
-%%PGSQLFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authpgsqlrc.dist %D/%%CONFDIR%%/authlib/authpgsqlrc; then rm -f %D/%%CONFDIR%%/authlib/authpgsqlrc; fi
-%%LDAPFLAG%%@unexec if cmp -s %D/%%CONFDIR%%/authlib/authldaprc.dist %D/%%CONFDIR%%/authlib/authldaprc; then rm -f %D/%%CONFDIR%%/authlib/authldaprc; fi
-@unexec if cmp -s %D/%%CONFDIR%%/authlib/authdaemonrc.dist %D/%%CONFDIR%%/authlib/authdaemonrc; then rm -f %D/%%CONFDIR%%/authlib/authdaemonrc; fi
-%%CONFDIR%%/authlib/authdaemonrc.dist
-include/courier_auth_config.h
-include/courierauth.h
-include/courierauthsasl.h
-include/courierauthsaslclient.h
-include/courierauthdebug.h
-lib/courier-authlib/libcourierauth.so.0
-lib/courier-authlib/libcourierauth.so
-lib/courier-authlib/libcourierauth.a
-lib/courier-authlib/libcourierauthsasl.so.0
-lib/courier-authlib/libcourierauthsasl.so
-lib/courier-authlib/libcourierauthsasl.a
-lib/courier-authlib/libcourierauthsaslclient.so.0
-lib/courier-authlib/libcourierauthsaslclient.so
-lib/courier-authlib/libcourierauthsaslclient.a
-lib/courier-authlib/libcourierauthcommon.so.0
-lib/courier-authlib/libcourierauthcommon.so
-lib/courier-authlib/libcourierauthcommon.a
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
-%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
-%%PAMFLAG%%lib/courier-authlib/libauthpam.so
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
-%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so.0
-%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so.0
-%%LDAPFLAG%%lib/courier-authlib/libauthldap.so
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so.0
-%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
-libexec/courier-authlib/authsystem.passwd
-libexec/courier-authlib/authdaemond
-%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
-sbin/authtest
-sbin/authdaemond
-sbin/authenumerate
-sbin/courierlogger
-%%AUTHUSERDBFLAG%%sbin/pw2userdb
-%%AUTHUSERDBFLAG%%sbin/makeuserdb
-%%AUTHUSERDBFLAG%%sbin/userdb
-%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
-%%AUTHUSERDBFLAG%%sbin/userdbpw
-%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
-%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery
-%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
-%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir /var/run/authdaemond 2>/dev/null || true
-@unexec rmdir %D/%%CONFDIR%%/authlib 2>/dev/null || true
-@dirrm lib/courier-authlib
-@dirrm libexec/courier-authlib