[pkgsrc/trunk]: pkgsrc/net/unison-snapshot net/unison-snapshot: Fix MKPIE logic

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/967ed4ae5490
branches:  trunk
changeset: 374451:967ed4ae5490
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Feb 23 01:20:02 2022 +0000

description:
net/unison-snapshot: Fix MKPIE logic

ocaml.mk defines MKPIE_SUPPORTED=no, but this was after bsd.prefs.mk
so _PKGSRC_MKPIE was already set to yes.  This was made harder to
debug by options.mk including bsd.prefs.mk.   Reorder to load ocaml.mk
earlier.

diffstat:

 net/unison-snapshot/Makefile |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 4ee0613c9a45 -r 967ed4ae5490 net/unison-snapshot/Makefile
--- a/net/unison-snapshot/Makefile      Tue Feb 22 23:15:35 2022 +0000
+++ b/net/unison-snapshot/Makefile      Wed Feb 23 01:20:02 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/02/19 16:27:03 gdt Exp $
+# $NetBSD: Makefile,v 1.29 2022/02/23 01:20:02 gdt Exp $
 
 # faux version to let me increment the last digit along the branch
 DISTNAME=      unison-2.51.70
@@ -16,9 +16,6 @@
 MAKE_FLAGS+=   CFLAGS=""
 MAKE_ENV+=     HOME=${WRKDIR:Q}
 
-.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
 .include "../../mk/ocaml.mk"
 
 .if (${OCAML_USE_OPT_COMPILER} == "yes")
@@ -27,11 +24,10 @@
 MAKE_FLAGS+=   NATIVE=false
 .endif
 
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
-MAKE_FLAGS+=   THREADS=true
-.endif
+# bsd.prefs.mk, included also by options, must be after ocaml to get
+# _PKGSRC_MKPIE set correctly.
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
 
 TEST_TARGET=           test
 
@@ -47,5 +43,10 @@
        ${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
        ${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
 
+.include "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
+MAKE_FLAGS+=   THREADS=true
+.endif
+
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"