Sat Sep 12 18:44:40 2009 UTC ()
Remove useless patches, and fix PLIST issues on freebsd x86_64


(tonio)
diff -r1.61 -r1.62 pkgsrc/lang/ocaml/Makefile
diff -r1.3 -r0 pkgsrc/lang/ocaml/patches/patch-bm
diff -r1.4 -r0 pkgsrc/lang/ocaml/patches/patch-bn
cvs diff -r1.61 -r1.62 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2009/01/22 01:00:33 1.61
+++ pkgsrc/lang/ocaml/Makefile 2009/09/12 18:44:40 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.61 2009/01/22 01:00:33 he Exp $ 1# $NetBSD: Makefile,v 1.62 2009/09/12 18:44:40 tonio 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_ENV+= disable_x11=yes 8CONFIGURE_ENV+= disable_x11=yes
9 9
10BUILD_TARGET= world 10BUILD_TARGET= world
11MAKE_JOBS_SAFE= no 11MAKE_JOBS_SAFE= no
12 12
13### 13###
14### PLIST components 14### PLIST components
@@ -22,26 +22,27 @@ MAKE_JOBS_SAFE= no @@ -22,26 +22,27 @@ MAKE_JOBS_SAFE= no
22 ${OPSYS} == "Linux" 22 ${OPSYS} == "Linux"
23PLIST_SRC+= ${PKGDIR}/PLIST.stub 23PLIST_SRC+= ${PKGDIR}/PLIST.stub
24.endif 24.endif
25 25
26# Optional components built only on certain platforms. 26# Optional components built only on certain platforms.
27.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 27.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
28 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 28 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
29BUILD_TARGET+= opt opt.opt 29BUILD_TARGET+= opt opt.opt
30PLIST_SRC+= ${PKGDIR}/PLIST.opt 30PLIST_SRC+= ${PKGDIR}/PLIST.opt
31. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \ 31. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
32 empty(MACHINE_PLATFORM:MSunOS-*-i386) && \ 32 empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
33 empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \ 33 empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \
34 empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \ 34 empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \
 35 empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) && \
35 empty(MACHINE_PLATFORM:MNetBSD-*-sparc) 36 empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
36PLIST_SRC+= ${PKGDIR}/PLIST.prof 37PLIST_SRC+= ${PKGDIR}/PLIST.prof
37. endif 38. endif
38.endif 39.endif
39 40
40# Common ocaml files. 41# Common ocaml files.
41PLIST_SRC+= ${PKGDIR}/PLIST 42PLIST_SRC+= ${PKGDIR}/PLIST
42 43
43# This is needed because ${WRKSRC}/build/partial-install.sh uses 44# This is needed because ${WRKSRC}/build/partial-install.sh uses
44# $PWD as part of its script. However, with /bin/sh on SunOS 45# $PWD as part of its script. However, with /bin/sh on SunOS
45# (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is 46# (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
46# set before the cd takes place and is then passed down. So the end 47# set before the cd takes place and is then passed down. So the end
47# result is when ./build/partial-install.sh is called, PWD is set 48# result is when ./build/partial-install.sh is called, PWD is set
File Deleted: pkgsrc/lang/ocaml/patches/Attic/patch-bm
File Deleted: pkgsrc/lang/ocaml/patches/Attic/patch-bn