CVS commit: pkgsrc/net/unison-snapshot

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Feb 23 01:20:02 UTC 2022

Modified Files:
        pkgsrc/net/unison-snapshot: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/unison-snapshot/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/unison-snapshot/Makefile
diff -u pkgsrc/net/unison-snapshot/Makefile:1.28 pkgsrc/net/unison-snapshot/Makefile:1.29
--- pkgsrc/net/unison-snapshot/Makefile:1.28    Sat Feb 19 16:27:03 2022
+++ pkgsrc/net/unison-snapshot/Makefile Wed Feb 23 01:20:02 2022
@@ -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 @@ USE_TOOLS+=   gmake bash
 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=true
 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 @@ do-install:
        ${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"