CVS commit: pkgsrc/security/courier-authlib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu May  6 08:45:01 UTC 2021

Modified Files:
        pkgsrc/security/courier-authlib: Makefile options.mk

Log Message:
courier-authlib: fix options

Fix post-install target handling. Fix file name for ldap config.
Clean up pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/security/courier-authlib/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/courier-authlib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/courier-authlib/Makefile
diff -u pkgsrc/security/courier-authlib/Makefile:1.59 pkgsrc/security/courier-authlib/Makefile:1.60
--- pkgsrc/security/courier-authlib/Makefile:1.59       Fri Dec  4 04:56:11 2020
+++ pkgsrc/security/courier-authlib/Makefile    Thu May  6 08:45:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2020/12/04 04:56:11 riastradh Exp $
+# $NetBSD: Makefile,v 1.60 2021/05/06 08:45:00 wiz Exp $
 
 PKGREVISION= 2
 .include "Makefile.common"
@@ -19,7 +19,6 @@ CONFLICTS+=   courier-authmysql-[0-9]*
 CONFLICTS+=    courier-authpgsql-[0-9]*
 
 USE_LIBTOOL=           yes
-LIBTOOLIZE_PLIST=      yes
 PKG_SYSCONFSUBDIR=     authlib
 
 REPLACE_PERL=          samplepipe.pl sysconftool
@@ -54,8 +53,6 @@ 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
@@ -71,8 +68,6 @@ INSTALL_AM_MAKEFLAGS= authdaemonrc=${EGD
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS}                                   \
                        AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
-POST_INSTALL_TARGETS=  post-install-common
-
 .include "options.mk"
 
 .for file in ${GEN_FILES}

Index: pkgsrc/security/courier-authlib/options.mk
diff -u pkgsrc/security/courier-authlib/options.mk:1.14 pkgsrc/security/courier-authlib/options.mk:1.15
--- pkgsrc/security/courier-authlib/options.mk:1.14     Mon May 25 05:44:49 2020
+++ pkgsrc/security/courier-authlib/options.mk  Thu May  6 08:45:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2020/05/25 05:44:49 rillig Exp $
+# $NetBSD: options.mk,v 1.15 2021/05/06 08:45:00 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.courier-authlib
 PKG_SUPPORTED_OPTIONS= pam bdb ldap mysql pgsql
@@ -21,8 +21,9 @@ CONFIGURE_ARGS+=      --with-authpipe
 REPLACE_PERL+=         samplepipe.pl
 AUTHLIB_PLIST+=                ${AUTHLIBDIR}/libauthpipe.la
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/samplepipe.pl
-POST_INSTALL_TARGETS+= post-install-pipe
 
+.PHONY: post-install-pipe
+post-install: post-install-pipe
 post-install-pipe:
        ${INSTALL_SCRIPT} ${WRKSRC}/samplepipe.pl ${DESTDIR}${EGDIR}
 
@@ -68,9 +69,11 @@ AUTHLIB_PLIST+=              ${AUTHEXAMPLEDIR}/authl
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/authldap.schema
 AUTHLIB_PLIST+=                ${AUTHDOCDIR}/README.ldap
 GEN_FILES+=            authldaprc
-POST_INSTALL_TARGETS+= post-install-ldap
 
+.PHONY: post-install-ldap
+post-install: post-install-ldap
 post-install-ldap:
+       ${MV} ${DESTDIR}${PREFIX}/etc/authlib/authldaprc.dist ${DESTDIR}${EGDIR}/authldaprc.dist
        ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${EGDIR}/authldaprc.dist
        ${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/authldaprc.dist
        ${INSTALL_DATA} ${WRKSRC}/README.ldap ${DESTDIR}${DOCDIR}
@@ -89,8 +92,9 @@ AUTHLIB_PLIST+=               ${AUTHLIBDIR}/libauthmy
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/authmysqlrc.dist
 AUTHLIB_PLIST+=                ${AUTHDOCDIR}/README.authmysql.html
 GEN_FILES+=            authmysqlrc
-POST_INSTALL_TARGETS+= post-install-mysql
 
+.PHONY: post-install-mysql
+post-install: post-install-mysql
 post-install-mysql:
        ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${EGDIR}/authmysqlrc.dist
        ${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/authmysqlrc.dist
@@ -114,8 +118,9 @@ AUTHLIB_PLIST+=             ${AUTHLIBDIR}/libauthpg
 AUTHLIB_PLIST+=                ${AUTHEXAMPLEDIR}/authpgsqlrc.dist
 AUTHLIB_PLIST+=                ${AUTHDOCDIR}/README.authpostgres.html
 GEN_FILES+=            authpgsqlrc
-POST_INSTALL_TARGETS+= post-install-pgsql
 
+.PHONY: post-install-pgsql
+post-install: post-install-pgsql
 post-install-pgsql:
        ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${EGDIR}/authpgsqlrc.dist
        ${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/authpgsqlrc.dist