[pkgsrc/trunk]: pkgsrc/mail Force the creation of directories before installi...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6aab89b56af5
branches:  trunk
changeset: 470723:6aab89b56af5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Mar 11 16:45:26 2004 +0000

description:
Force the creation of directories before installing files in them, and
update the PLISTs to try removing these directories on deinstallation.
Also use ${HTMLDIR} to refer to the common location for courier HTML
documentation.

diffstat:

 mail/courier-authldap/Makefile  |  5 ++++-
 mail/courier-authldap/PLIST     |  3 ++-
 mail/courier-authmysql/Makefile |  9 +++++----
 mail/courier-authpgsql/Makefile |  9 +++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diffs (80 lines):

diff -r 03a6c24cd286 -r 6aab89b56af5 mail/courier-authldap/Makefile
--- a/mail/courier-authldap/Makefile    Thu Mar 11 16:42:19 2004 +0000
+++ b/mail/courier-authldap/Makefile    Thu Mar 11 16:45:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/02/21 14:43:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/11 16:45:26 jlam Exp $
 
 PKGNAME=       courier-authldap-${BASE_VERS}
 COMMENT=       Courier LDAP authentication module
@@ -26,8 +26,11 @@
 .include "../../databases/openldap/buildlink3.mk"
 
 do-install:
+       ${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
        ${INSTALL_PROGRAM} ${WRKSRC}/authlib/authdaemond.ldap ${AUTHLIBDIR}
+       ${INSTALL_MAN_DIR} ${DOCDIR}
        ${INSTALL_MAN} ${WRKSRC}/authlib/README.ldap ${DOCDIR}
+       ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/authlib/authldap.schema ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/authlib/authldaprc ${EGDIR}/authldaprc.dist
 
diff -r 03a6c24cd286 -r 6aab89b56af5 mail/courier-authldap/PLIST
--- a/mail/courier-authldap/PLIST       Thu Mar 11 16:42:19 2004 +0000
+++ b/mail/courier-authldap/PLIST       Thu Mar 11 16:45:26 2004 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/21 14:43:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/11 16:45:26 jlam Exp $
 libexec/courier/authlib/authdaemond.ldap
 share/doc/courier/README.ldap
 share/examples/courier/authldap.schema
 share/examples/courier/authldaprc.dist
+@unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
diff -r 03a6c24cd286 -r 6aab89b56af5 mail/courier-authmysql/Makefile
--- a/mail/courier-authmysql/Makefile   Thu Mar 11 16:42:19 2004 +0000
+++ b/mail/courier-authmysql/Makefile   Thu Mar 11 16:45:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/21 14:43:16 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/11 16:45:26 jlam Exp $
 
 PKGNAME=       courier-authmysql-${BASE_VERS}
 COMMENT=       Courier MySQL authentication module
@@ -24,10 +24,11 @@
 .include "../../databases/mysql-client/buildlink3.mk"
 
 do-install:
+       ${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
        ${INSTALL_PROGRAM} ${WRKSRC}/authlib/authdaemond.mysql ${AUTHLIBDIR}
+       ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/authlib/authmysqlrc ${EGDIR}/authmysqlrc.dist
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/courier
-       ${INSTALL_DATA} ${WRKSRC}/authlib/README.authmysql.html         \
-               ${PREFIX}/share/doc/html/courier
+       ${INSTALL_DATA_DIR} ${HTMLDIR}
+       ${INSTALL_DATA} ${WRKSRC}/authlib/README.authmysql.html ${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 03a6c24cd286 -r 6aab89b56af5 mail/courier-authpgsql/Makefile
--- a/mail/courier-authpgsql/Makefile   Thu Mar 11 16:42:19 2004 +0000
+++ b/mail/courier-authpgsql/Makefile   Thu Mar 11 16:45:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/21 14:43:16 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/11 16:45:26 jlam Exp $
 
 PKGNAME=       courier-authpgsql-${BASE_VERS}
 COMMENT=       Courier PostgreSQL authentication module
@@ -33,10 +33,11 @@
                README.authmysql.html > README.authpgsql.html
 
 do-install:
+       ${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
        ${INSTALL_PROGRAM} ${WRKSRC}/authlib/authdaemond.pgsql ${AUTHLIBDIR}
+       ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/authlib/authpgsqlrc ${EGDIR}/authpgsqlrc.dist
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/courier
-       ${INSTALL_DATA} ${WRKSRC}/authlib/README.authpgsql.html         \
-               ${PREFIX}/share/doc/html/courier
+       ${INSTALL_DATA_DIR} ${HTMLDIR}
+       ${INSTALL_DATA} ${WRKSRC}/authlib/README.authpgsql.html ${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"