*/courier-authlib*:

- Add USES=libtool
- Remove USE_LDCONFIG, not needed for modules
- Disable static modules
- Remove install-configure from INSTALL_TARGET, no impact with staging
- Add manpages to pkg-plist
- Use @sample
- Replace pkg-(de)install and pre-install target with USERS and GROUPS
- Create /var/run/authdaemond at package installation instead of in rc
  script

12 files changed, 102 insertions, 233 deletions

diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile
index fbcd9102edd8..77d2ba001d94 100644
--- a/security/courier-authlib-base/Makefile
+++ b/security/courier-authlib-base/Makefile
@@ -1,6 +1,7 @@
 # Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 PKGNAMESUFFIX=	-base
 
 COMMENT=	Courier authentication library base
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 59ceb5690022..33edb889a44d 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	courier-authlib
 PORTVERSION=	0.66.1
+PORTREVISION?=	0
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	SF/courier/authlib/${PORTVERSION}
@@ -30,18 +31,13 @@ OPTIONS_DEFINE+=	GDBM
 
 .else	# !defined(PKGNAMESUFFIX)
 
-USES=		iconv gmake perl5 tar:bzip2
+USES=		iconv gmake libtool perl5 tar:bzip2
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_SUBMAKE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
-#slave ports should have different UNIQUENAME, it is utilized by USE_LDCONFIG
-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 MAILOWN=	courier
 MAILGRP=	courier
-MAILUID=	465
-MAILGID=	465
 LOCALSTATEDIR=	/var
 AUTHDAEMONVAR=	${LOCALSTATEDIR}/run/authdaemond
 
@@ -49,11 +45,10 @@ VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 USERDB?=	${PREFIX}/etc/userdb
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV:=	${CONFIGURE_ENV}
+LIBS+=		-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--enable-unicode \
-		--enable-ltdl-install=no \
+		--disable-static \
 		--without-authcustom \
 		--without-authshadow \
 		--without-authpwd \
@@ -64,31 +59,26 @@ CONFIGURE_ARGS=	--enable-unicode \
 		--cache-file=${WRKDIR}/courier-authlib.cache \
 		--without-authsqlite
 
-INSTALL_TARGET=	install-strip install-configure
+INSTALL_TARGET=	install-strip
 
 DESCR=		${PKGDIR}/pkg-descr${PKGNAMESUFFIX}
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX:S/gdbm/db/}
 
+PLIST_SUB+=	MAILOWN=${MAILOWN} MAILGRP=${MAILGRP}
+
 AUTHMOD=	auth${PKGNAMESUFFIX:S/-//:S/gdbm/db/}
 
 .if ${AUTHMOD} == authbase
-RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool
-CONFIGURE_ARGS+=--with-base --with-authpam
-
-MAN1=		courierlogger.1 authtest.1
+CONFIGURE_ARGS+=--with-base --with-authpam --with-authpipe
 
-MAN3=		authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
-		auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3 \
-		auth_sasl_ex.3
+USERS=		${MAILOWN}
+GROUPS=		${MAILGRP}
 
 DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README \
 		README.authdebug.html README_authlib.html
 
-PLIST_SUB+=	MAILOWN=${MAILOWN} MAILGRP=${MAILGRP} \
-		MAILUID=${MAILUID} MAILGID=${MAILGID} \
-		AUTHDAEMONVAR=${AUTHDAEMONVAR}
-SUB_LIST:=	${PLIST_SUB}
-SUB_FILES+=	pkg-install pkg-deinstall
+PLIST_SUB+=	AUTHDAEMONVAR=${AUTHDAEMONVAR}
+SUB_LIST+=	AUTHDAEMONVAR=${AUTHDAEMONVAR}
 
 .if defined(WITH_AUTHPIPE_PROG)
 CONFIGURE_ARGS+=--with-pipeprog=${WITH_AUTHPIPE_PROG}
@@ -96,12 +86,11 @@ CONFIGURE_ARGS+=--with-pipeprog=${WITH_AUTHPIPE_PROG}
 
 .else
 RUN_DEPENDS+=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-CONFIGURE_ARGS+=--without-base --without-authpam
+CONFIGURE_ARGS+=--without-base --without-authpam --without-authpipe
 REMOVE_SUBDIRS+=liblock liblog
 .endif
 
 .if ${AUTHMOD} == authuserdb
-MAN8=		makeuserdb.8 userdb.8 userdbpw.8 pw2userdb.8
 .if ${PKGNAMESUFFIX} == -usergdbm
 CONFLICTS+=	${PORTNAME}-userdb-0.*
 LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
@@ -177,7 +166,6 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g;  \
-		s|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"$${INSTALL_PROGRAM} -s"| ; \
 		s|mysql_connect|mysql_real_connect|g' \
 		${WRKSRC}/*/configure \
 		${WRKSRC}/configure
@@ -185,9 +173,6 @@ post-patch:
 	@${REINPLACE_CMD} -E 's,(^(ac_subdirs_all|subdirs).*)${subdir},\1,g' \
 		${WRKSRC}/configure
 .endfor
-	@${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \
-		${WRKSRC}/*/Makefile.in \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|^\(DEFAULTOPTIONS=\)""$$|\1"wbnodsn=1"|' \
 		-e 's|@ALLMODULES@|authuserdb authvchkpw authpam authldap authmysql authpgsql|' \
 		${WRKSRC}/authdaemonrc.in
@@ -199,18 +184,12 @@ pre-configure:
 		${RM} -f "${WRKDIR}/courier-authlib.cache" ; \
 	fi
 
-.if ${PKGNAMESUFFIX} == "-base"
-pre-install:
-	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif	# ${PKGNAMESUFFIX} == "-base"
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} ${_SHROWNGRP} -d ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
+
 .endif	# !defined(PKGNAMESUFFIX)
 
 .include <bsd.port.post.mk>
diff --git a/security/courier-authlib/files/courier-authdaemond.in b/security/courier-authlib/files/courier-authdaemond.in
index c70cb56f41c8..8381df4b2f3d 100644
--- a/security/courier-authlib/files/courier-authdaemond.in
+++ b/security/courier-authlib/files/courier-authdaemond.in
@@ -12,8 +12,6 @@ exec_prefix="${prefix}"
 sysconfdir="${prefix}/etc/authlib"
 sbindir="${exec_prefix}/sbin"
 bindir="${exec_prefix}/bin"
-libdir="${prefix}/lib/courier-authlib"
-libexecdir="${prefix}/libexec/courier-authlib"
 authdaemonvar="%%AUTHDAEMONVAR%%"
 
 # Define these courier_authdaemond_* variables in one of these files:
@@ -31,31 +29,14 @@ name="courier_authdaemond"
 rcvar=courier_authdaemond_enable
 
 command="${sbindir}/authdaemond"
-procname="${sbindir}/courierlogger"
 pidfile="${authdaemonvar}/pid"
 socket="${authdaemonvar}/socket"
 
-start_precmd="${name}_prestart"
 start_cmd="${command} start"
-stop_precmd="echo 'Stopping ${name}.'"
 stop_cmd="${command} stop"
 stop_postcmd="rm -f ${pidfile} ${pidfile}.lock ${socket}"
+required_dirs="${authdaemonvar}"
 required_files="${sysconfdir}/authdaemonrc"
 
-courier_authdaemond_prestart()
-{
-	if [ ! -d "${authdaemonvar}" ] ; then
-		install -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 -d "${authdaemonvar}"
-		if [ $? -ne 0 ] ; then
-			echo "Creating ${authdaemonvar} with the correct permissions was not possible!"
-			return 1
-		fi
-	fi
-	/sbin/ldconfig -m "${libdir}"
-	echo "Starting ${name}."
-}
-
 load_rc_config $name
 run_rc_command "$1"
-
-
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in
index d32eb9754d12..247de27c3a4b 100644
--- a/security/courier-authlib/files/patch-Makefile.in
+++ b/security/courier-authlib/files/patch-Makefile.in
@@ -113,17 +113,6 @@
  man_MANS = $(man1) $(man3) auth_sasl_ex.3
  BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
  	authdaemonrc.h packageversion.h \
-@@ -935,8 +956,8 @@
- 	test -z "$$list2" || { \
- 	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
- 	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
--	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
--	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
-+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 0444 $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 0444 $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
- 	}
- 
- uninstall-pkglibLTLIBRARIES:
 @@ -989,6 +1010,9 @@
  libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) 
  	$(AM_V_CCLD)$(libauthuserdb_la_LINK)  $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS)
@@ -151,28 +140,6 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1328,8 +1355,8 @@
- 	sed 'N;N;s,\n, ,g' | { \
- 	list=; while read file base inst; do \
- 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
--	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-+	    echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	    install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
- 	  fi; \
- 	done; \
- 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-@@ -1371,8 +1398,8 @@
- 	sed 'N;N;s,\n, ,g' | { \
- 	list=; while read file base inst; do \
- 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
--	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
--	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
-+	    echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+	    install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
- 	  fi; \
- 	done; \
- 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 @@ -1771,18 +1798,26 @@
  
  info-am:
@@ -208,7 +175,7 @@
  install-html: install-html-recursive
  
  install-html-am:
-@@ -1862,6 +1897,12 @@
+@@ -1862,14 +1897,20 @@
  	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
  
  
@@ -221,6 +188,30 @@
  authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
  
  @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
+ @HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
+ @HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
+-@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.dist
+-@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
+-@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
++@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.sample
++@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.sample
++@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.sample
+ 
+ @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
+ @HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist
+@@ -1888,9 +1929,9 @@
+ @HAVE_LDAP_TRUE@install-authldaprc:
+ @HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
+ @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
+-@HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.dist
+-@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist
+-@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
++@HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.sample
++@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.sample
++@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.sample
+ 
+ @HAVE_LDAP_TRUE@uninstall-authldaprc:
+ @HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist
 @@ -1901,6 +1942,19 @@
  @HAVE_LDAP_FALSE@uninstall-authldaprc:
  @HAVE_LDAP_FALSE@	@:
@@ -228,7 +219,7 @@
 +@HAVE_LDAP_TRUE@install-ldapschema:
 +@HAVE_LDAP_TRUE@	$(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema
 +@HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
-+@HAVE_LDAP_TRUE@		${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.default
++@HAVE_LDAP_TRUE@		${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.sample
 +@HAVE_LDAP_TRUE@#	if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \
 +@HAVE_LDAP_TRUE@#		$(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
 +@HAVE_LDAP_TRUE@#			${sysconfdir}/openldap/schema/authldap.schema ; \
@@ -241,6 +232,32 @@
  authldaprc.h:
  	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
  
+@@ -1909,9 +1963,9 @@
+ @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
+ @HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
+ @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
+-@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.dist
+-@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
+-@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
++@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.sample
++@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.sample
++@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.sample
+ 
+ @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
+ @HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist
+@@ -1930,9 +1984,9 @@
+ @HAVE_AUTHSQLITE_TRUE@install-authsqliterc:
+ @HAVE_AUTHSQLITE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || :
+ @HAVE_AUTHSQLITE_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \
+-@HAVE_AUTHSQLITE_TRUE@		$(DESTDIR)@authsqliterc@.dist
+-@HAVE_AUTHSQLITE_TRUE@	-chown @mailuser@ $(DESTDIR)@authsqliterc@.dist
+-@HAVE_AUTHSQLITE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist
++@HAVE_AUTHSQLITE_TRUE@		$(DESTDIR)@authsqliterc@.sample
++@HAVE_AUTHSQLITE_TRUE@	-chown @mailuser@ $(DESTDIR)@authsqliterc@.sample
++@HAVE_AUTHSQLITE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.sample
+ 
+ @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc:
+ @HAVE_AUTHSQLITE_TRUE@	rm -f $(DESTDIR)@authsqliterc@.dist
 @@ -1951,16 +2005,22 @@
  authpiperc.h:
  	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
@@ -255,19 +272,19 @@
 +@HAVE_BASE_TRUE@install-authdaemonrc:
 +@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@`
 +@HAVE_BASE_TRUE@	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
-+@HAVE_BASE_TRUE@	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
++@HAVE_BASE_TRUE@	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.sample
 +@HAVE_BASE_TRUE@	rm -f authdaemonrc.tmp
-+@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
-+@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
-+
++@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.sample
++@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.sample
+ 
+-uninstall-authdaemonrc:
+-	rm -f $(DESTDIR)@authdaemonrc@.dist
 +@HAVE_BASE_FALSE@install-authdaemonrc:
 +@HAVE_BASE_FALSE@	@:
 +
 +@HAVE_BASE_TRUE@uninstall-authdaemonrc:
 +@HAVE_BASE_TRUE@	rm -f $(DESTDIR)@authdaemonrc@.dist
- 
--uninstall-authdaemonrc:
--	rm -f $(DESTDIR)@authdaemonrc@.dist
++
 +@HAVE_BASE_FALSE@uninstall-authdaemonrc:
 +@HAVE_BASE_FALSE@	@:
  
@@ -316,7 +333,7 @@
  		$(INSTALL_SCRIPT) userdb/pw2userdb \
  				$(DESTDIR)$(sbindir)/pw2userdb ; \
  		$(INSTALL_SCRIPT) userdb/makeuserdb \
-@@ -2033,9 +2095,10 @@
+@@ -2033,9 +2099,10 @@
  				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc
@@ -328,7 +345,7 @@
  				$(DESTDIR)$(sbindir)/pw2userdb \
  				$(DESTDIR)$(sbindir)/makeuserdb \
  				$(DESTDIR)$(sbindir)/userdb \
-@@ -2046,7 +2109,7 @@
+@@ -2046,7 +2113,7 @@
  	$(SHELL) ./config.status --file=authlib.html
  
  authlib.3: authlib.3.in
@@ -336,21 +353,4 @@
 +@HAVE_BASE_TRUE@	$(SHELL) ./config.status --file=authlib.3
  
  @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html
- @HAVE_SGML_TRUE@	libs/docbook/sgml2html authpasswd.sgml authpasswd.html
-@@ -2131,11 +2194,11 @@
- 	@SHELL@ authmigrate
- 
- install-configure:
--	test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
--	test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
--	test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
--	test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
--	test -f $(DESTDIR)@authsqliterc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authsqliterc@.dist || true
-+@HAVE_BASE_TRUE@	test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
-+@HAVE_AUTHMYSQL_TRUE@	test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
-+@HAVE_AUTHPGSQL_TRUE@	test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
-+@HAVE_LDAP_TRUE@	test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
-+@HAVE_AUTHSQLITE_TRUE@	test -f $(DESTDIR)@authsqliterc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authsqliterc@.dist || true
- 
- # For maintainer's use only
- 
+ @HAVE_SGML_TRUE@	libs/docbook/sgml2html authpasswd.sgml authpasswd.html 
diff --git a/security/courier-authlib/files/pkg-deinstall.in b/security/courier-authlib/files/pkg-deinstall.in
deleted file mode 100644
index 6dd8602ee207..000000000000
--- a/security/courier-authlib/files/pkg-deinstall.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-LOCALSTATEDIR=${LOCALSTATEDIR:=/var/spool/courier}
-
-USER=%%MAILOWN%%
-GROUP=%%MAILGRP%%
-
-if [ ":$2" = ":POST-DEINSTALL" ]; then
-    if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-        echo ""
-        echo "Warning: Removing user courier will also delete any"
-        echo "	 undelivered mail in the mail queue directories!!!"
-        echo "	 Do *not* do it if you're upgrading and would like"
-        echo "	 courier to continue trying to deliver this mail."
-        echo ""
-    else
-        AFFIRM='-y'
-    fi
-    [ -d "$LOCALSTATEDIR" ] && /usr/sbin/chown -Rh ${USER}:${GROUP} "$LOCALSTATEDIR"
-    /usr/sbin/rmuser ${AFFIRM} ${USER} 2> /dev/null
-    [ -d "$LOCALSTATEDIR" ] && /usr/sbin/chown root:wheel "$LOCALSTATEDIR"
-fi
-
-exit 0
diff --git a/security/courier-authlib/files/pkg-install.in b/security/courier-authlib/files/pkg-install.in
deleted file mode 100644
index 9e7061d55316..000000000000
--- a/security/courier-authlib/files/pkg-install.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-USER=%%MAILOWN%%;	UID=%%MAILUID%%
-GROUP=%%MAILGRP%%;	GID=%%MAILGID%%
-
-if [ ":$2" = ":PRE-INSTALL" ]; then
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -g ${GID} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-           -d /var/spool/courier \
-           -s /sbin/nologin \
-           -c "Courier Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-fi
diff --git a/security/courier-authlib/pkg-plist-base b/security/courier-authlib/pkg-plist-base
index d9fd73154fd2..526b822e14ca 100644
--- a/security/courier-authlib/pkg-plist-base
+++ b/security/courier-authlib/pkg-plist-base
@@ -1,37 +1,30 @@
-@unexec [ -x %D/sbin/authdaemond ] && %D/sbin/authdaemond stop || true
-@exec pw groupshow %%MAILGRP%% 2>/dev/null || pw groupadd %%MAILGRP%% -g %%MAILUID%% -h -
-@exec pw user show %%MAILOWN%% 2>/dev/null || pw useradd %%MAILOWN%% -u %%MAILUID%% -g %%MAILGID%% -h - -d /var/spool/courier -s /sbin/nologin -c "Courier Mail System"
 bin/courierauthconfig
-@unexec cmp -s %D/etc/authlib/authdaemonrc.dist %D/etc/authlib/authdaemonrc && rm -f %D/etc/authlib/authdaemonrc 2>/dev/null || true
-etc/authlib/authdaemonrc.dist
-@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authdaemonrc.dist && chmod 0600 %D/etc/authlib/authdaemonrc
-@exec chown -Rh %%MAILOWN%%:%%MAILGRP%% %D/etc/authlib && chmod 0750 %D/etc/authlib
+@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authdaemonrc.sample
 include/courier_auth_config.h
 include/courierauth.h
 include/courierauthdebug.h
 include/courierauthsasl.h
 include/courierauthsaslclient.h
 include/courierauthstaticlist.h
-lib/courier-authlib/libcourierauth.a
-lib/courier-authlib/libcourierauth.la
 lib/courier-authlib/libcourierauth.so
-lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libcourierauthcommon.la
 lib/courier-authlib/libcourierauthcommon.so
-lib/courier-authlib/libcourierauthsasl.a
-lib/courier-authlib/libcourierauthsasl.la
 lib/courier-authlib/libcourierauthsasl.so
-lib/courier-authlib/libcourierauthsaslclient.a
-lib/courier-authlib/libcourierauthsaslclient.la
 lib/courier-authlib/libcourierauthsaslclient.so
-lib/courier-authlib/libauthpam.a
-lib/courier-authlib/libauthpam.la
 lib/courier-authlib/libauthpam.so
-lib/courier-authlib/libauthpipe.a
-lib/courier-authlib/libauthpipe.la
 lib/courier-authlib/libauthpipe.so
 libexec/courier-authlib/authdaemond
 libexec/courier-authlib/authsystem.passwd
+man/man1/authtest.1.gz
+man/man1/%%MAILOWN%%logger.1.gz
+man/man3/auth_enumerate.3.gz
+man/man3/auth_generic.3.gz
+man/man3/auth_getoption.3.gz
+man/man3/auth_getuserinfo.3.gz
+man/man3/auth_login.3.gz
+man/man3/auth_passwd.3.gz
+man/man3/auth_sasl.3.gz
+man/man3/auth_sasl_ex.3.gz
+man/man3/authlib.3.gz
 sbin/authdaemond
 sbin/authenumerate
 sbin/authtest
@@ -45,7 +38,7 @@ sbin/courierlogger
 %%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html
 %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rm -rf %%AUTHDAEMONVAR%% 2>/dev/null || true
+@dirrmtry(%%MAILOWN%%,%%MAILGRP%%,750) %%AUTHDAEMONVAR%%
 @dirrmtry etc/authlib
-@dirrm libexec/courier-authlib
+@dirrm(%%MAILOWN%%,%%MAILGRP%%,755) libexec/courier-authlib
 @dirrm lib/courier-authlib
diff --git a/security/courier-authlib/pkg-plist-ldap b/security/courier-authlib/pkg-plist-ldap
index c07db4b60aed..3e8b1a83ec42 100644
--- a/security/courier-authlib/pkg-plist-ldap
+++ b/security/courier-authlib/pkg-plist-ldap
@@ -1,11 +1,5 @@
-@unexec cmp -s %D/etc/authlib/authldaprc.dist %D/etc/authlib/authldaprc && rm -f %D/etc/authlib/authldaprc 2>/dev/null || true
-etc/authlib/authldaprc.dist
-@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authldaprc.dist && chmod 0600 %D/etc/authlib/authldaprc
-@unexec cmp -s %D/etc/openldap/schema/authldap.schema.default %D/etc/openldap/schema/authldap.schema && rm -f %D/etc/openldap/schema/authldap.schema 2>/dev/null || true
-etc/openldap/schema/authldap.schema.default
-@exec [ -f %D/etc/openldap/schema/authldap.schema ] || cp -p %D/etc/openldap/schema/authldap.schema.default %D/etc/openldap/schema/authldap.schema
-lib/courier-authlib/libauthldap.a
-lib/courier-authlib/libauthldap.la
+@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authldaprc.sample
+@sample etc/openldap/schema/authldap.schema.sample
 lib/courier-authlib/libauthldap.so
 %%PORTDOCS%%%%DOCSDIR%%/README.ldap
 @dirrmtry etc/openldap/schema
diff --git a/security/courier-authlib/pkg-plist-mysql b/security/courier-authlib/pkg-plist-mysql
index ae044fee0815..7ac47333aec5 100644
--- a/security/courier-authlib/pkg-plist-mysql
+++ b/security/courier-authlib/pkg-plist-mysql
@@ -1,9 +1,4 @@
-@unexec cmp -s %D/etc/authlib/authmysqlrc.dist %D/etc/authlib/authmysqlrc && rm -f %D/etc/authlib/authmysqlrc 2>/dev/null || true
-etc/authlib/authmysqlrc.dist
-@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authmysqlrc.dist && chmod 0600 %D/etc/authlib/authmysqlrc
-lib/courier-authlib/libauthmysql.a
-lib/courier-authlib/libauthmysql.la
+@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authmysqlrc.sample
 lib/courier-authlib/libauthmysql.so
 %%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
 %%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery
-
diff --git a/security/courier-authlib/pkg-plist-pgsql b/security/courier-authlib/pkg-plist-pgsql
index b1c7b805b94b..c7eb4c5b178d 100644
--- a/security/courier-authlib/pkg-plist-pgsql
+++ b/security/courier-authlib/pkg-plist-pgsql
@@ -1,8 +1,3 @@
-@unexec cmp -s %D/etc/authlib/authpgsqlrc.dist %D/etc/authlib/authpgsqlrc && rm -f %D/etc/authlib/authpgsqlrc 2>/dev/null || true
-etc/authlib/authpgsqlrc.dist
-@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authpgsqlrc.dist && chmod 0600 %D/etc/authlib/authpgsqlrc
-lib/courier-authlib/libauthpgsql.a
-lib/courier-authlib/libauthpgsql.la
+@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authpgsqlrc.sample
 lib/courier-authlib/libauthpgsql.so
 %%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
-
diff --git a/security/courier-authlib/pkg-plist-userdb b/security/courier-authlib/pkg-plist-userdb
index ca281459f9b8..ad5e900cacbd 100644
--- a/security/courier-authlib/pkg-plist-userdb
+++ b/security/courier-authlib/pkg-plist-userdb
@@ -1,11 +1,12 @@
+lib/courier-authlib/libauthuserdb.so
 libexec/courier-authlib/makedatprog
+man/man8/makeuserdb.8.gz
+man/man8/pw2userdb.8.gz
+man/man8/userdb.8.gz
+man/man8/userdbpw.8.gz
 sbin/makeuserdb
 sbin/pw2userdb
 sbin/userdb
 sbin/userdb-test-cram-md5
 sbin/userdbpw
 sbin/vchkpw2userdb
-lib/courier-authlib/libauthuserdb.a
-lib/courier-authlib/libauthuserdb.la
-lib/courier-authlib/libauthuserdb.so
-
diff --git a/security/courier-authlib/pkg-plist-vchkpw b/security/courier-authlib/pkg-plist-vchkpw
index 1aeb23a7a45e..bcc99acae9b1 100644
--- a/security/courier-authlib/pkg-plist-vchkpw
+++ b/security/courier-authlib/pkg-plist-vchkpw
@@ -1,3 +1 @@
-lib/courier-authlib/libauthvchkpw.a
-lib/courier-authlib/libauthvchkpw.la
 lib/courier-authlib/libauthvchkpw.so