diff options
| -rw-r--r-- | lang/ocaml/Makefile | 3 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-bm | 31 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-bn | 31 |
3 files changed, 2 insertions, 63 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 03d24dc5b70..248921e2e69 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2009/01/22 01:00:33 he Exp $ +# $NetBSD: Makefile,v 1.62 2009/09/12 18:44:40 tonio Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -32,6 +32,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.opt empty(MACHINE_PLATFORM:MSunOS-*-i386) && \ empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \ empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \ + empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) && \ empty(MACHINE_PLATFORM:MNetBSD-*-sparc) PLIST_SRC+= ${PKGDIR}/PLIST.prof . endif diff --git a/lang/ocaml/patches/patch-bm b/lang/ocaml/patches/patch-bm deleted file mode 100644 index dc33ca3414c..00000000000 --- a/lang/ocaml/patches/patch-bm +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-bm,v 1.3 2006/01/16 09:41:48 adam Exp $ - ---- otherlibs/num/Makefile.orig 2005-01-21 15:15:44.000000000 +0100 -+++ otherlibs/num/Makefile -@@ -19,7 +19,7 @@ include ../../config/Makefile - - # Compilation options - CC=$(BYTECC) --CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \ -+CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \ - -DBNG_ARCH_$(BNG_ARCH) -DBNG_ASM_LEVEL=$(BNG_ASM_LEVEL) - CAMLC=../../ocamlcomp.sh - CAMLOPT=../../ocamlcompopt.sh -@@ -49,13 +49,13 @@ libnums.a: $(COBJS) - $(CAMLOBJS:.cmo=.cmx): ../../ocamlopt - - install: -- if test -f dllnums.so; then cp dllnums.so $(STUBLIBDIR)/dllnums.so; fi -- cp libnums.a $(LIBDIR)/libnums.a -+ if test -f dllnums.so; then ${BSD_INSTALL_DATA} dllnums.so $(STUBLIBDIR)/dllnums.so; fi -+ ${BSD_INSTALL_DATA} libnums.a $(LIBDIR)/libnums.a - cd $(LIBDIR); $(RANLIB) libnums.a -- cp nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR) -+ ${BSD_INSTALL_DATA} nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR) - - installopt: -- cp $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums.a $(LIBDIR) -+ ${BSD_INSTALL_DATA} $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums.a $(LIBDIR) - cd $(LIBDIR); $(RANLIB) nums.a - - partialclean: diff --git a/lang/ocaml/patches/patch-bn b/lang/ocaml/patches/patch-bn deleted file mode 100644 index 1031b61526a..00000000000 --- a/lang/ocaml/patches/patch-bn +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-bn,v 1.4 2007/09/14 15:34:12 adam Exp $ - ---- otherlibs/str/Makefile.orig 2007-01-29 13:11:16.000000000 +0100 -+++ otherlibs/str/Makefile -@@ -19,7 +19,7 @@ include ../../config/Makefile - - # Compilation options - CC=$(BYTECC) --CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -+CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) - CAMLC=../../ocamlcomp.sh - CAMLOPT=../../ocamlcompopt.sh - COMPFLAGS=-warn-error A -g -@@ -48,13 +48,13 @@ clean: partialclean - rm -f *.a *.so *.o - - install: -- if test -f dllstr.so; then cp dllstr.so $(STUBLIBDIR)/dllstr.so; fi -- cp libstr.a $(LIBDIR)/libstr.a -+ if test -f dllstr.so; then ${BSD_INSTALL_DATA} dllstr.so $(STUBLIBDIR)/dllstr.so; fi -+ ${BSD_INSTALL_DATA} libstr.a $(LIBDIR)/libstr.a - cd $(LIBDIR); $(RANLIB) libstr.a -- cp str.cma str.cmi str.mli $(LIBDIR) -+ ${BSD_INSTALL_DATA} str.cma str.cmi str.mli $(LIBDIR) - - installopt: -- cp str.cmx str.cmxa str.a $(LIBDIR) -+ ${BSD_INSTALL_DATA} str.cmx str.cmxa str.a $(LIBDIR) - cd $(LIBDIR); $(RANLIB) str.a - - .SUFFIXES: .ml .mli .cmo .cmi .cmx |