Thu May 11 09:22:36 2017 UTC ()
Requires iconv.  Try to reduce the include craziness a little bit.


(jperkin)
diff -r1.51 -r1.52 pkgsrc/security/courier-authlib/Makefile
diff -r1.15 -r1.16 pkgsrc/security/courier-authlib/Makefile.common
cvs diff -r1.51 -r1.52 pkgsrc/security/courier-authlib/Makefile (switch to unified diff)

--- pkgsrc/security/courier-authlib/Makefile 2016/10/09 21:42:02 1.51
+++ pkgsrc/security/courier-authlib/Makefile 2017/05/11 09:22:36 1.52
@@ -1,107 +1,108 @@ @@ -1,107 +1,108 @@
1# $NetBSD: Makefile,v 1.51 2016/10/09 21:42:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2017/05/11 09:22:36 jperkin Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5DISTNAME= courier-authlib-0.64.0 5DISTNAME= courier-authlib-0.64.0
6PKGREVISION= 11 6PKGREVISION= 11
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12COMMENT= Courier Authentication Library 12COMMENT= Courier Authentication Library
13HOMEPAGE= http://www.courier-mta.org/authlib/ 13HOMEPAGE= http://www.courier-mta.org/authlib/
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
15 15
16CONFLICTS+= courier-auth-[0-9]* 16CONFLICTS+= courier-auth-[0-9]*
17CONFLICTS+= courier-authldap-[0-9]* 17CONFLICTS+= courier-authldap-[0-9]*
18CONFLICTS+= courier-authmysql-[0-9]* 18CONFLICTS+= courier-authmysql-[0-9]*
19CONFLICTS+= courier-authpgsql-[0-9]* 19CONFLICTS+= courier-authpgsql-[0-9]*
20 20
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22LIBTOOLIZE_PLIST= yes 22LIBTOOLIZE_PLIST= yes
23PKG_SYSCONFSUBDIR= authlib 23PKG_SYSCONFSUBDIR= authlib
24 24
25REPLACE_PERL= samplepipe.pl sysconftool 25REPLACE_PERL= samplepipe.pl sysconftool
26 26
27USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
28USE_TOOLS+= cat:run gmake perl:run 28USE_TOOLS+= cat:run gmake perl:run
29CONFIGURE_ENV+= CAT=${TOOLS_CAT} # makedat 29CONFIGURE_ENV+= CAT=${TOOLS_CAT} # makedat
30 30
31BUILD_DEFS+= VARBASE 31BUILD_DEFS+= VARBASE
32CONFIGURE_ARGS+= --localstatedir=${VARBASE} 32CONFIGURE_ARGS+= --localstatedir=${VARBASE}
33CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR} 33CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR}
34CONFIGURE_ARGS+= --without-stdheaderdir 34CONFIGURE_ARGS+= --without-stdheaderdir
35 35
36.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
37 37
38AUTHDAEMONVAR?= ${VARBASE}/authdaemon 38AUTHDAEMONVAR?= ${VARBASE}/authdaemon
39CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR:Q} 39CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR:Q}
40OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750 40OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750
41FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q} 41FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q}
42 42
43# Expect is used to change the password from within the courier webmail 43# Expect is used to change the password from within the courier webmail
44# application (sqwebmail). Assume that it's installed in the same prefix 44# application (sqwebmail). Assume that it's installed in the same prefix
45# as courier-authlib. 45# as courier-authlib.
46# 46#
47CONFIGURE_ENV+= EXPECT=${PREFIX}/bin/expect 47CONFIGURE_ENV+= EXPECT=${PREFIX}/bin/expect
48CHECK_INTERPRETER_SKIP= libexec/courier-authlib/authsystem.passwd 48CHECK_INTERPRETER_SKIP= libexec/courier-authlib/authsystem.passwd
49 49
50AUTHLIBDIR= lib/courier-authlib 50AUTHLIBDIR= lib/courier-authlib
51AUTHLIBEXECDIR= libexec/courier-authlib 51AUTHLIBEXECDIR= libexec/courier-authlib
52AUTHEXAMPLEDIR= share/examples/courier-authlib 52AUTHEXAMPLEDIR= share/examples/courier-authlib
53AUTHDOCDIR= share/doc/courier-authlib 53AUTHDOCDIR= share/doc/courier-authlib
54FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR} 54FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR}
55FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR} 55FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR}
56 56
57PKG_SYSCONFSUBDIR?= courier 57PKG_SYSCONFSUBDIR?= courier
58 58
59EGDIR= ${PREFIX}/${AUTHEXAMPLEDIR} 59EGDIR= ${PREFIX}/${AUTHEXAMPLEDIR}
60DOCDIR= ${PREFIX}/${AUTHDOCDIR} 60DOCDIR= ${PREFIX}/${AUTHDOCDIR}
61RCD_SCRIPTS= authdaemond 61RCD_SCRIPTS= authdaemond
62GEN_FILES= authdaemonrc 62GEN_FILES= authdaemonrc
63FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} 63FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
64AUTHLIB_PLIST= ${AUTHEXAMPLEDIR}/authdaemonrc.dist 64AUTHLIB_PLIST= ${AUTHEXAMPLEDIR}/authdaemonrc.dist
65 65
66# Install the example config files into ${EGDIR}. 66# Install the example config files into ${EGDIR}.
67INSTALL_AM_MAKEFLAGS= authdaemonrc=${EGDIR}/authdaemonrc \ 67INSTALL_AM_MAKEFLAGS= authdaemonrc=${EGDIR}/authdaemonrc \
68 authldaprc=${EGDIR}/authldaprc \ 68 authldaprc=${EGDIR}/authldaprc \
69 authmysqlrc=${EGDIR}/authmysqlrc \ 69 authmysqlrc=${EGDIR}/authmysqlrc \
70 authpgsqlrc=${EGDIR}/authpgsqlrc 70 authpgsqlrc=${EGDIR}/authpgsqlrc
71INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \ 71INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \
72 AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q} 72 AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
73 73
74POST_INSTALL_TARGETS= post-install-common post-install-authdaemon 74POST_INSTALL_TARGETS= post-install-common post-install-authdaemon
75 75
76.include "options.mk" 76.include "options.mk"
77.include "../../devel/libltdl/buildlink3.mk" 
78 77
79.for file in ${GEN_FILES} 78.for file in ${GEN_FILES}
80CONF_FILES_PERMS+= ${EGDIR}/${file}.dist ${PKG_SYSCONFDIR}/${file} \ 79CONF_FILES_PERMS+= ${EGDIR}/${file}.dist ${PKG_SYSCONFDIR}/${file} \
81 ${COURIER_USER} ${COURIER_GROUP} 0660 80 ${COURIER_USER} ${COURIER_GROUP} 0660
82.endfor 81.endfor
83 82
84.for file in ${AUTHLIB_PLIST} 83.for file in ${AUTHLIB_PLIST}
85GENERATE_PLIST+= ${TEST} -f ${DESTDIR}${PREFIX}/${file} && \ 84GENERATE_PLIST+= ${TEST} -f ${DESTDIR}${PREFIX}/${file} && \
86 ${ECHO} "${file}"; 85 ${ECHO} "${file}";
87.endfor 86.endfor
88GENERATE_PLIST+= ${TRUE}; 87GENERATE_PLIST+= ${TRUE};
89 88
90INSTALLATION_DIRS+= bin sbin 89INSTALLATION_DIRS+= bin sbin
91 90
92post-install: ${POST_INSTALL_TARGETS} 91post-install: ${POST_INSTALL_TARGETS}
93 92
94post-install-common: 93post-install-common:
95 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 94 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
96 ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${DESTDIR}${PREFIX}/sbin 95 ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${DESTDIR}${PREFIX}/sbin
97 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 96 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
98 ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DESTDIR}${DOCDIR} 97 ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DESTDIR}${DOCDIR}
99 ${INSTALL_DATA} ${WRKSRC}/README.authdebug.html ${DESTDIR}${DOCDIR} 98 ${INSTALL_DATA} ${WRKSRC}/README.authdebug.html ${DESTDIR}${DOCDIR}
100 ${INSTALL_DATA} ${WRKSRC}/README.html ${DESTDIR}${DOCDIR} 99 ${INSTALL_DATA} ${WRKSRC}/README.html ${DESTDIR}${DOCDIR}
101 ${INSTALL_DATA} ${WRKSRC}/README_authlib.html ${DESTDIR}${DOCDIR} 100 ${INSTALL_DATA} ${WRKSRC}/README_authlib.html ${DESTDIR}${DOCDIR}
102 101
103post-install-authdaemon: 102post-install-authdaemon:
104 ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${EGDIR}/authdaemonrc.dist 103 ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${EGDIR}/authdaemonrc.dist
105 ${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/authdaemonrc.dist 104 ${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/authdaemonrc.dist
106 105
 106.include "../../converters/libiconv/buildlink3.mk"
 107.include "../../devel/libltdl/buildlink3.mk"
107.include "../../mk/bsd.pkg.mk" 108.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/security/courier-authlib/Makefile.common (switch to unified diff)

--- pkgsrc/security/courier-authlib/Makefile.common 2016/02/26 09:41:05 1.15
+++ pkgsrc/security/courier-authlib/Makefile.common 2017/05/11 09:22:36 1.16
@@ -1,29 +1,22 @@ @@ -1,29 +1,22 @@
1# $NetBSD: Makefile.common,v 1.15 2016/02/26 09:41:05 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.16 2017/05/11 09:22:36 jperkin Exp $
2# 2#
3# used by mail/courier-mta/Makefile.common 3# used by mail/courier-mta/Makefile.common
4 4
5COURIER_USER?= courier 5COURIER_USER?= courier
6COURIER_GROUP?= mail 6COURIER_GROUP?= mail
7FILES_SUBST+= COURIER_USER=${COURIER_USER} 7FILES_SUBST+= COURIER_USER=${COURIER_USER}
8FILES_SUBST+= COURIER_GROUP=${COURIER_GROUP} 8FILES_SUBST+= COURIER_GROUP=${COURIER_GROUP}
9MESSAGE_SUBST+= COURIER_USER=${COURIER_USER} 9MESSAGE_SUBST+= COURIER_USER=${COURIER_USER}
10MESSAGE_SUBST+= COURIER_GROUP=${COURIER_GROUP} 10MESSAGE_SUBST+= COURIER_GROUP=${COURIER_GROUP}
11 11
12PKG_GROUPS= ${COURIER_GROUP} 12PKG_GROUPS= ${COURIER_GROUP}
13PKG_USERS= ${COURIER_USER}:${COURIER_GROUP} 13PKG_USERS= ${COURIER_USER}:${COURIER_GROUP}
14 14
15PKG_GROUPS_VARS+= COURIER_GROUP 15PKG_GROUPS_VARS+= COURIER_GROUP
16PKG_USERS_VARS+= COURIER_USER 16PKG_USERS_VARS+= COURIER_USER
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER} 19CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER}
20CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP} 20CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP}
21 21
22CONFIGURE_ARGS.SunOS+= --with-waitfunc=wait3 22CONFIGURE_ARGS.SunOS+= --with-waitfunc=wait3
23 
24.include "../../mk/bsd.prefs.mk" 
25 
26.if ${OPSYS} == "OpenBSD" 
27BUILDLINK_DEPMETHOD.libiconv?= build 
28.include "../../converters/libiconv/buildlink3.mk" 
29.endif