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.

4 files changed, 16 insertions, 10 deletions

diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
index b33c4147088..6bf5046df45 100644
--- a/mail/courier-authldap/Makefile
+++ b/mail/courier-authldap/Makefile
@@ -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 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
 .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 --git a/mail/courier-authldap/PLIST b/mail/courier-authldap/PLIST
index 4c17d18ad29..2533eccf7dd 100644
--- a/mail/courier-authldap/PLIST
+++ b/mail/courier-authldap/PLIST
@@ -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 --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
index ffefe89d067..b6e3fa34546 100644
--- a/mail/courier-authmysql/Makefile
+++ b/mail/courier-authmysql/Makefile
@@ -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 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
 .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 --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index b158b296f76..b7ac7beabcd 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -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 @@ post-build:
 		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"