summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-05-11 09:22:36 +0000
committerjperkin <jperkin@pkgsrc.org>2017-05-11 09:22:36 +0000
commit5343498a6314bf9a39661925198f32151324090f (patch)
treeefb6e42cfc113015ab5edd054811baeb159579f0 /security
parentfb836ea51ad50725a3fb456a90a692dbbcbbc57f (diff)
downloadpkgsrc-5343498a6314bf9a39661925198f32151324090f.tar.gz
Requires iconv. Try to reduce the include craziness a little bit.
Diffstat (limited to 'security')
-rw-r--r--security/courier-authlib/Makefile5
-rw-r--r--security/courier-authlib/Makefile.common9
2 files changed, 4 insertions, 10 deletions
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index aafb57992a4..1177b7d28d1 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2016/10/09 21:42:02 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2017/05/11 09:22:36 jperkin Exp $
.include "Makefile.common"
@@ -74,7 +74,6 @@ INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \
POST_INSTALL_TARGETS= post-install-common post-install-authdaemon
.include "options.mk"
-.include "../../devel/libltdl/buildlink3.mk"
.for file in ${GEN_FILES}
CONF_FILES_PERMS+= ${EGDIR}/${file}.dist ${PKG_SYSCONFDIR}/${file} \
@@ -104,4 +103,6 @@ post-install-authdaemon:
${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${EGDIR}/authdaemonrc.dist
${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/authdaemonrc.dist
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common
index 9afbab13f3e..9300439c482 100644
--- a/security/courier-authlib/Makefile.common
+++ b/security/courier-authlib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2016/02/26 09:41:05 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.16 2017/05/11 09:22:36 jperkin Exp $
#
# used by mail/courier-mta/Makefile.common
@@ -20,10 +20,3 @@ CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER}
CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP}
CONFIGURE_ARGS.SunOS+= --with-waitfunc=wait3
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "OpenBSD"
-BUILDLINK_DEPMETHOD.libiconv?= build
-.include "../../converters/libiconv/buildlink3.mk"
-.endif