Thu Jul 28 07:50:05 2011 UTC ()
Fix PLIST on Darwin-11.*-x86_64.


(minskim)
diff -r1.70 -r1.71 pkgsrc/lang/ocaml/Makefile
cvs diff -r1.70 -r1.71 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2011/07/20 14:10:09 1.70
+++ pkgsrc/lang/ocaml/Makefile 2011/07/28 07:50:05 1.71
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.70 2011/07/20 14:10:09 riastradh Exp $ 1# $NetBSD: Makefile,v 1.71 2011/07/28 07:50:05 minskim Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "Makefile.common" 5.include "Makefile.common"
6 6
7CONFIGURE_ARGS+= -no-tk 7CONFIGURE_ARGS+= -no-tk
8CONFIGURE_ARGS+= -cc ${CC} 8CONFIGURE_ARGS+= -cc ${CC}
9CONFIGURE_ENV+= disable_x11=yes 9CONFIGURE_ENV+= disable_x11=yes
10 10
11BUILD_TARGET= world 11BUILD_TARGET= world
12MAKE_JOBS_SAFE= no 12MAKE_JOBS_SAFE= no
13UNLIMIT_RESOURCES= stacksize 13UNLIMIT_RESOURCES= stacksize
14 14
15### 15###
16### PLIST components 16### PLIST components
17### 17###
18 18
19# Stub libraries for functions missing from base system. 19# Stub libraries for functions missing from base system.
20.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \ 20.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
21 !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \ 21 !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \
22 !empty(MACHINE_PLATFORM:MDarwin-10.*-x86_64) || \ 22 !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*-x86_64) || \
23 ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \ 23 ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
24 ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \ 24 ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \
25 ${OPSYS} == "Linux" 25 ${OPSYS} == "Linux"
26PLIST_SRC+= ${PKGDIR}/PLIST.stub 26PLIST_SRC+= ${PKGDIR}/PLIST.stub
27.endif 27.endif
28 28
29# Optional components built only on certain platforms. 29# Optional components built only on certain platforms.
30.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 30.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
31 (${MACHINE_ARCH} == "arm") || \ 31 (${MACHINE_ARCH} == "arm") || \
32 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 32 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
33BUILD_TARGET+= opt opt.opt 33BUILD_TARGET+= opt opt.opt
34PLIST_SRC+= ${PKGDIR}/PLIST.opt 34PLIST_SRC+= ${PKGDIR}/PLIST.opt
35. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \ 35. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \