Thu Oct 9 20:53:15 2014 UTC ()
Updated package to latest version, 1.5.3. Package now uses ocaml.mk
framework, and the buildlink wrapper has been modified to deal with
quoted arguments properly.
Changes:
-  1.5.3: The installation of "bytes" respects now $prefix and  the configured
   destination.
   New option -pp for "ocamlfind query", to get preprocessor packages.
   Updated the compatibility Bytes module to support extend, init, mapi,
   blit_string (Gabriel Scherer).
-  1.5.2: support for the query formats "%+a" and "%+A".
   Fix: the "ppx" property is now also path-expanded when interpreted in a
   toploop.
   Fix: implicit "ppx" is not path-expanded anymore.
   Fix: Build bytes.cmxs only if natdynlink is enabled (Andy Ray).
-  1.5.1: includes a file that was missing in 1.5
-  1.5: Including the "bytes" package that is either a compat package for ocaml
   < 4.02 or a fake package for ocaml >= 4.02. The package aims at helping to
   support the transition to the new "bytes" type for mutable strings.
   Also installing findlib.cmxs if OCaml supports it.
   Allowing to disable camlp4 (in prep for OCaml-4.02).
   The "ppx" package property can be specified for constructing ppx-type
   preprocessors (patches from Peter Zotov).


(jaapb)
diff -r1.19 -r1.20 pkgsrc/devel/ocaml-findlib/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/ocaml-findlib/PLIST
diff -r1.9 -r1.10 pkgsrc/devel/ocaml-findlib/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/ocaml-findlib/files/ocamlfind.sh
diff -r1.1 -r1.2 pkgsrc/devel/ocaml-findlib/patches/patch-Makefile
diff -r1.1 -r1.2 pkgsrc/devel/ocaml-findlib/patches/patch-configure
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
cvs diff -r1.19 -r1.20 pkgsrc/devel/ocaml-findlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/Makefile 2014/03/12 10:29:38 1.19
+++ pkgsrc/devel/ocaml-findlib/Makefile 2014/10/09 20:53:15 1.20
@@ -1,62 +1,57 @@ @@ -1,62 +1,57 @@
1# $NetBSD: Makefile,v 1.19 2014/03/12 10:29:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2014/10/09 20:53:15 jaapb Exp $
2 2
3DISTNAME= findlib-1.4.1 3DISTNAME= findlib-1.5.3
4PKGNAME= ocaml-${DISTNAME} 
5CATEGORIES= devel 4CATEGORIES= devel
6MASTER_SITES= http://download.camlcity.org/download/ 5MASTER_SITES= http://download.camlcity.org/download/
7 6
8MAINTAINER= jaapb@NetBSD.org 7MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://www.camlcity.org/ 8HOMEPAGE= http://www.camlcity.org/
10COMMENT= Library finder for OCaml 9COMMENT= Library finder for OCaml
11LICENSE= mit 10LICENSE= mit
12 11
 12.include "../../mk/ocaml.mk"
 13
13USE_TOOLS+= gmake m4 bash 14USE_TOOLS+= gmake m4 bash
14USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
15HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
16MAKE_JOBS_SAFE= no 
17CONFIGURE_ARGS+= -bindir ${PREFIX}/bin 17CONFIGURE_ARGS+= -bindir ${PREFIX}/bin
18CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} 18CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR}
19CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf 19CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf
20CONFIGURE_ARGS+= -sitelib ${PREFIX}/lib/ocaml/site-lib 20CONFIGURE_ARGS+= -sitelib ${PREFIX}/${OCAML_SITELIBDIR}
 21CONFIGURE_ARGS+= -no-camlp4
21 22
22BUILD_TARGET= all 
23PLIST_SRC= PLIST 
24 23
25PLIST_VARS= opt 24BUILD_TARGET= all
26.include "../../mk/bsd.prefs.mk" 25.if ${OCAML_USE_OPT_COMPILER} == "yes"
27.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 26BUILD_TARGET+= opt
28 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 
29PLIST.opt= yes 
30BUILD_TARGET+= opt 
31.endif 27.endif
32 28
33EGDIR= ${PREFIX}/share/examples/ocaml-findlib 29EGDIR= ${PREFIX}/share/examples/ocaml-findlib
34INSTALL_MAKE_FLAGS+= OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf 30INSTALL_MAKE_FLAGS+= OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
35INSTALLATION_DIRS= libexec bin 31INSTALLATION_DIRS= lib/ocaml libexec bin
36 32
37CONF_FILES= ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf 33CONF_FILES= ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf
38 34
39USE_TOOLS+= fgrep:run sh:run 35USE_TOOLS+= fgrep:run sh:run
40SUBST_CLASSES+= ofr 36SUBST_CLASSES+= ofr
41SUBST_STAGE.ofr= pre-configure 37SUBST_STAGE.ofr= pre-configure
42SUBST_FILES.ofr= ocaml-findlib-register.sh 38SUBST_FILES.ofr= ocaml-findlib-register.sh
43SUBST_SED.ofr= -e 's,@SH@,'${SH:Q}',' 39SUBST_SED.ofr= -e 's,@SH@,'${SH:Q}','
44SUBST_SED.ofr+= -e 's,@PREFIX@,${PREFIX},' 40SUBST_SED.ofr+= -e 's,@PREFIX@,${PREFIX},'
45SUBST_SED.ofr+= -e 's,@FGREP@,'${FGREP:Q}',' 41SUBST_SED.ofr+= -e 's,@FGREP@,'${FGREP:Q}','
46 42
47SUBST_CLASSES+= pathes 43SUBST_CLASSES+= pathes
48SUBST_STAGE.pathes= post-install 44SUBST_STAGE.pathes= post-install
49SUBST_FILES.pathes= ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/findlib/Makefile.config 45SUBST_FILES.pathes= ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/findlib/Makefile.config
50SUBST_SED.pathes= -e 's,^\(OCAML_CORE_BIN=\).*,\1'${PREFIX:Q}/bin',' 46SUBST_SED.pathes= -e 's,^\(OCAML_CORE_BIN=\).*,\1'${PREFIX:Q}/bin','
51 47
52post-extract: 48post-extract:
53 ${CP} ${FILESDIR}/ocaml-findlib-register.sh ${WRKSRC} 49 ${CP} ${FILESDIR}/ocaml-findlib-register.sh ${WRKSRC}
54 50
55post-install: 51post-install:
56 ${INSTALL_SCRIPT} ${WRKSRC}/ocaml-findlib-register.sh ${DESTDIR}${PREFIX}/libexec/ocaml-findlib-register 52 ${INSTALL_SCRIPT} ${WRKSRC}/ocaml-findlib-register.sh ${DESTDIR}${PREFIX}/libexec/ocaml-findlib-register
57 53
58do-test: 54do-test:
59 ${RUN} cd ${WRKSRC}; ${SH} itest 55 ${RUN} cd ${WRKSRC}; ${SH} itest
60 56
61.include "../../lang/ocaml/buildlink3.mk" 
62.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/devel/ocaml-findlib/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/PLIST 2013/07/06 10:55:38 1.7
+++ pkgsrc/devel/ocaml-findlib/PLIST 2014/10/09 20:53:15 1.8
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1@comment $NetBSD: PLIST,v 1.7 2013/07/06 10:55:38 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.8 2014/10/09 20:53:15 jaapb Exp $
2bin/ocamlfind 2bin/ocamlfind
3bin/safe_camlp4 3${OCAML_SITELIB}/bigarray/META
4lib/ocaml/site-lib/bigarray/META 4${OCAML_SITELIB}/bytes/META
5lib/ocaml/site-lib/camlp4/META 5${OCAML_SITELIB}/compiler-libs/META
6lib/ocaml/site-lib/compiler-libs/META 6${OCAML_SITELIB}/dynlink/META
7lib/ocaml/site-lib/dynlink/META 7${OCAML_SITELIB}/findlib/META
8lib/ocaml/site-lib/findlib/META 8${OCAML_SITELIB}/findlib/Makefile.config
9lib/ocaml/site-lib/findlib/Makefile.config 9${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a
10${PLIST.opt}lib/ocaml/site-lib/findlib/findlib.a 10${OCAML_SITELIB}/findlib/findlib.cma
11lib/ocaml/site-lib/findlib/findlib.cma 11${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa
12${PLIST.opt}lib/ocaml/site-lib/findlib/findlib.cmxa 12${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs
13lib/ocaml/site-lib/findlib/findlib.cmi 13${OCAML_SITELIB}/findlib/findlib.cmi
14lib/ocaml/site-lib/findlib/findlib.mli 14${OCAML_SITELIB}/findlib/findlib.mli
15lib/ocaml/site-lib/findlib/findlib_top.cma 15${OCAML_SITELIB}/findlib/findlib_top.cma
16lib/ocaml/site-lib/findlib/fl_metascanner.cmi 16${OCAML_SITELIB}/findlib/fl_metascanner.cmi
17lib/ocaml/site-lib/findlib/fl_metascanner.mli 17${OCAML_SITELIB}/findlib/fl_metascanner.mli
18lib/ocaml/site-lib/findlib/fl_metatoken.cmi 18${OCAML_SITELIB}/findlib/fl_metatoken.cmi
19lib/ocaml/site-lib/findlib/fl_package_base.cmi 19${OCAML_SITELIB}/findlib/fl_package_base.cmi
20lib/ocaml/site-lib/findlib/fl_package_base.mli 20${OCAML_SITELIB}/findlib/fl_package_base.mli
21lib/ocaml/site-lib/findlib/topfind.cmi 21${OCAML_SITELIB}/findlib/topfind.cmi
22lib/ocaml/site-lib/findlib/topfind.mli 22${OCAML_SITELIB}/findlib/topfind.mli
23lib/ocaml/site-lib/graphics/META 23${OCAML_SITELIB}/graphics/META
24lib/ocaml/site-lib/num-top/META 24${OCAML_SITELIB}/num-top/META
25lib/ocaml/site-lib/num-top/num_top.cma 25${OCAML_SITELIB}/num-top/num_top.cma
26lib/ocaml/site-lib/num-top/num_top.cmi 26${OCAML_SITELIB}/num-top/num_top.cmi
27lib/ocaml/site-lib/num-top/num_top_printers.cmi 27${OCAML_SITELIB}/num-top/num_top_printers.cmi
28lib/ocaml/site-lib/num/META 28${OCAML_SITELIB}/num/META
29lib/ocaml/site-lib/ocamlbuild/META 29${OCAML_SITELIB}/ocamlbuild/META
30lib/ocaml/site-lib/stdlib/META 30${OCAML_SITELIB}/stdlib/META
31lib/ocaml/site-lib/str/META 31${OCAML_SITELIB}/str/META
32lib/ocaml/site-lib/threads/META 32${OCAML_SITELIB}/threads/META
33lib/ocaml/site-lib/unix/META 33${OCAML_SITELIB}/unix/META
34lib/ocaml/topfind 34lib/ocaml/topfind
35libexec/ocaml-findlib-register 35libexec/ocaml-findlib-register
36man/man1/ocamlfind.1 36man/man1/ocamlfind.1
37man/man5/META.5 37man/man5/META.5
38man/man5/findlib.conf.5 38man/man5/findlib.conf.5
39man/man5/site-lib.5 39man/man5/site-lib.5
40share/examples/ocaml-findlib/ocamlfind.conf 40share/examples/ocaml-findlib/ocamlfind.conf
cvs diff -r1.9 -r1.10 pkgsrc/devel/ocaml-findlib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/distinfo 2014/03/12 10:29:38 1.9
+++ pkgsrc/devel/ocaml-findlib/distinfo 2014/10/09 20:53:15 1.10
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.9 2014/03/12 10:29:38 wiz Exp $ 1$NetBSD: distinfo,v 1.10 2014/10/09 20:53:15 jaapb Exp $
2 2
3SHA1 (findlib-1.4.1.tar.gz) = c8a4568826ea2469230d4f1fb9493cb0c6f60f36 3SHA1 (findlib-1.5.3.tar.gz) = d0d0d80f7ad0f4fa102b3d7454178fb7445af173
4RMD160 (findlib-1.4.1.tar.gz) = 2380050b0706eb4bfad1f1379fb913efbee70c2e 4RMD160 (findlib-1.5.3.tar.gz) = 4d07126a0d6ff27bebcb8de1ad14809b6759edd1
5Size (findlib-1.4.1.tar.gz) = 231647 bytes 5Size (findlib-1.5.3.tar.gz) = 238507 bytes
6SHA1 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823 6SHA1 (patch-Makefile) = 3bc4725ce54e7a9a5698fc4930f2fb577c3f5806
7SHA1 (patch-configure) = 393bffc3f102b8af9d0cda1616c6e9d133646edd 7SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881
8SHA1 (patch-src_findlib_Makefile) = be49342260bd27365716f5a05632c98904533276 8SHA1 (patch-src_findlib_Makefile) = 69c4443316fb132a757bd2918b5f3ff413ab7028
cvs diff -r1.2 -r1.3 pkgsrc/devel/ocaml-findlib/files/ocamlfind.sh (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/files/ocamlfind.sh 2014/04/13 10:39:01 1.2
+++ pkgsrc/devel/ocaml-findlib/files/ocamlfind.sh 2014/10/09 20:53:15 1.3
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1#!@SH@ 1#!@SH@
2 2
3# $NetBSD: ocamlfind.sh,v 1.2 2014/04/13 10:39:01 hiramatsu Exp $ 3# $NetBSD: ocamlfind.sh,v 1.3 2014/10/09 20:53:15 jaapb Exp $
4 4
5args="$@" 5case "$@" in
6case "$args" in 
7*install*) 6*install*)
 7 args="$@"
8 install_args= 8 install_args=
9 case "$args" in 9 case "$args" in
10 *-destdir*) ;; 10 *-destdir*) ;;
11 *) 11 *)
12 install_args="${install_args} -destdir @DESTDIR@@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib" 12 install_args="${install_args} -destdir @DESTDIR@@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib"
13 ;; 13 ;;
14 esac 14 esac
15 case "$args" in 15 case "$args" in
16 *-ldconf*) ;; 16 *-ldconf*) ;;
17 *) 17 *)
18 install_args="${install_args} -ldconf @BUILDLINK_DIR@/lib/ocaml/ld.conf" 18 install_args="${install_args} -ldconf @BUILDLINK_DIR@/lib/ocaml/ld.conf"
19 ;; 19 ;;
20 esac 20 esac
21 args="${args%%install*}install ${install_args}${args##*install}" 21 args="${args%%install*}install ${install_args}${args##*install}"
 22 exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" ${args}
 23 ;;
 24*)
 25 exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" "$@"
22 ;; 26 ;;
23*) ;; 
24esac 27esac
25 28
26exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" ${args} 
cvs diff -r1.1 -r1.2 pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile 2012/07/06 09:22:04 1.1
+++ pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile 2014/10/09 20:53:15 1.2
@@ -1,57 +1,58 @@ @@ -1,57 +1,58 @@
1$NetBSD: patch-Makefile,v 1.1 2012/07/06 09:22:04 wiz Exp $ 1$NetBSD: patch-Makefile,v 1.2 2014/10/09 20:53:15 jaapb Exp $
2 2
3make package support DESTDIR 3make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp
4--- Makefile.orig 2010-08-17 22:50:28.000000000 +0400 4--- Makefile.orig 2014-09-16 11:21:45.000000000 +0000
5+++ Makefile 2010-08-21 19:10:59.000000000 +0400 5+++ Makefile
6@@ -17,13 +17,13 @@ 6@@ -17,14 +17,14 @@ opt:
7 for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done 7 for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
8  8
9 install: 9 install:
10- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" 10- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
11- mkdir -p "$(prefix)$(OCAMLFIND_MAN)" 11- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
12+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" 12+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
13+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)" 13+ $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
 14 $(MAKE) install-config
14 for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done 15 for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
15 $(MAKE) install-meta 16 $(MAKE) install-meta
16 cd src/findlib; $(MAKE) install-num-top 17 cd src/findlib; $(MAKE) install-num-top
17 $(MAKE) install-config 18 if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
18- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)" 19- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
19+ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" 20+ $(BSD_INSTALL_SCRIPT) tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
 21 fi
20 $(MAKE) install-doc 22 $(MAKE) install-doc
21  23
22 uninstall: 24@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
23@@ -66,9 +66,9 @@ 
24  25
25 .PHONY: install-doc 26 .PHONY: install-doc
26 install-doc: 27 install-doc:
27- mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5 28- mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
28- -cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1 29- -cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
29- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5 30- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
30+ mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5 31+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
31+ -cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 32+ -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
32+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5 33+ -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
33  34
34 .PHONY: uninstall-doc 35 .PHONY: uninstall-doc
35 uninstall-doc: 36 uninstall-doc:
36@@ -81,7 +81,7 @@ 37@@ -86,7 +86,7 @@ uninstall-doc:
37  38
38 .PHONY: install-meta 39 .PHONY: install-meta
39 install-meta: 40 install-meta:
40- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done 41- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
41+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done 42+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; $(BSD_INSTALL_DATA) site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
42  43
43 .PHONY: uninstall-meta 44 .PHONY: uninstall-meta
44 uninstall-meta: 45 uninstall-meta:
45@@ -89,9 +89,9 @@ 46@@ -94,9 +94,9 @@ uninstall-meta:
46  47
47 .PHONY: install-config 48 .PHONY: install-config
48 install-config: 49 install-config:
49- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`" 50- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
50- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi 51- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
51- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)" 52- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
52+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`" 53+ $(BSD_INSTALL_DATA_DIR) "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
53+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi 54+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
54+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" 55+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || $(BSD_INSTALL_DATA) findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
55  56
56 .PHONY: uninstall-config 57 .PHONY: uninstall-config
57 uninstall-config: 58 uninstall-config:
cvs diff -r1.1 -r1.2 pkgsrc/devel/ocaml-findlib/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/patch-configure 2013/07/06 10:55:38 1.1
+++ pkgsrc/devel/ocaml-findlib/patches/patch-configure 2014/10/09 20:53:15 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-configure,v 1.1 2013/07/06 10:55:38 jaapb Exp $ 1$NetBSD: patch-configure,v 1.2 2014/10/09 20:53:15 jaapb Exp $
2 2
3Do not install dbm META file even if dbm is present 3Do not install dbm META file even if dbm is present
4--- configure.orig 2013-06-11 07:27:39.000000000 +0000 4--- configure.orig 2014-09-16 11:21:45.000000000 +0000
5+++ configure 5+++ configure
6@@ -469,13 +469,13 @@ fi 6@@ -479,13 +479,13 @@ fi
7  7
8 # dbm? 8 # dbm?
9  9
10-if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then 10-if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
11- echo "dbm: found" 11- echo "dbm: found"
12- ldbm="dbm" 12- ldbm="dbm"
13-else 13-else
14- echo "dbm: not present (normal since OCaml-4.00)" 14- echo "dbm: not present (normal since OCaml-4.00)"
15+# if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then 15+#if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
16+# echo "dbm: found" 16+# echo "dbm: found"
17+# ldbm="dbm" 17+# ldbm="dbm"
18+# else 18+#else
19+# echo "dbm: not present (normal since OCaml-4.00)" 19+# echo "dbm: not present (normal since OCaml-4.00)"
20 ldbm="" 20 ldbm=""
21-fi 21-fi
22+# fi 22+#fi
23  23
 24 # bytes?
24  25
25 # Generate the META files now. 
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile 2013/07/05 13:57:58 1.3
+++ pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile 2014/10/09 20:53:15 1.4
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-src_findlib_Makefile,v 1.3 2013/07/05 13:57:58 jaapb Exp $ 1$NetBSD: patch-src_findlib_Makefile,v 1.4 2014/10/09 20:53:15 jaapb Exp $
2 2
3Install into DESTDIR, use BSD install commands 3Install into DESTDIR, use BSD install commands
4--- src/findlib/Makefile.orig 2013-06-11 07:27:39.000000000 +0000 4--- src/findlib/Makefile.orig 2014-09-16 11:21:46.000000000 +0000
5+++ src/findlib/Makefile 5+++ src/findlib/Makefile
6@@ -84,23 +84,24 @@ clean: 6@@ -87,23 +87,24 @@ clean:
7 #rm -f ocaml_args.ml 7 #rm -f ocaml_args.ml
8  8
9 install: all 9 install: all
10- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" 10- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
11- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" 11- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
12- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" 12- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
13+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" 13+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
14+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" 14+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
15+ test $(INSTALL_TOPFIND) -eq 0 || \ 15+ test $(INSTALL_TOPFIND) -eq 0 || \
16+ $(BSD_INSTALL_SCRIPT) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" 16+ $(BSD_INSTALL_SCRIPT) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
17 files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \ 17 files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \
18- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" 18- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
19+ $(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" 19+ $(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
20 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ 20 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
21- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" 21- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
22+ $(BSD_INSTALL_SCRIPT) $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" 22+ $(BSD_INSTALL_SCRIPT) $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
23 # the following "if" block is only needed for 4.00beta2 23 # the following "if" block is only needed for 4.00beta2
24 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \ 24 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
25 cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \ 25 cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
26- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ 26- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
27+ $(BSD_INSTALL_DATA) topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ 27+ $(BSD_INSTALL_DATA) topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
28 fi 28 fi
29  29
30 install-num-top: 30 install-num-top: