Sun Sep 23 08:36:44 2012 UTC ()
natdynlink conditional should match the one of ocaml
fixes make package on darwin x86_64


(tonio)
diff -r1.45 -r1.46 pkgsrc/lang/coq/Makefile
cvs diff -r1.45 -r1.46 pkgsrc/lang/coq/Makefile (switch to unified diff)

--- pkgsrc/lang/coq/Makefile 2012/09/15 10:05:18 1.45
+++ pkgsrc/lang/coq/Makefile 2012/09/23 08:36:43 1.46
@@ -1,65 +1,64 @@ @@ -1,65 +1,64 @@
1# $NetBSD: Makefile,v 1.45 2012/09/15 10:05:18 obache Exp $ 1# $NetBSD: Makefile,v 1.46 2012/09/23 08:36:43 tonio Exp $
2# 2#
3 3
4DISTNAME= coq-8.3pl1 4DISTNAME= coq-8.3pl1
5PKGREVISION= 13 5PKGREVISION= 13
6CATEGORIES= lang math 6CATEGORIES= lang math
7MASTER_SITES= http://coq.inria.fr/distrib/V8.3pl1/files/ 7MASTER_SITES= http://coq.inria.fr/distrib/V8.3pl1/files/
8 8
9MAINTAINER= richards+netbsd@CS.Princeton.EDU 9MAINTAINER= richards+netbsd@CS.Princeton.EDU
10HOMEPAGE= http://coq.inria.fr/ 10HOMEPAGE= http://coq.inria.fr/
11COMMENT= Theorem prover which extracts programs from proofs 11COMMENT= Theorem prover which extracts programs from proofs
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17HAS_CONFIGURE= YES 17HAS_CONFIGURE= YES
18CONFIGURE_ARGS+= -prefix ${PREFIX} 18CONFIGURE_ARGS+= -prefix ${PREFIX}
19CONFIGURE_ARGS+= -emacslib ${PREFIX}/share/emacs/site-lisp 19CONFIGURE_ARGS+= -emacslib ${PREFIX}/share/emacs/site-lisp
20BUILD_TARGET= world 20BUILD_TARGET= world
21 21
22BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10 22BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 26.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
27 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 27 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
28PLIST_SRC= ${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST 28PLIST_SRC= ${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST
29.endif 29.endif
30 30
31.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") 31.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
32. if !empty(MACHINE_PLATFORM:MLinux-*-*) || \ 32. if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
33 !empty(MACHINE_PLATFORM:MDarwin-*-*) || \ 
34 !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \ 33 !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
35 !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \ 34 !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
36 !empty(MACHINE_PLATFORM:MNetBSD-*-*) 35 !empty(MACHINE_PLATFORM:MNetBSD-*-*)
37PLIST_SRC+= ${PKGDIR}/PLIST.natdynlink 36PLIST_SRC+= ${PKGDIR}/PLIST.natdynlink
38. endif 37. endif
39.endif 38.endif
40 39
41.if ${OPSYS} == "Darwin" 40.if ${OPSYS} == "Darwin"
42INSTALL_UNSTRIPPED= yes 41INSTALL_UNSTRIPPED= yes
43# See PR# 28772 as the above should work but it appears to be ignored 42# See PR# 28772 as the above should work but it appears to be ignored
44# so we set it explicitly below not to stip installed binaries. 43# so we set it explicitly below not to stip installed binaries.
45_STRIPFLAG_CC= 44_STRIPFLAG_CC=
46_STRIPFLAG_INSTALL= 45_STRIPFLAG_INSTALL=
47.endif 46.endif
48 47
49REPLACE_SH= configure install.sh 48REPLACE_SH= configure install.sh
50INSTALL_ENV+= COQINSTALLPREFIX=${DESTDIR} 49INSTALL_ENV+= COQINSTALLPREFIX=${DESTDIR}
51 50
52PLIST_VARS= coqide 51PLIST_VARS= coqide
53PKG_OPTIONS_VAR= PKG_OPTIONS.coq 52PKG_OPTIONS_VAR= PKG_OPTIONS.coq
54PKG_SUPPORTED_OPTIONS= coqide 53PKG_SUPPORTED_OPTIONS= coqide
55.include "../../mk/bsd.options.mk" 54.include "../../mk/bsd.options.mk"
56.if !empty(PKG_OPTIONS:Mcoqide) 55.if !empty(PKG_OPTIONS:Mcoqide)
57.include "../../x11/lablgtk/buildlink3.mk" 56.include "../../x11/lablgtk/buildlink3.mk"
58.include "../../x11/gtk2/buildlink3.mk" 57.include "../../x11/gtk2/buildlink3.mk"
59PLIST.coqide= yes 58PLIST.coqide= yes
60.endif 59.endif
61 60
62.include "../../mk/pthread.buildlink3.mk" 61.include "../../mk/pthread.buildlink3.mk"
63.include "../../lang/ocaml/buildlink3.mk" 62.include "../../lang/ocaml/buildlink3.mk"
64.include "../../lang/camlp5/buildlink3.mk" 63.include "../../lang/camlp5/buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"