pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/courier-authlib Install some documentation fi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b59d2610fac2
branches:  trunk
changeset: 489820:b59d2610fac2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Feb 26 22:14:01 2005 +0000

description:
Install some documentation files for courier-authlib, but only install the
relevant ones depending on the options chosen.  This fixes PR pkg/29465.
Bump the PKGREVISION to 2.

diffstat:

 security/courier-authlib/Makefile   |  20 +++++++++++++++++---
 security/courier-authlib/PLIST      |   6 +++++-
 security/courier-authlib/options.mk |  17 ++++++++++++++++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diffs (132 lines):

diff -r 4aae6cd9017a -r b59d2610fac2 security/courier-authlib/Makefile
--- a/security/courier-authlib/Makefile Sat Feb 26 21:54:13 2005 +0000
+++ b/security/courier-authlib/Makefile Sat Feb 26 22:14:01 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/02/21 17:08:39 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/02/26 22:14:01 jlam Exp $
 
 .include "Makefile.common"
 
 DISTNAME=      courier-authlib-0.54
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -42,12 +42,14 @@
 AUTHLIBDIR=            lib/courier-authlib
 AUTHLIBEXECDIR=                libexec/courier-authlib
 AUTHEXAMPLEDIR=                share/examples/courier-authlib
+AUTHDOCDIR=            share/doc/courier-authlib
 FILES_SUBST+=          AUTHLIBEXECDIR=${AUTHLIBEXECDIR}
 FILES_SUBST+=          AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR}
 
 PKG_SYSCONFSUBDIR?=    courier
 
 EGDIR=                 ${PREFIX}/${AUTHEXAMPLEDIR}
+DOCDIR=                        ${PREFIX}/${AUTHDOCDIR}
 RCD_SCRIPTS=           authdaemond
 GEN_FILES=             authdaemonrc
 FILES_SUBST+=          GEN_FILES=${GEN_FILES:Q}
@@ -62,6 +64,8 @@
                        authmysqlrc=${EGDIR}/authmysqlrc                \
                        authpgsqlrc=${EGDIR}/authpgsqlrc
 
+POST_INSTALL_TARGETS=  post-install-common
+
 .include "options.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 
@@ -73,16 +77,26 @@
 .for _file_ in ${AUTHLIB_PLIST}
 GENERATE_PLIST+=       ${TEST} -f ${PREFIX}/${_file_} && ${ECHO} "${_file_}";
 .endfor
+.if !empty(AUTHLIB_PLIST:M${AUTHEXAMPLEDIR}/*)
 GENERATE_PLIST+=       ${ECHO} "@dirrm ${AUTHEXAMPLEDIR}";
+.endif
+GENERATE_PLIST+=       ${ECHO} "@dirrm ${AUTHDOCDIR}";
 GENERATE_PLIST+=       ${ECHO} "@dirrm ${AUTHLIBEXECDIR}";
 GENERATE_PLIST+=       ${ECHO} "@dirrm ${AUTHLIBDIR}";
 
 INSTALLATION_DIRS=     bin sbin
 
-post-install:
+post-install: ${POST_INSTALL_TARGETS}
+
+post-install-common:
        ${INSTALL_SCRIPT} ${WRKSRC}/makedat/makedat ${PREFIX}/bin
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/authldap.schema ${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin
+       ${INSTALL_DATA_DIR} ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README.authdebug.html ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README.html ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README_authlib.html ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 4aae6cd9017a -r b59d2610fac2 security/courier-authlib/PLIST
--- a/security/courier-authlib/PLIST    Sat Feb 26 21:54:13 2005 +0000
+++ b/security/courier-authlib/PLIST    Sat Feb 26 22:14:01 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/18 22:12:43 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/02/26 22:14:01 jlam Exp $
 bin/courierauthconfig
 bin/makedat
 include/courier_auth_config.h
@@ -29,3 +29,7 @@
 sbin/authtest
 sbin/courierlogger
 sbin/sysconftool
+share/doc/courier-authlib/INSTALL.html
+share/doc/courier-authlib/README.authdebug.html
+share/doc/courier-authlib/README.html
+share/doc/courier-authlib/README_authlib.html
diff -r 4aae6cd9017a -r b59d2610fac2 security/courier-authlib/options.mk
--- a/security/courier-authlib/options.mk       Sat Feb 26 21:54:13 2005 +0000
+++ b/security/courier-authlib/options.mk       Sat Feb 26 22:14:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/02/10 03:21:31 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2005/02/26 22:14:01 jlam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.courier-authlib
 PKG_SUPPORTED_OPTIONS= PAM bdb ldap mysql pgsql
@@ -55,7 +55,12 @@
 AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthldap.la
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/authldaprc.dist
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/authldap.schema
+AUTHLIB_PLIST+=                ${AUTHDOCDIR}/README.ldap
 GEN_FILES+=            authldaprc
+POST_INSTALL_TARGETS+= post-install-ldap
+
+post-install-ldap:
+       ${INSTALL_DATA} ${WRKSRC}/README.ldap ${DOCDIR}
 .else
 CONFIGURE_ARGS+=       --without-authldap
 .endif
@@ -68,7 +73,12 @@
 CONFIGURE_ARGS+=       --with-authmysql
 AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthmysql.la
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/authmysqlrc.dist
+AUTHLIB_PLIST+=                ${AUTHDOCDIR}/README.authmysql.html
 GEN_FILES+=            authmysqlrc
+POST_INSTALL_TARGETS+= post-install-mysql
+
+post-install-mysql:
+       ${INSTALL_DATA} ${WRKSRC}/README.authmysql.html ${DOCDIR}
 .else
 CONFIGURE_ARGS+=       --without-authmysql
 .endif
@@ -81,7 +91,12 @@
 CONFIGURE_ARGS+=       --with-authpgsql
 AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthpgsql.la
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/authpgsqlrc.dist
+AUTHLIB_PLIST+=                ${AUTHDOCDIR}/authpostgres.html
 GEN_FILES+=            authpgsqlrc
+POST_INSTALL_TARGETS+= post-install-pgsql
+
+post-install-pgsql:
+       ${INSTALL_DATA} ${WRKSRC}/README.authpostgres.html ${DOCDIR}
 .else
 CONFIGURE_ARGS+=       --without-authpgsql
 .endif



Home | Main Index | Thread Index | Old Index