head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.4 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.2 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.7.0.26 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.24 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.22 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.20 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.18 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.16 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.14 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.12 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.10 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.8 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.6 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.4 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.2 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.6.0.20 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.18 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.16 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.14 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.12 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.10 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.8 pkgsrc-2008Q1:1.6.0.6 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.4 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.2 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.4.0.18 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.16 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.14 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.12 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.10 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.8 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.6 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.4 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.0.4 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.8 date 2012.10.11.09.48.14; author jaapb; state dead; branches; next 1.7; 1.7 date 2009.09.22.20.19.30; author tonio; state Exp; branches; next 1.6; 1.6 date 2007.10.04.05.19.16; author adam; state Exp; branches; next 1.5; 1.5 date 2007.09.14.15.34.10; author adam; state Exp; branches; next 1.4; 1.4 date 2005.06.07.00.59.49; author minskim; state Exp; branches; next 1.3; 1.3 date 2005.02.04.23.25.50; author adrianp; state dead; branches; next 1.2; 1.2 date 2004.04.22.09.18.36; author tron; state Exp; branches; next 1.1; 1.1 date 2003.04.19.00.16.58; author jschauma; state Exp; branches; next ; desc @@ 1.8 log @Removed obsolete and/or renamed patches. @ text @$NetBSD: patch-ab,v 1.7 2009/09/22 20:19:30 tonio Exp $ --- otherlibs/dbm/cldbm.c.orig 2003-07-08 15:50:31.000000000 +0200 +++ otherlibs/dbm/cldbm.c @@@@ -21,10 +21,11 @@@@ #include #include -#ifdef DBM_USES_GDBM_NDBM -#include -#else +#ifdef DBM_USES_DB #include +#else +#define DB_DBM_HSEARCH 1 +#include #endif /* Quite close to sys_open_flags, but we need RDWR */ @ 1.7 log @Fix build with db4 [PR pkg/42061] @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2007/10/04 05:19:16 adam Exp $ @ 1.6 log @Fix for PR#37051. Please test. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -21,10 +21,10 @@@@ d15 1 @ 1.5 log @Changes 3.10.0: - New language features - New tools - Faster type-checking of functor applications. - Referencing an interface compiled with -rectypes from a module not compiled with -rectypes is now an error. - Revised the "fragile matching" warning. - Print a stack backtrace on an uncaught exception. - Stack overflow detection on MS Windows 32 bits. - Stack overflow detection on MacOS X PPC and Intel. - Intel/AMD 64 bits: generate position-independent code by default. - Fixed bug involving -for-pack and missing .cmx files. - Fixed bug causing duplication of literals. - C/Caml interface functions take "char const *" arguments instead of "char *" when appropriate. - Faster string comparisons (fast case if strings are ==). - Other @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2005/06/07 00:59:49 minskim Exp $ d3 1 a3 1 --- otherlibs/dbm/cldbm.c.orig 2003-07-08 08:50:31.000000000 -0500 d5 1 a5 1 @@@@ -21,8 +21,8 @@@@ d11 1 a12 2 +#include #else d14 2 d17 2 @ 1.4 log @Make ocaml build with pkgsrc bdb. @ text @d1 1 a1 1 $NetBSD$ d12 1 a12 1 +#include @ 1.3 log @remove obsolete patches for recent update @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2004/04/22 09:18:36 tron Exp $ d3 13 a15 10 --- asmcomp/power/arch.ml.orig Mon Jul 22 18:37:53 2002 +++ asmcomp/power/arch.ml Thu Apr 22 10:34:38 2004 @@@@ -91,6 +91,5 @@@@ let toc = match Config.system with | "aix" -> true - | "elf" -> false - | "rhapsody" -> false + | "elf" | "rhapsody" | "bsd" -> false | _ -> Misc.fatal_error "wrong $(SYSTEM)" @ 1.2 log @Fix various issues with this package: - split patches files - always enable threading which has various advantages - it fixes the build of the Tk library - it greatly simplifies the package list handling - it provides threading support under NetBSD 1.6/1.6.x - correct default dependence in "buildlink2.mk" to "build" Bump package revision because of all these changes. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Use BSD_INSTALL_* rather than 'mkdir' and 'cp' to install the files, so that it's not a problem if root has a more stringent umask. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: $ d3 10 a12 565 --- ./byterun/Makefile.orig Fri Apr 18 14:23:08 2003 +++ ./byterun/Makefile Fri Apr 18 14:23:52 2003 @@@@ -48,10 +48,10 @@@@ prims.o libcamlrund.a $(BYTECCLIBS) install: - cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE) - cp libcamlrun.a $(LIBDIR)/libcamlrun.a + ${BSD_INSTALL_PROGRAM} ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE) + ${BSD_INSTALL_DATA} libcamlrun.a $(LIBDIR)/libcamlrun.a cd $(LIBDIR); $(RANLIB) libcamlrun.a - if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi + if test -d $(LIBDIR)/caml; then : ; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/caml; fi for i in $(PUBLIC_INCLUDES); do \ sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \ done --- ./camlp4/etc/Makefile.orig Fri Apr 18 14:43:37 2003 +++ ./camlp4/etc/Makefile Fri Apr 18 14:44:40 2003 @@@@ -52,14 +52,14 @@@@ get_promote: install: - -$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR) - cp $(OBJS) $(LIBDIR)/camlp4/. - cp $(INTF) $(LIBDIR)/camlp4/. - cp lib.sml $(LIBDIR)/camlp4/. - cp camlp4o$(EXE) $(BINDIR)/. - if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi - cp mkcamlp4.sh $(BINDIR)/mkcamlp4 - chmod a+x $(BINDIR)/mkcamlp4 + -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 + -${BSD_INSTALL_PROGRAM_DIR} $(BINDIR) + ${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/. + ${BSD_INSTALL_DATA} $(INTF) $(LIBDIR)/camlp4/. + ${BSD_INSTALL_DATA} lib.sml $(LIBDIR)/camlp4/. + ${BSD_INSTALL_SCRIPT} camlp4o$(EXE) $(BINDIR)/. + if test -f $(COPT); then ${BSD_INSTALL_PROGRAM} $(COPT) $(BINDIR)/.; fi + ${BSD_INSTALL_SCRIPT} mkcamlp4.sh $(BINDIR)/mkcamlp4 pa_lisp.cmo: pa_lispr.cmo pa_ocamllex.cmo: pa_o.cmo --- ./camlp4/camlp4/Makefile.orig Fri Apr 18 14:42:14 2003 +++ ./camlp4/camlp4/Makefile Fri Apr 18 14:42:52 2003 @@@@ -62,11 +62,19 @@@@ done install: - -$(MKDIR) $(BINDIR) - -$(MKDIR) $(LIBDIR)/camlp4 - cp $(CAMLP4) $(BINDIR)/. - cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli $(LIBDIR)/camlp4/. - cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi $(LIBDIR)/camlp4/. - cp camlp4.cma $(LIBDIR)/camlp4/. + -${BSD_INSTALL_PROGRAM_DIR} $(BINDIR) + -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 + ${BSD_INSTALL_SCRIPT} $(CAMLP4) $(BINDIR)/. + ${BSD_INSTALL_DATA} mLast.mli $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} quotation.mli $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} ast2pt.mli $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} pcaml.mli $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} spretty.mli $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} mLast.cmi $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} quotation.cmi $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} ast2pt.cmi $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} pcaml.cmi $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} spretty.cmi $(LIBDIR)/camlp4/ + ${BSD_INSTALL_DATA} camlp4.cma $(LIBDIR)/camlp4/ include .depend --- ./camlp4/lib/Makefile.orig Fri Apr 18 14:45:22 2003 +++ ./camlp4/lib/Makefile Fri Apr 18 14:46:06 2003 @@@@ -36,15 +36,15 @@@@ done install: - -$(MKDIR) $(LIBDIR)/camlp4 - cp $(TARGET) *.mli $(LIBDIR)/camlp4/. - cp *.cmi $(LIBDIR)/camlp4/. + -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 + ${BSD_INSTALL_DATA} $(TARGET) *.mli $(LIBDIR)/camlp4/. + ${BSD_INSTALL_DATA} *.cmi $(LIBDIR)/camlp4/. if test -f $(TARGET:.cma=.cmxa); then $(MAKE) installopt LIBDIR=$(LIBDIR); fi installopt: - cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/. + ${BSD_INSTALL_DATA} $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/. if test -f $(TARGET:.cma=.lib); then \ - cp $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \ + ${BSD_INSTALL_DATA} $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \ else \ tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/camlp4/.; tar xf -); \ fi --- ./camlp4/man/Makefile.orig Fri Apr 18 14:46:06 2003 +++ ./camlp4/man/Makefile Fri Apr 18 14:46:38 2003 @@@@ -14,8 +14,8 @@@@ get_promote: install: - -$(MKDIR) $(MANDIR)/man1 - -cp $(TARGET) $(MANDIR)/man1/. + -${BSD_INSTALL_MAN_DIR} $(MANDIR)/man1 + -${BSD_INSTALL_MAN} $(TARGET) $(MANDIR)/man1/. -cd $(MANDIR)/man1; rm -f camlp4o.1; ln -s $(TARGET) camlp4o.1 -cd $(MANDIR)/man1; rm -f camlp4r.1; ln -s $(TARGET) camlp4r.1 -cd $(MANDIR)/man1; rm -f mkcamlp4.1; ln -s $(TARGET) mkcamlp4.1 --- ./camlp4/meta/Makefile.orig Fri Apr 18 14:42:52 2003 +++ ./camlp4/meta/Makefile Fri Apr 18 14:43:37 2003 @@@@ -42,10 +42,11 @@@@ done install: - -$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR) - cp $(OBJS) $(LIBDIR)/camlp4/. - cp pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/. - cp camlp4r$(EXE) $(BINDIR)/. + -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 + -${BSD_INSTALL_PROGRAM_DIR} $(BINDIR) + ${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/. + ${BSD_INSTALL_DATA} pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/. + ${BSD_INSTALL_SCRIPT} camlp4r$(EXE) $(BINDIR)/. if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi include .depend --- ./camlp4/ocpp/Makefile.orig Fri Apr 18 14:44:54 2003 +++ ./camlp4/ocpp/Makefile Fri Apr 18 14:45:22 2003 @@@@ -24,8 +24,9 @@@@ rm -f *.cm[ioa] *.pp[io] *.o *.out *.bak .*.bak crc.ml ocpp$(EXE) install: - -$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR) - cp $(OBJS) $(LIBDIR)/camlp4/. - cp ocpp$(EXE) $(BINDIR)/. + -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 + -${BSD_INSTALL_PROGRAM_DIR} $(BINDIR) + ${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/. + ${BSD_INSTALL_SCRIPT} ocpp$(EXE) $(BINDIR)/. depend: --- ./camlp4/odyl/Makefile.orig Fri Apr 18 14:41:32 2003 +++ ./camlp4/odyl/Makefile Fri Apr 18 14:42:14 2003 @@@@ -51,7 +51,8 @@@@ compare: install: - -$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR) - cp odyl.cmo odyl.cma $(LIBDIR)/camlp4/. + -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 + -${BSD_INSTALL_DATA_DIR} $(BINDIR) + ${BSD_INSTALL_DATA} odyl.cmo odyl.cma $(LIBDIR)/camlp4/. include .depend --- ./camlp4/top/Makefile.orig Fri Apr 18 14:44:40 2003 +++ ./camlp4/top/Makefile Fri Apr 18 14:44:54 2003 @@@@ -42,7 +42,9 @@@@ get_promote: install: - -$(MKDIR) $(LIBDIR)/camlp4 - cp $(TARGET) $(LIBDIR)/camlp4/. + -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 + for i in $(TARGET); do \ + ${BSD_INSTALL_DATA} $$i $(LIBDIR)/camlp4/ ; \ + done include .depend --- ./debugger/Makefile.orig Fri Apr 18 14:46:54 2003 +++ ./debugger/Makefile Fri Apr 18 14:47:08 2003 @@@@ -79,7 +79,7 @@@@ $(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) $(OTHEROBJS) $(OBJS) install: - cp ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE) + ${BSD_INSTALL_PROGRAM} ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE) clean:: rm -f ocamldebug$(EXE) --- ./man/Makefile.orig Fri Apr 18 14:25:01 2003 +++ ./man/Makefile Fri Apr 18 14:25:28 2003 @@@@ -17,6 +17,6 @@@@ DIR=$(MANDIR)/man$(MANEXT) install: - for i in *.m; do cp $$i $(DIR)/`basename $$i .m`.$(MANEXT); done + for i in *.m; do ${BSD_INSTALL_MAN} $$i $(DIR)/`basename $$i .m`.$(MANEXT); done echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' > $(DIR)/ocamlc.opt.$(MANEXT) echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' > $(DIR)/ocamlopt.opt.$(MANEXT) --- ./ocamldoc/Makefile.orig Fri Apr 18 14:38:37 2003 +++ ./ocamldoc/Makefile Fri Apr 18 14:40:24 2003 @@@@ -272,23 +272,23 @@@@ # Installation targets ###################### install: dummy - if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi - if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi - $(CP) $(OCAMLDOC) $(INSTALL_BINDIR) - $(CP) ocamldoc.sty ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR) - $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) - if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi - $(CP) stdlib_man/* $(INSTALL_MANODIR) + if test -d $(INSTALL_BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(INSTALL_BINDIR); fi + if test -d $(INSTALL_LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_LIBDIR); fi + ${BSD_INSTALL_PROGRAM} $(OCAMLDOC) $(INSTALL_BINDIR) + ${BSD_INSTALL_DATA} ocamldoc.sty ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR) + ${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) + if test -d $(INSTALL_MANODIR); then : ; else ${BSD_INSTALL_MAN_DIR} $(INSTALL_MANODIR); fi + ${BSD_INSTALL_MAN} stdlib_man/* $(INSTALL_MANODIR) installopt: if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi installopt_really: - if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi - if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi - $(CP) $(OCAMLDOC_OPT) $(INSTALL_BINDIR) - $(CP) ocamldoc.sty ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR) - $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) + if test -d $(INSTALL_BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(INSTALL_BINDIR); fi + if test -d $(INSTALL_LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_LIBDIR); fi + ${BSD_INSTALL_PROGRAM} $(OCAMLDOC_OPT) $(INSTALL_BINDIR) + ${BSD_INSTALL_DATA} ocamldoc.sty ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR) + ${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) # Testing : ########### --- ./otherlibs/bigarray/Makefile.orig Fri Apr 18 14:25:51 2003 +++ ./otherlibs/bigarray/Makefile Fri Apr 18 14:26:40 2003 @@@@ -41,13 +41,13 @@@@ $(CAML_OBJS:.cmo=.cmx) install: - if test -f dllbigarray.so; then cp dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi - cp bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR) + if test -f dllbigarray.so; then ${BSD_INSTALL_DATA} dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi + ${BSD_INSTALL_DATA} bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR) cd $(LIBDIR); $(RANLIB) libbigarray.a - cp bigarray.h $(LIBDIR)/caml/bigarray.h + ${BSD_INSTALL_DATA} bigarray.h $(LIBDIR)/caml/bigarray.h installopt: - cp bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR) + ${BSD_INSTALL_DATA} bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR) cd $(LIBDIR); $(RANLIB) bigarray.a partialclean: --- ./otherlibs/dbm/Makefile.orig Fri Apr 18 14:27:45 2003 +++ ./otherlibs/dbm/Makefile Fri Apr 18 14:28:12 2003 @@@@ -47,13 +47,13 @@@@ rm -f *.a *.o *.so install: - if test -f dllmldbm.so; then cp dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi - cp libmldbm.a $(LIBDIR)/libmldbm.a + if test -f dllmldbm.so; then ${BSD_INSTALL_DATA} dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi + ${BSD_INSTALL_DATA} libmldbm.a $(LIBDIR)/libmldbm.a cd $(LIBDIR); $(RANLIB) libmldbm.a - cp dbm.cma dbm.cmi dbm.mli $(LIBDIR) + ${BSD_INSTALL_DATA} dbm.cma dbm.cmi dbm.mli $(LIBDIR) installopt: - cp dbm.cmx dbm.cmxa dbm.a $(LIBDIR) + ${BSD_INSTALL_DATA} dbm.cmx dbm.cmxa dbm.a $(LIBDIR) cd $(LIBDIR); $(RANLIB) dbm.a .SUFFIXES: .ml .mli .cmo .cmi .cmx --- ./otherlibs/dynlink/Makefile.orig Fri Apr 18 14:28:23 2003 +++ ./otherlibs/dynlink/Makefile Fri Apr 18 14:28:35 2003 @@@@ -38,7 +38,7 @@@@ $(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo install: - cp dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR) + ${BSD_INSTALL_DATA} dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR) installopt: --- ./otherlibs/graph/Makefile.orig Fri Apr 18 14:29:08 2003 +++ ./otherlibs/graph/Makefile Fri Apr 18 14:29:30 2003 @@@@ -50,13 +50,13 @@@@ rm -f *.a *.so *.o install: - if test -f dllgraphics.so; then cp dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi - cp libgraphics.a $(LIBDIR)/libgraphics.a + if test -f dllgraphics.so; then ${BSD_INSTALL_DATA} dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi + ${BSD_INSTALL_DATA} libgraphics.a $(LIBDIR)/libgraphics.a cd $(LIBDIR); $(RANLIB) libgraphics.a - cp graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR) + ${BSD_INSTALL_DATA} graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR) installopt: - cp graphics.cmxa graphics.a $(LIBDIR) + ${BSD_INSTALL_DATA} graphics.cmxa graphics.a $(LIBDIR) cd $(LIBDIR); $(RANLIB) graphics.a .SUFFIXES: .ml .mli .cmo .cmi .cmx --- ./otherlibs/labltk/browser/Makefile.orig Fri Apr 18 14:33:15 2003 +++ ./otherlibs/labltk/browser/Makefile Fri Apr 18 14:33:33 2003 @@@@ -47,7 +47,7 @@@@ install: if test -f ocamlbrowser$(EXE); then : ; \ - cp ocamlbrowser$(EXE) $(BINDIR); fi + ${BSD_INSTALL_SCRIPT} ocamlbrowser$(EXE) $(BINDIR); fi clean: rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig --- ./otherlibs/labltk/camltk/Makefile.orig Fri Apr 18 14:33:34 2003 +++ ./otherlibs/labltk/camltk/Makefile Fri Apr 18 14:34:41 2003 @@@@ -21,14 +21,12 @@@@ $(MAKE) -f Makefile.gen clean install: $(CAMLTKOBJS) - if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmi + if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi + ${BSD_INSTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR) installopt: $(CAMLTKOBJSX) - @@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(CAMLTKOBJSX) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmx + @@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi + ${BSD_INSTALL_DATA} $(CAMLTKOBJSX) $(INSTALLDIR) .SUFFIXES : .SUFFIXES : .mli .ml .cmi .cmx .cmo .mlp --- ./otherlibs/labltk/compiler/Makefile.orig Fri Apr 18 14:34:42 2003 +++ ./otherlibs/labltk/compiler/Makefile Fri Apr 18 14:34:52 2003 @@@@ -45,8 +45,8 @@@@ rm -f *.cm* pplex.ml ppyac.ml ppyac.mli pp$(EXE) install: - cp tkcompiler$(EXE) $(INSTALLDIR) - cp pp$(EXE) $(INSTALLDIR) + ${BSD_INSTALL_SCRIPT} tkcompiler$(EXE) $(INSTALLDIR) + ${BSD_INSTALL_SCRIPT} pp$(EXE) $(INSTALLDIR) .SUFFIXES : .SUFFIXES : .mli .ml .cmi .cmo .mlp --- ./otherlibs/labltk/frx/Makefile.orig Fri Apr 18 14:35:04 2003 +++ ./otherlibs/labltk/frx/Makefile Fri Apr 18 14:35:14 2003 @@@@ -20,7 +20,7 @@@@ $(CAMLOPTLIBR) -o frxlib.cmxa $(OBJSX) install: frxlib.cma - cp *.cmi *.mli frxlib.cma $(INSTALLDIR) + ${BSD_INSTALL_DATA} *.cmi *.mli frxlib.cma $(INSTALLDIR) installopt: frxlib.cmxa cp frxlib.cmxa frxlib.a $(INSTALLDIR) --- ./otherlibs/labltk/jpf/Makefile.orig Fri Apr 18 14:35:15 2003 +++ ./otherlibs/labltk/jpf/Makefile Fri Apr 18 14:35:24 2003 @@@@ -21,7 +21,7 @@@@ $(CAMLOPTLIBR) -o jpflib.cmxa $(OBJSX) install: jpflib.cma - cp $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR) + ${BSD_INSTALL_DATA} $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR) installopt: jpflib.cmxa cp jpflib.cmxa jpflib.a $(OBJS:.cmo=.cmx) $(INSTALLDIR) --- ./otherlibs/labltk/labltk/Makefile.orig Fri Apr 18 14:35:24 2003 +++ ./otherlibs/labltk/labltk/Makefile Fri Apr 18 14:35:59 2003 @@@@ -16,14 +16,12 @@@@ labltkobjsx: $(LABLTKOBJSX) install: $(LABLTKOBJS) - if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmi + if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi + ${BSD_INSTALL_DATA} $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR) installopt: $(LABLTKOBJSX) - @@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(LABLTKOBJSX) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmx + @@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi + ${BSD_INSTALL_DATA} $(LABLTKOBJSX) $(INSTALLDIR) clean: $(MAKE) -f Makefile.gen clean --- ./otherlibs/labltk/lib/Makefile.orig Fri Apr 18 14:36:00 2003 +++ ./otherlibs/labltk/lib/Makefile Fri Apr 18 14:37:09 2003 @@@@ -58,17 +58,13 @@@@ @@echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) $$*' >> $@@ install: - if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/$(LIBNAME).cma - chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE) - @@if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi - cp $(LIBNAME) $(BINDIR) - chmod 755 $(BINDIR)/$(LIBNAME) + if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi + ${BSD_INSTALL_DATA} $(LIBNAME).cma $(INSTALLDIR) + ${BSD_INSTALL_PROGRAM} $(LIBNAME)top$(EXE) $(INSTALLDIR) + @@if test -d $(BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(BINDIR); fi + ${BSD_INSTALL_SCRIPT} $(LIBNAME) $(BINDIR) installopt: - @@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR) - cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).a - chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa - chmod 644 $(INSTALLDIR)/$(LIBNAME).a + @@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi + ${BSD_INSTALL_DATA} $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR) + cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).a --- ./otherlibs/labltk/support/Makefile.orig Fri Apr 18 14:37:10 2003 +++ ./otherlibs/labltk/support/Makefile Fri Apr 18 14:37:47 2003 @@@@ -26,12 +26,11 @@@@ widget.cmi widget.mli install: lib$(LIBNAME).a $(PUB) - if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(PUB) lib$(LIBNAME).a $(INSTALLDIR) + if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi + ${BSD_INSTALL_DATA} $(PUB) lib$(LIBNAME).a $(INSTALLDIR) cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).a - cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).a if test -f dll$(LIBNAME).so; then \ - cp dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi + ${BSD_INSTALL_DATA} dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi clean : rm -f *.cm* *.o *.a *.so --- ./otherlibs/labltk/tkanim/Makefile.orig Fri Apr 18 14:37:47 2003 +++ ./otherlibs/labltk/tkanim/Makefile Fri Apr 18 14:38:19 2003 @@@@ -52,9 +52,9 @@@@ install: tkanim.cma - cp tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR) + ${BSD_INSTALL_DATA} tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR) if [ -f dlltkanim.so ]; then \ - cp dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \ + ${BSD_INSTALL_DATA} dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \ fi installopt: tkanim.cmxa --- ./otherlibs/num/Makefile.orig Fri Apr 18 14:29:52 2003 +++ ./otherlibs/num/Makefile Fri Apr 18 14:30:19 2003 @@@@ -53,13 +53,13 @@@@ $(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: --- ./otherlibs/str/Makefile.orig Fri Apr 18 14:30:19 2003 +++ ./otherlibs/str/Makefile Fri Apr 18 14:30:43 2003 @@@@ -53,13 +53,13 @@@@ cd $(REGEXLIB); if test -f Makefile; then $(MAKE) distclean; else exit 0; fi 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 --- ./otherlibs/systhreads/Makefile.orig Fri Apr 18 14:30:43 2003 +++ ./otherlibs/systhreads/Makefile Fri Apr 18 14:31:12 2003 @@@@ -70,13 +70,13 @@@@ rm -f $(GENFILES) install: - if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi - cp libthreads.a $(LIBDIR)/libthreads.a + if test -f dllthreads.so; then ${BSD_INSTALL_DATA} dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi + ${BSD_INSTALL_DATA} libthreads.a $(LIBDIR)/libthreads.a cd $(LIBDIR); $(RANLIB) libthreads.a - if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi - cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads + if test -d $(LIBDIR)/threads; then :; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/threads; fi + ${BSD_INSTALL_DATA} $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads rm -f $(LIBDIR)/threads/stdlib.cma - cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR) + ${BSD_INSTALL_DATA} thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR) installopt: cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a --- ./otherlibs/threads/Makefile.orig Fri Apr 18 14:31:14 2003 +++ ./otherlibs/threads/Makefile Fri Apr 18 14:31:45 2003 @@@@ -99,12 +99,12 @@@@ rm -f pervasives.mli marshal.mli unix.mli install: - if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi - cp libthreads.a $(LIBDIR)/libthreads.a + if test -f dllthreads.so; then ${BSD_INSTALL_DATA} dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi + ${BSD_INSTALL_DATA} libthreads.a $(LIBDIR)/libthreads.a cd $(LIBDIR); $(RANLIB) libthreads.a - if test -d $(LIBDIR)/threads; then : ; else mkdir $(LIBDIR)/threads; fi - cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/threads - cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR) + if test -d $(LIBDIR)/threads; then : ; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/threads; fi + ${BSD_INSTALL_DATA} thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/threads + ${BSD_INSTALL_DATA} thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR) installopt: --- ./otherlibs/unix/Makefile.orig Fri Apr 18 14:31:45 2003 +++ ./otherlibs/unix/Makefile Fri Apr 18 14:32:05 2003 @@@@ -65,13 +65,13 @@@@ rm -f *.a *.o *.so install: - if test -f dllunix.so; then cp dllunix.so $(STUBLIBDIR)/dllunix.so; fi - cp libunix.a $(LIBDIR)/libunix.a + if test -f dllunix.so; then ${BSD_INSTALL_DATA} dllunix.so $(STUBLIBDIR)/dllunix.so; fi + ${BSD_INSTALL_DATA} libunix.a $(LIBDIR)/libunix.a cd $(LIBDIR); $(RANLIB) libunix.a - cp unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR) + ${BSD_INSTALL_DATA} unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR) installopt: - cp $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR) + ${BSD_INSTALL_DATA} $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR) cd $(LIBDIR); $(RANLIB) unix.a .SUFFIXES: .ml .mli .cmo .cmi .cmx --- ./stdlib/Makefile.orig Fri Apr 18 14:24:06 2003 +++ ./stdlib/Makefile Fri Apr 18 14:24:23 2003 @@@@ -47,7 +47,7 @@@@ allopt-prof: stdlib.p.cmxa std_exit.p.cmx install: - cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \ + ${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \ $(LIBDIR) installopt: installopt-default installopt-$(PROFILING) --- ./tools/Makefile.orig Fri Apr 18 14:24:38 2003 +++ ./tools/Makefile Fri Apr 18 14:24:50 2003 @@@@ -44,7 +44,7 @@@@ rm -f ocamldep install:: - cp ocamldep $(BINDIR)/ocamldep$(EXE) + ${BSD_INSTALL_SCRIPT} ocamldep $(BINDIR)/ocamldep$(EXE) # The profiler @