Thu Feb 24 13:47:48 2022 UTC ()
net/unison2.51: Align with unison-snapshot ocaml.mk usage

This should resolve MKPIE issues on i386, but is otherwise not a
functional change.


(gdt)
diff -r1.36 -r1.37 pkgsrc/net/unison2.51/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/net/unison2.51/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/unison2.51/Attic/Makefile 2021/12/18 16:41:36 1.36
+++ pkgsrc/net/unison2.51/Attic/Makefile 2022/02/24 13:47:48 1.37
@@ -1,56 +1,57 @@ @@ -1,56 +1,57 @@
1# $NetBSD: Makefile,v 1.36 2021/12/18 16:41:36 gdt Exp $ 1# $NetBSD: Makefile,v 1.37 2022/02/24 13:47:48 gdt Exp $
2 2
3# Currently, 2.51.x is the standard approach, and thus this package 3# Currently, 2.51.x is the standard approach, and thus this package
4# produces a "unison-2.51.x" package which installs a "unison" binary. 4# produces a "unison-2.51.x" package which installs a "unison" binary.
5# When the next unison branch is released, we will likely again have 5# When the next unison branch is released, we will likely again have
6# multiple unison packages, with whichever is the standard approach 6# multiple unison packages, with whichever is the standard approach
7# using the unversioned name. 7# using the unversioned name.
8DISTNAME= unison-2.51.5 8DISTNAME= unison-2.51.5
9#PKGREVISION= 0 9#PKGREVISION= 0
10CATEGORIES= net 10CATEGORIES= net
11MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/} 11MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/}
12GITHUB_TAG= v${PKGVERSION_NOREV} 12GITHUB_TAG= v${PKGVERSION_NOREV}
13 13
14MAINTAINER= gdt@NetBSD.org 14MAINTAINER= gdt@NetBSD.org
15HOMEPAGE= https://www.cis.upenn.edu/~bcpierce/unison/ 15HOMEPAGE= https://www.cis.upenn.edu/~bcpierce/unison/
16COMMENT= File-synchronization tool 16COMMENT= File-synchronization tool
17LICENSE= gnu-gpl-v3 17LICENSE= gnu-gpl-v3
18 18
19USE_TOOLS+= gmake bash 19USE_TOOLS+= gmake bash
20MAKE_FLAGS+= CFLAGS="" 20MAKE_FLAGS+= CFLAGS=""
21MAKE_ENV+= HOME=${WRKDIR:Q} 21MAKE_ENV+= HOME=${WRKDIR:Q}
22MAKE_JOBS_SAFE= no 22MAKE_JOBS_SAFE= no
23 23
24.include "options.mk" 
25.include "../../mk/bsd.prefs.mk" 
26 
27.include "../../mk/ocaml.mk" 24.include "../../mk/ocaml.mk"
28 25
29.if (${OCAML_USE_OPT_COMPILER} == "yes") 26.if (${OCAML_USE_OPT_COMPILER} == "yes")
30MAKE_FLAGS+= NATIVE=true 27MAKE_FLAGS+= NATIVE=true
31.else 28.else
32MAKE_FLAGS+= NATIVE=false 29MAKE_FLAGS+= NATIVE=false
33.endif 30.endif
34 31
35.include "../../mk/pthread.buildlink3.mk" 32# bsd.prefs.mk, included also by options, must be after ocaml to get
36 33# _PKGSRC_MKPIE set correctly.
37.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") 34.include "options.mk"
38MAKE_FLAGS+= THREADS=true 35.include "../../mk/bsd.prefs.mk"
39.endif 
40 36
41TEST_TARGET= test 37TEST_TARGET= test
42 38
43INSTALLATION_DIRS= bin 39INSTALLATION_DIRS= bin
44INSTALLATION_DIRS+= share/doc/unison 40INSTALLATION_DIRS+= share/doc/unison
45 41
46do-install: 42do-install:
47 ${INSTALL_PROGRAM} ${WRKSRC}/src/unison ${DESTDIR}${PREFIX}/bin 43 ${INSTALL_PROGRAM} ${WRKSRC}/src/unison ${DESTDIR}${PREFIX}/bin
48 ${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison 44 ${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
49 ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison 45 ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
50 ${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison 46 ${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
51 ${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison 47 ${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison
52 ${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison 48 ${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
53 ${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison 49 ${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
54 50
 51.include "../../mk/pthread.buildlink3.mk"
 52.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 53MAKE_FLAGS+= THREADS=true
 54.endif
 55
55.include "../../lang/ocaml/buildlink3.mk" 56.include "../../lang/ocaml/buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"