[pkgsrc/trunk]: pkgsrc/mail/dovecot2 Move including options.mk to Makefile.co...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41636eb4e8e5
branches:  trunk
changeset: 362442:41636eb4e8e5
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon May 15 12:31:10 2017 +0000

description:
Move including options.mk to Makefile.common, the plugins do a full build
so need to build it the same way as the main package.  Fixes SSL build.

diffstat:

 mail/dovecot2/Makefile        |  4 +---
 mail/dovecot2/Makefile.common |  4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r c6b65169bbe0 -r 41636eb4e8e5 mail/dovecot2/Makefile
--- a/mail/dovecot2/Makefile    Mon May 15 11:31:16 2017 +0000
+++ b/mail/dovecot2/Makefile    Mon May 15 12:31:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2016/11/12 11:21:45 adam Exp $
+# $NetBSD: Makefile,v 1.94 2017/05/15 12:31:10 jperkin Exp $
 
 .include "../../mail/dovecot2/Makefile.common"
 
@@ -38,8 +38,6 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
 
-.include "options.mk"
-
 # Don't compress manual pages as they include each other.
 .undef MANZ
 
diff -r c6b65169bbe0 -r 41636eb4e8e5 mail/dovecot2/Makefile.common
--- a/mail/dovecot2/Makefile.common     Mon May 15 11:31:16 2017 +0000
+++ b/mail/dovecot2/Makefile.common     Mon May 15 12:31:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2017/04/19 09:05:16 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/05/15 12:31:10 jperkin Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
@@ -47,6 +47,8 @@
 # mv: rename .deps/auth-stats.Tpo to .deps/auth-stats.Po: No such file or directory
 MAKE_JOBS_SAFE=        no
 
+.include "options.mk"
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"