Import of pkgsrc-2015Q1

devel/ocaml-findlib/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2014/03/12 10:29:38 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2015/01/20 15:33:55 jaapb Exp $
 
-DISTNAME=		findlib-1.4.1
-PKGNAME=		ocaml-${DISTNAME}
+DISTNAME=		findlib-1.5.5
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
@@ -10,29 +10,28 @@ HOMEPAGE=		http://www.camlcity.org/
 COMMENT=		Library finder for OCaml
 LICENSE=		mit
 
+MAKE_JOBS_SAFE=		no
+
+.include "../../mk/ocaml.mk"
+
 USE_TOOLS+=		gmake m4 bash
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
-MAKE_JOBS_SAFE=		no
 CONFIGURE_ARGS+=	-bindir ${PREFIX}/bin
 CONFIGURE_ARGS+=	-mandir ${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	-config ${PKG_SYSCONFDIR}/ocamlfind.conf
-CONFIGURE_ARGS+=	-sitelib ${PREFIX}/lib/ocaml/site-lib
+CONFIGURE_ARGS+=	-sitelib ${PREFIX}/${OCAML_SITELIBDIR}
+CONFIGURE_ARGS+=	-no-camlp4
+
 
 BUILD_TARGET=		all
-PLIST_SRC=		PLIST
-
-PLIST_VARS=		opt
-.include "../../mk/bsd.prefs.mk"
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=		yes
-BUILD_TARGET+=		opt
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+BUILD_TARGET+=	opt
 .endif
 
 EGDIR=			${PREFIX}/share/examples/ocaml-findlib
 INSTALL_MAKE_FLAGS+=	OCAMLFIND_CONF=${EGDIR}/ocamlfind.conf
-INSTALLATION_DIRS=	libexec bin
+INSTALLATION_DIRS=	lib/ocaml libexec bin
 
 CONF_FILES=		${EGDIR}/ocamlfind.conf ${PKG_SYSCONFDIR}/ocamlfind.conf
 
@@ -58,5 +57,4 @@ post-install:
 do-test:
 	${RUN} cd ${WRKSRC}; ${SH} itest
 
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

devel/ocaml-findlib/PLIST

@@ -1,36 +1,36 @@
-@comment $NetBSD: PLIST,v 1.7 2013/07/06 10:55:38 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/10/09 20:53:15 jaapb Exp $
 bin/ocamlfind
-bin/safe_camlp4
-lib/ocaml/site-lib/bigarray/META
-lib/ocaml/site-lib/camlp4/META
-lib/ocaml/site-lib/compiler-libs/META
-lib/ocaml/site-lib/dynlink/META
-lib/ocaml/site-lib/findlib/META
-lib/ocaml/site-lib/findlib/Makefile.config
-${PLIST.opt}lib/ocaml/site-lib/findlib/findlib.a
-lib/ocaml/site-lib/findlib/findlib.cma
-${PLIST.opt}lib/ocaml/site-lib/findlib/findlib.cmxa
-lib/ocaml/site-lib/findlib/findlib.cmi
-lib/ocaml/site-lib/findlib/findlib.mli
-lib/ocaml/site-lib/findlib/findlib_top.cma
-lib/ocaml/site-lib/findlib/fl_metascanner.cmi
-lib/ocaml/site-lib/findlib/fl_metascanner.mli
-lib/ocaml/site-lib/findlib/fl_metatoken.cmi
-lib/ocaml/site-lib/findlib/fl_package_base.cmi
-lib/ocaml/site-lib/findlib/fl_package_base.mli
-lib/ocaml/site-lib/findlib/topfind.cmi
-lib/ocaml/site-lib/findlib/topfind.mli
-lib/ocaml/site-lib/graphics/META
-lib/ocaml/site-lib/num-top/META
-lib/ocaml/site-lib/num-top/num_top.cma
-lib/ocaml/site-lib/num-top/num_top.cmi
-lib/ocaml/site-lib/num-top/num_top_printers.cmi
-lib/ocaml/site-lib/num/META
-lib/ocaml/site-lib/ocamlbuild/META
-lib/ocaml/site-lib/stdlib/META
-lib/ocaml/site-lib/str/META
-lib/ocaml/site-lib/threads/META
-lib/ocaml/site-lib/unix/META
+${OCAML_SITELIB}/bigarray/META
+${OCAML_SITELIB}/bytes/META
+${OCAML_SITELIB}/compiler-libs/META
+${OCAML_SITELIB}/dynlink/META
+${OCAML_SITELIB}/findlib/META
+${OCAML_SITELIB}/findlib/Makefile.config
+${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a
+${OCAML_SITELIB}/findlib/findlib.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs
+${OCAML_SITELIB}/findlib/findlib.cmi
+${OCAML_SITELIB}/findlib/findlib.mli
+${OCAML_SITELIB}/findlib/findlib_top.cma
+${OCAML_SITELIB}/findlib/fl_metascanner.cmi
+${OCAML_SITELIB}/findlib/fl_metascanner.mli
+${OCAML_SITELIB}/findlib/fl_metatoken.cmi
+${OCAML_SITELIB}/findlib/fl_package_base.cmi
+${OCAML_SITELIB}/findlib/fl_package_base.mli
+${OCAML_SITELIB}/findlib/topfind.cmi
+${OCAML_SITELIB}/findlib/topfind.mli
+${OCAML_SITELIB}/graphics/META
+${OCAML_SITELIB}/num-top/META
+${OCAML_SITELIB}/num-top/num_top.cma
+${OCAML_SITELIB}/num-top/num_top.cmi
+${OCAML_SITELIB}/num-top/num_top_printers.cmi
+${OCAML_SITELIB}/num/META
+${OCAML_SITELIB}/ocamlbuild/META
+${OCAML_SITELIB}/stdlib/META
+${OCAML_SITELIB}/str/META
+${OCAML_SITELIB}/threads/META
+${OCAML_SITELIB}/unix/META
 lib/ocaml/topfind
 libexec/ocaml-findlib-register
 man/man1/ocamlfind.1

devel/ocaml-findlib/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2012/07/06 09:22:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2014/04/13 10:39:01 hiramatsu Exp $
 
 BUILDLINK_TREE+=	ocaml-findlib
 
@@ -15,6 +15,7 @@ BUILDLINK_TARGETS+=	ocaml-findlib-wrappers ocaml-findlib-ldconf
 ocaml-findlib-wrappers:
 	${RUN}								\
 	${SED}	-e 's|@SH@|'${SH:Q}'|g'					\
+		-e 's|@DESTDIR@|${DESTDIR}|g'				\
 		-e 's|@OCAML_FINDLIB_PREFIX@|${BUILDLINK_PREFIX.ocaml-findlib}|g' \
 		-e 's|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g'		\
 		< ${.CURDIR}/../../devel/ocaml-findlib/files/ocamlfind.sh \

devel/ocaml-findlib/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2014/03/12 10:29:38 wiz Exp $
+$NetBSD: distinfo,v 1.11 2014/11/20 16:07:03 wiz Exp $
 
-SHA1 (findlib-1.4.1.tar.gz) = c8a4568826ea2469230d4f1fb9493cb0c6f60f36
-RMD160 (findlib-1.4.1.tar.gz) = 2380050b0706eb4bfad1f1379fb913efbee70c2e
-Size (findlib-1.4.1.tar.gz) = 231647 bytes
-SHA1 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823
-SHA1 (patch-configure) = 393bffc3f102b8af9d0cda1616c6e9d133646edd
-SHA1 (patch-src_findlib_Makefile) = be49342260bd27365716f5a05632c98904533276
+SHA1 (findlib-1.5.5.tar.gz) = 3221121c4b5adacc050aa361475eee59b2698afa
+RMD160 (findlib-1.5.5.tar.gz) = 4dd077e963b7a72ce9bd716ee497f8555b182139
+Size (findlib-1.5.5.tar.gz) = 240247 bytes
+SHA1 (patch-Makefile) = 3bc4725ce54e7a9a5698fc4930f2fb577c3f5806
+SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881
+SHA1 (patch-src_findlib_Makefile) = 7edc22fa7f34319dfed151bb6ffef2caa0fd65dc

devel/ocaml-findlib/files/ocamlfind.sh

@@ -1,26 +1,25 @@
 #!@SH@
 
-# $NetBSD: ocamlfind.sh,v 1.1 2011/06/15 05:25:47 uebayasi Exp $
+# $NetBSD: ocamlfind.sh,v 1.5 2014/10/31 01:00:30 hiramatsu Exp $
 
-args="$@"
-case "$args" in
-*install*)
-	install_args=
-	case "$args" in
-	*-destdir*) ;;
-	*)
-		install_args="${install_args} -destdir ${DESTDIR}@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib"
-		;;
-	esac
-	case "$args" in
-	*-ldconf*) ;;
-	*)
-		install_args="${install_args} -ldconf @BUILDLINK_DIR@/lib/ocaml/ld.conf"
-		;;
-	esac
-	args="${args%%install*}install ${install_args}${args##*install}"
-	;;
-*) ;;
-esac
-
-exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" ${args}
+if [ "$1" = install ]; then
+	need_destdir=yes
+	need_ldconf=yes
+	for arg in "$@"; do
+		case "$arg" in
+		-destdir)
+			need_destdir=no
+			;;
+		-ldconf)
+			need_ldconf=no
+			;;
+		esac
+	done
+	if [ "$need_destdir" = "yes" ]; then
+		set -- "$@" -destdir "@DESTDIR@@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib"
+	fi
+	if [ "$need_ldconf" = "yes" ]; then
+		set -- "$@" -ldconf "@BUILDLINK_DIR@/lib/ocaml/ld.conf"
+	fi
+fi
+exec "@OCAML_FINDLIB_PREFIX@/bin/`basename $0`" "$@"

devel/ocaml-findlib/patches/patch-Makefile

@@ -1,57 +1,58 @@
-$NetBSD: patch-Makefile,v 1.1 2012/07/06 09:22:04 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2014/10/09 20:53:15 jaapb Exp $
 
-make package support DESTDIR
---- Makefile.orig	2010-08-17 22:50:28.000000000 +0400
-+++ Makefile	2010-08-21 19:10:59.000000000 +0400
-@@ -17,13 +17,13 @@
- 	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
+make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp
+--- Makefile.orig	2014-09-16 11:21:45.000000000 +0000
++++ Makefile
+@@ -17,14 +17,14 @@ opt:
+ 	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
  
  install:
 -	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 -	mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
-+	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
-+	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
++	$(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
++	$(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
+ 	$(MAKE) install-config
  	for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
  	$(MAKE) install-meta
  	cd src/findlib; $(MAKE) install-num-top
- 	$(MAKE) install-config
--	cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
-+	cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ 	if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
+-		cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
++		$(BSD_INSTALL_SCRIPT) tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
+ 	fi
  	$(MAKE) install-doc
  
- uninstall:
-@@ -66,9 +66,9 @@
+@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
  
  .PHONY: install-doc
  install-doc:
 -	mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
 -	-cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
 -	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
-+	mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
-+	-cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
-+	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
++	-$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
++	-$(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
  
  .PHONY: uninstall-doc
  uninstall-doc:
-@@ -81,7 +81,7 @@
+@@ -86,7 +86,7 @@ uninstall-doc:
  
  .PHONY: install-meta
  install-meta:
 -	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
-+	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
++	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
  
  .PHONY: uninstall-meta
  uninstall-meta:
-@@ -89,9 +89,9 @@
+@@ -94,9 +94,9 @@ uninstall-meta:
  
  .PHONY: install-config
  install-config:
 -	mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
 -	@if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
 -	test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
-+	mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
++	$(BSD_INSTALL_DATA_DIR) "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
 +	@if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
-+	test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
++	test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || $(BSD_INSTALL_DATA) findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
  
  .PHONY: uninstall-config
  uninstall-config:

devel/ocaml-findlib/patches/patch-configure

@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.1 2013/07/06 10:55:38 jaapb Exp $
+$NetBSD: patch-configure,v 1.2 2014/10/09 20:53:15 jaapb Exp $
 
 Do not install dbm META file even if dbm is present
---- configure.orig	2013-06-11 07:27:39.000000000 +0000
+--- configure.orig	2014-09-16 11:21:45.000000000 +0000
 +++ configure
-@@ -469,13 +469,13 @@ fi
+@@ -479,13 +479,13 @@ fi
  
  # dbm?
  
@@ -12,14 +12,14 @@ Do not install dbm META file even if dbm is present
 -    ldbm="dbm"
 -else
 -    echo "dbm: not present (normal since OCaml-4.00)"
-+# if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
-+#     echo "dbm: found"
-+#     ldbm="dbm"
-+# else
-+#     echo "dbm: not present (normal since OCaml-4.00)"
++#if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
++#    echo "dbm: found"
++#    ldbm="dbm"
++#else
++#    echo "dbm: not present (normal since OCaml-4.00)"
      ldbm=""
 -fi
-+# fi
++#fi
  
+ # bytes?
  
- # Generate the META files now.

devel/ocaml-findlib/patches/patch-src_findlib_Makefile

@@ -1,10 +1,10 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.3 2013/07/05 13:57:58 jaapb Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.5 2014/11/20 16:07:03 wiz Exp $
 
 Install into DESTDIR, use BSD install commands
---- src/findlib/Makefile.orig	2013-06-11 07:27:39.000000000 +0000
+--- src/findlib/Makefile.orig	2014-10-23 10:08:26.000000000 +0000
 +++ src/findlib/Makefile
-@@ -84,23 +84,24 @@ clean:
- 	#rm -f ocaml_args.ml
+@@ -97,23 +97,24 @@ clean:
+ 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
  
  install: all
 -	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
@@ -13,8 +13,8 @@ Install into DESTDIR, use BSD install commands
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 +	test $(INSTALL_TOPFIND) -eq 0 || \
-+	  $(BSD_INSTALL_SCRIPT) 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` && \
++		$(BSD_INSTALL_SCRIPT) 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 findlib.cmxs META` && \
 -	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +	$(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
  	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \