Sat Aug 21 15:27:31 2010 UTC ()
Update OCaml findlib to 1.2.6

Changes:

-  1.2.5: Fix: Again CR deletion... Turns out some OS do not  understand '\r'
   but only '\015' (thanks to Isaiah Weiner)
   Support for Win64 (untested; thanks to David Allsopp)
   ocamlfind no longer emits auto-generated -ccopt options. These  tend to
   accumulate, and it is possible that for large projects  the maximum command
   line length is exceeded. Current versions of  the O'Caml compilers do not
   need these extra -ccopt anyway, so  this code is completely dropped.

-  1.2.4: Fix: Bigarray needs unix (Thanks to Markus Mottl)
   Fix: In the version of camlp4 provided by O'Caml 3.11 various  libraries do
   not contain dynlink anymore. Because of this, dynlink  becomes a
   prerequisite of camlp4. (Thanks to Martin Jambon)
   Attempt: Fixing the space issue for paths (Win32). It is unclear  whether it
   is solved. (Thanks to Christophe Troestler)

-  1.2.3: Solving the CR deletion differently, to  make OS X happy.

-  1.2.2: Fix: Problem with CR character (Cygwin)  (Thanks to David Allsopp)
   Fix: Case-insensitive filesystems (partially solved)  (Thanks to David
   Allsopp)
   Fix: File name with backslashes at the end (Win32; thanks to Dmitry
   Grebeniuk)

-  1.2.1: Fix: Camlp4 rules now activate the stream parser extension

-  1.2: Fix in build scripts: Prepending $(prefix) when installing safe_camlp4
   (thanks to Daniel Janus)
   Non-existing -I directories are ignored (thanks to Nicolas Pouillard)
   A script to create a MacOS X package (thanks to Pietro Abate)
   Better support for Windows (with help from Robert Roessler and David
   Allsopp)
   Support for camlp4 on O'Caml 3.10
   Fix: "ocamlfind install" with "-patch" option writes now correct META file
   for the case that subpackages occur
   Adding environment variable OCAMLFIND_IGNORE_DUPS_IN to reduce the number of
   warnings ocamlfind emits


(asau)
diff -r1.6 -r1.7 pkgsrc/devel/ocaml-findlib/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-findlib/PLIST
diff -r1.2 -r1.3 pkgsrc/devel/ocaml-findlib/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/ocaml-findlib/patches/patch-aa
diff -r0 -r1.1 pkgsrc/devel/ocaml-findlib/patches/patch-ab

cvs diff -r1.6 -r1.7 pkgsrc/devel/ocaml-findlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/Makefile 2009/05/28 21:22:35 1.6
+++ pkgsrc/devel/ocaml-findlib/Makefile 2010/08/21 15:27:31 1.7
@@ -1,38 +1,36 @@ @@ -1,38 +1,36 @@
1# $NetBSD: Makefile,v 1.6 2009/05/28 21:22:35 zafer Exp $ 1# $NetBSD: Makefile,v 1.7 2010/08/21 15:27:31 asau Exp $
2# 2#
3 3
4DISTNAME= findlib-1.1.2pl1 4DISTNAME= findlib-1.2.6
5PKGNAME= ocaml-${DISTNAME} 5PKGNAME= ocaml-${DISTNAME}
6PKGREVISION= 2 
7CATEGORIES= devel 6CATEGORIES= devel
8MASTER_SITES= http://download.camlcity.org/download/ 7MASTER_SITES= http://download.camlcity.org/download/
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.camlcity.org/ 10HOMEPAGE= http://www.camlcity.org/
12COMMENT= Library finder for OCaml 11COMMENT= Library finder for OCaml
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16USE_TOOLS+= gmake m4 15USE_TOOLS+= gmake m4
17USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
18HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
19CONFIGURE_ARGS+= -bindir ${PREFIX}/bin 18CONFIGURE_ARGS+= -bindir ${PREFIX}/bin
20CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} 19CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR}
21CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf 20CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf
22 21
23EGDIR= ${PREFIX}/share/examples/ocaml-findlib 22EGDIR= ${PREFIX}/share/examples/ocaml-findlib
24INSTALL_MAKE_FLAGS+= OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf \ 23INSTALL_MAKE_FLAGS+= OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
25 prefix=${DESTDIR} 
26INSTALLATION_DIRS= libexec bin 24INSTALLATION_DIRS= libexec bin
27 25
28CONF_FILES= ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf 26CONF_FILES= ${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf
29 27
30USE_TOOLS+= fgrep:run sh:run 28USE_TOOLS+= fgrep:run sh:run
31SUBST_CLASSES+= ofr 29SUBST_CLASSES+= ofr
32SUBST_STAGE.ofr= pre-configure 30SUBST_STAGE.ofr= pre-configure
33SUBST_FILES.ofr= ocaml-findlib-register.sh 31SUBST_FILES.ofr= ocaml-findlib-register.sh
34SUBST_SED.ofr= -e 's,@SH@,'${SH:Q}',' 32SUBST_SED.ofr= -e 's,@SH@,'${SH:Q}','
35SUBST_SED.ofr+= -e 's,@PREFIX@,${PREFIX},' 33SUBST_SED.ofr+= -e 's,@PREFIX@,${PREFIX},'
36SUBST_SED.ofr+= -e 's,@FGREP@,'${FGREP:Q}',' 34SUBST_SED.ofr+= -e 's,@FGREP@,'${FGREP:Q}','
37 35
38SUBST_CLASSES+= pathes 36SUBST_CLASSES+= pathes

cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-findlib/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/PLIST 2009/06/14 17:49:00 1.3
+++ pkgsrc/devel/ocaml-findlib/PLIST 2010/08/21 15:27:31 1.4
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:00 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2010/08/21 15:27:31 asau Exp $
2bin/ocamlfind 2bin/ocamlfind
3bin/safe_camlp4 3bin/safe_camlp4
4lib/ocaml/site-lib/bigarray/META 4lib/ocaml/site-lib/bigarray/META
5lib/ocaml/site-lib/camlp4/META 5lib/ocaml/site-lib/camlp4/META
6lib/ocaml/site-lib/dbm/META 6lib/ocaml/site-lib/dbm/META
7lib/ocaml/site-lib/dynlink/META 7lib/ocaml/site-lib/dynlink/META
8lib/ocaml/site-lib/findlib/META 8lib/ocaml/site-lib/findlib/META
9lib/ocaml/site-lib/findlib/Makefile.config 9lib/ocaml/site-lib/findlib/Makefile.config
10lib/ocaml/site-lib/findlib/findlib.cma 10lib/ocaml/site-lib/findlib/findlib.cma
11lib/ocaml/site-lib/findlib/findlib.cmi 11lib/ocaml/site-lib/findlib/findlib.cmi
12lib/ocaml/site-lib/findlib/findlib.mli 12lib/ocaml/site-lib/findlib/findlib.mli
13lib/ocaml/site-lib/findlib/findlib_top.cma 13lib/ocaml/site-lib/findlib/findlib_top.cma
14lib/ocaml/site-lib/findlib/fl_metascanner.cmi 14lib/ocaml/site-lib/findlib/fl_metascanner.cmi
15lib/ocaml/site-lib/findlib/fl_metascanner.mli 15lib/ocaml/site-lib/findlib/fl_metascanner.mli
 16lib/ocaml/site-lib/findlib/fl_metatoken.cmi
16lib/ocaml/site-lib/findlib/fl_package_base.cmi 17lib/ocaml/site-lib/findlib/fl_package_base.cmi
17lib/ocaml/site-lib/findlib/fl_package_base.mli 18lib/ocaml/site-lib/findlib/fl_package_base.mli
18lib/ocaml/site-lib/findlib/topfind.cmi 19lib/ocaml/site-lib/findlib/topfind.cmi
19lib/ocaml/site-lib/findlib/topfind.mli 20lib/ocaml/site-lib/findlib/topfind.mli
20lib/ocaml/site-lib/graphics/META 21lib/ocaml/site-lib/graphics/META
21lib/ocaml/site-lib/num-top/META 22lib/ocaml/site-lib/num-top/META
22lib/ocaml/site-lib/num-top/num_top.cma 23lib/ocaml/site-lib/num-top/num_top.cma
23lib/ocaml/site-lib/num-top/num_top.cmi 24lib/ocaml/site-lib/num-top/num_top.cmi
24lib/ocaml/site-lib/num-top/num_top_printers.cmi 25lib/ocaml/site-lib/num-top/num_top_printers.cmi
25lib/ocaml/site-lib/num/META 26lib/ocaml/site-lib/num/META
 27lib/ocaml/site-lib/ocamlbuild/META
26lib/ocaml/site-lib/stdlib/META 28lib/ocaml/site-lib/stdlib/META
27lib/ocaml/site-lib/str/META 29lib/ocaml/site-lib/str/META
28lib/ocaml/site-lib/threads/META 30lib/ocaml/site-lib/threads/META
29lib/ocaml/site-lib/unix/META 31lib/ocaml/site-lib/unix/META
30lib/ocaml/topfind 32lib/ocaml/topfind
31libexec/ocaml-findlib-register 33libexec/ocaml-findlib-register
32man/man1/ocamlfind.1 34man/man1/ocamlfind.1
33man/man5/META.5 35man/man5/META.5
34man/man5/findlib.conf.5 36man/man5/findlib.conf.5
35man/man5/site-lib.5 37man/man5/site-lib.5
36share/examples/ocaml-findlib/ocamlfind.conf 38share/examples/ocaml-findlib/ocamlfind.conf

cvs diff -r1.2 -r1.3 pkgsrc/devel/ocaml-findlib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/distinfo 2009/02/16 16:29:18 1.2
+++ pkgsrc/devel/ocaml-findlib/distinfo 2010/08/21 15:27:31 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2009/02/16 16:29:18 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2010/08/21 15:27:31 asau Exp $
2 2
3SHA1 (findlib-1.1.2pl1.tar.gz) = ccd8b9d6249b5a4097040d32b90048b11054f461 3SHA1 (findlib-1.2.6.tar.gz) = 50d2764025168a5f3cab7f559b8fdf3cb680e405
4RMD160 (findlib-1.1.2pl1.tar.gz) = 1bd97ac60eb6ba9b3711814d38f7682a5f874cd3 4RMD160 (findlib-1.2.6.tar.gz) = 76ee6ba0cf5c4ec8693dec14fae8582ad6cd5de3
5Size (findlib-1.1.2pl1.tar.gz) = 153542 bytes 5Size (findlib-1.2.6.tar.gz) = 162458 bytes
6SHA1 (patch-aa) = deb6a80bb41d1328cbf27d44d7a194a53088a9ec 6SHA1 (patch-aa) = f11eb4120e6be80c2f225d4c2597c33aceefdce6
 7SHA1 (patch-ab) = 043d43f04c61ced0f3f9f3b6d59f89e83d6a18ee

cvs diff -r1.1 -r1.2 pkgsrc/devel/ocaml-findlib/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/Attic/patch-aa 2009/02/16 16:29:18 1.1
+++ pkgsrc/devel/ocaml-findlib/patches/Attic/patch-aa 2010/08/21 15:27:31 1.2
@@ -1,13 +1,56 @@ @@ -1,13 +1,56 @@
1$NetBSD: patch-aa,v 1.1 2009/02/16 16:29:18 joerg Exp $ 1$NetBSD: patch-aa,v 1.2 2010/08/21 15:27:31 asau Exp $
2 2
3--- Makefile.orig 2009-02-16 17:09:51.000000000 +0100 3--- Makefile.orig 2010-08-17 22:50:28.000000000 +0400
4+++ Makefile 4+++ Makefile 2010-08-21 19:10:59.000000000 +0400
5@@ -22,7 +22,7 @@ install: 5@@ -17,13 +17,13 @@
 6 for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
 7
 8 install:
 9- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 10- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
 11+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 12+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
 13 for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
6 $(MAKE) install-meta 14 $(MAKE) install-meta
7 cd src/findlib; $(MAKE) install-num-top 15 cd src/findlib; $(MAKE) install-num-top
8 $(MAKE) install-config 16 $(MAKE) install-config
9- cp tools/safe_camlp4 $(OCAMLFIND_BIN) 17- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
10+ cp tools/safe_camlp4 ${DESTDIR}$(OCAMLFIND_BIN) 18+ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 19 $(MAKE) install-doc
11  20
12 uninstall: 21 uninstall:
13 $(MAKE) uninstall-doc 22@@ -66,9 +66,9 @@
 23
 24 .PHONY: install-doc
 25 install-doc:
 26- mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
 27- -cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
 28- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
 29+ mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
 30+ -cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
 31+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
 32
 33 .PHONY: uninstall-doc
 34 uninstall-doc:
 35@@ -81,7 +81,7 @@
 36
 37 .PHONY: install-meta
 38 install-meta:
 39- 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
 40+ 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
 41
 42 .PHONY: uninstall-meta
 43 uninstall-meta:
 44@@ -89,9 +89,9 @@
 45
 46 .PHONY: install-config
 47 install-config:
 48- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
 49- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
 50- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
 51+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
 52+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
 53+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
 54
 55 .PHONY: uninstall-config
 56 uninstall-config:

File Added: pkgsrc/devel/ocaml-findlib/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.1 2010/08/21 15:27:31 asau Exp $

--- src/findlib/Makefile.orig	2010-08-17 22:50:28.000000000 +0400
+++ src/findlib/Makefile	2010-08-21 19:09:29.000000000 +0400
@@ -78,18 +78,18 @@
 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
 
 install: all
-	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
-	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
-	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
 	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` && \
-	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+	cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
-	cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
+	cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
 
 install-num-top:
-	mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
+	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
 	cp num_top.cma num_top.cmi num_top_printers.cmi \
-		"$(prefix)$(OCAML_SITELIB)/num-top"
+		"$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
 
 # Note: uninstall-num-top is part of the removal of the META files.