CVS commit: pkgsrc/security/courier-authlib

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 11 09:22:36 UTC 2017

Modified Files:
        pkgsrc/security/courier-authlib: Makefile Makefile.common

Log Message:
Requires iconv.  Try to reduce the include craziness a little bit.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/courier-authlib/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/courier-authlib/Makefile.common

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.51 pkgsrc/security/courier-authlib/Makefile:1.52
--- pkgsrc/security/courier-authlib/Makefile:1.51       Sun Oct  9 21:42:02 2016
+++ pkgsrc/security/courier-authlib/Makefile    Thu May 11 09:22:36 2017
@@ -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"

Index: pkgsrc/security/courier-authlib/Makefile.common
diff -u pkgsrc/security/courier-authlib/Makefile.common:1.15 pkgsrc/security/courier-authlib/Makefile.common:1.16
--- pkgsrc/security/courier-authlib/Makefile.common:1.15        Fri Feb 26 09:41:05 2016
+++ pkgsrc/security/courier-authlib/Makefile.common     Thu May 11 09:22:36 2017
@@ -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=${COURI
 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