CVS commit: pkgsrc/mail/dovecot2

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 15 12:31:10 UTC 2017

Modified Files:
        pkgsrc/mail/dovecot2: Makefile Makefile.common

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/mail/dovecot2/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/dovecot2/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/mail/dovecot2/Makefile
diff -u pkgsrc/mail/dovecot2/Makefile:1.93 pkgsrc/mail/dovecot2/Makefile:1.94
--- pkgsrc/mail/dovecot2/Makefile:1.93  Sat Nov 12 11:21:45 2016
+++ pkgsrc/mail/dovecot2/Makefile       Mon May 15 12:31:10 2017
@@ -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 @@ post-install:
        ${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
 

Index: pkgsrc/mail/dovecot2/Makefile.common
diff -u pkgsrc/mail/dovecot2/Makefile.common:1.7 pkgsrc/mail/dovecot2/Makefile.common:1.8
--- pkgsrc/mail/dovecot2/Makefile.common:1.7    Wed Apr 19 09:05:16 2017
+++ pkgsrc/mail/dovecot2/Makefile.common        Mon May 15 12:31:10 2017
@@ -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 @@ CONFIGURE_ARGS.SunOS+=        --with-notify=non
 # 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"