Make courier-autlib ports run the sysconftool on installation, as

suggested by upstream, like courier-imap port does.

The sample files are renamed to ".dist" because that is the name
the tool expects.

Also added a note to UPDATING to warn users about the sysconftool
expecting the comments not to be removed.

While here convert to localbase.

Suggested by:	Doug McIntyre <merlyn at iphouse.net>

6 files changed, 30 insertions, 26 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index d5f67261ab73..e897b2fd76d3 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	courier-authlib
 PORTVERSION=	0.68.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	SF/courier/authlib/${PORTVERSION}
@@ -34,7 +34,7 @@ OPTIONS_DEFINE+=	GDBM
 LIB_DEPENDS+=	libltdl.so:devel/libltdl \
 		libcourier-unicode.so:devel/courier-unicode
 
-USES=		iconv gmake libtool perl5 tar:bzip2
+USES=		iconv gmake libtool localbase perl5 tar:bzip2
 GNU_CONFIGURE=	yes
 USE_SUBMAKE=	yes
 
@@ -46,9 +46,6 @@ AUTHDAEMONVAR=	${LOCALSTATEDIR}/run/authdaemond
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 USERDB?=	${PREFIX}/etc/userdb
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
 CONFIGURE_ARGS=	--enable-unicode \
 		--disable-static \
 		--without-authcustom \
@@ -71,6 +68,8 @@ PLIST_SUB+=	MAILOWN=${MAILOWN} MAILGRP=${MAILGRP}
 AUTHMOD=	auth${PKGNAMESUFFIX:S/-//:S/gdbm/db/}
 
 .if ${AUTHMOD} == authbase
+RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
+
 CONFIGURE_ARGS+=--with-base --with-authpam --with-authpipe
 
 USERS=		${MAILOWN}
@@ -108,6 +107,7 @@ REMOVE_SUBDIRS+=makedat userdb
 .endif
 
 .if ${AUTHMOD} == authldap
+RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 DOCS=		README.ldap
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-authldap
@@ -116,6 +116,7 @@ CONFIGURE_ARGS+=--without-authldap
 .endif
 
 .if ${AUTHMOD} == authmysql
+RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 DOCS=		README.authmysql.html README.authmysql.myownquery
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-authmysql \
@@ -126,6 +127,7 @@ CONFIGURE_ARGS+=--without-authmysql
 .endif
 
 .if ${AUTHMOD} == authpgsql
+RUN_DEPENDS+=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 DOCS=		README.authpostgres.html
 USES+=		pgsql
 CONFIGURE_ARGS+=--with-authpgsql
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in
index 04f69a416a78..137cc6ed3a35 100644
--- a/security/courier-authlib/files/patch-Makefile.in
+++ b/security/courier-authlib/files/patch-Makefile.in
@@ -188,32 +188,29 @@
  @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@		$(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@uninstall-authpgsqlrc:
  @HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist
-@@ -1951,9 +1990,7 @@ authpgsqlrc.h:
- @HAVE_LDAP_TRUE@install-authldaprc:
+@@ -1952,8 +1991,6 @@ authpgsqlrc.h:
  @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@		$(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@uninstall-authldaprc:
  @HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist
-@@ -1964,15 +2001,25 @@ authpgsqlrc.h:
+@@ -1964,6 +2001,18 @@ authpgsqlrc.h:
  @HAVE_LDAP_FALSE@uninstall-authldaprc:
  @HAVE_LDAP_FALSE@	@:
  
 +@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.sample
++@HAVE_LDAP_TRUE@		${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.dist
 +@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 ; \
@@ -225,24 +222,21 @@
  authldaprc.h:
  	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
  
- @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
+@@ -1971,8 +2020,6 @@ authldaprc.h:
  @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@		$(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@uninstall-authmysqlrc:
  @HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist
-@@ -1989,9 +2036,7 @@ authmysqlrc.h:
- @HAVE_AUTHSQLITE_TRUE@install-authsqliterc:
+@@ -1990,8 +2037,6 @@ authmysqlrc.h:
  @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@		$(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@uninstall-authsqliterc:
  @HAVE_AUTHSQLITE_TRUE@	rm -f $(DESTDIR)@authsqliterc@.dist
@@ -260,7 +254,7 @@
 +@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@.sample
++@HAVE_BASE_TRUE@	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
 +@HAVE_BASE_TRUE@	rm -f authdaemonrc.tmp
  
 -uninstall-authdaemonrc:
diff --git a/security/courier-authlib/pkg-plist-base b/security/courier-authlib/pkg-plist-base
index d43b29fa6cd2..90cdd6bb9615 100644
--- a/security/courier-authlib/pkg-plist-base
+++ b/security/courier-authlib/pkg-plist-base
@@ -1,5 +1,7 @@
 bin/courierauthconfig
-@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authdaemonrc.sample
+@postunexec if cmp -s %D/etc/authlib/authdaemonrc.dist %D/etc/authlib/authdaemonrc; then rm -f %D/etc/authlib/authdaemonrc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authdaemonrc.dist
+@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authdaemonrc
 include/courier_auth_config.h
 include/courierauth.h
 include/courierauthdebug.h
diff --git a/security/courier-authlib/pkg-plist-ldap b/security/courier-authlib/pkg-plist-ldap
index 4b101dfc49cf..9a0964c2c977 100644
--- a/security/courier-authlib/pkg-plist-ldap
+++ b/security/courier-authlib/pkg-plist-ldap
@@ -1,4 +1,6 @@
-@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authldaprc.sample
-@sample etc/openldap/schema/authldap.schema.sample
+@postunexec if cmp -s %D/etc/authlib/authldaprc.dist %D/etc/authlib/authldaprc; then rm -f %D/etc/authlib/authldaprc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authldaprc.dist
+@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authldaprc
+@sample etc/openldap/schema/authldap.schema.dist
 lib/courier-authlib/libauthldap.so
 %%PORTDOCS%%%%DOCSDIR%%/README.ldap
diff --git a/security/courier-authlib/pkg-plist-mysql b/security/courier-authlib/pkg-plist-mysql
index 7ac47333aec5..983e7e6b5c7b 100644
--- a/security/courier-authlib/pkg-plist-mysql
+++ b/security/courier-authlib/pkg-plist-mysql
@@ -1,4 +1,6 @@
-@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authmysqlrc.sample
+@postunexec if cmp -s %D/etc/authlib/authmysqlrc.dist %D/etc/authlib/authmysqlrc; then rm -f %D/etc/authlib/authmysqlrc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authmysqlrc.dist
+@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authmysqlrc
 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 c7eb4c5b178d..b5f4074c5853 100644
--- a/security/courier-authlib/pkg-plist-pgsql
+++ b/security/courier-authlib/pkg-plist-pgsql
@@ -1,3 +1,5 @@
-@sample(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authpgsqlrc.sample
+@postunexec if cmp -s %D/etc/authlib/authpgsqlrc.dist %D/etc/authlib/authpgsqlrc; then rm -f %D/etc/authlib/authpgsqlrc; fi
+@(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authpgsqlrc.dist
+@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authpgsqlrc
 lib/courier-authlib/libauthpgsql.so
 %%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html