svn commit: r385056 - in head/devel/ocaml-findlib: . files

[Johan van Selst]

Author: johans
Date: Thu Apr 30 19:37:06 2015
New Revision: 385056
URL: https://svnweb.freebsd.org/changeset/ports/385056

Log:
  - Update plist for new ocaml release
  - Rebuild patch files to get rid of portlint warnings

Modified:
  head/devel/ocaml-findlib/Makefile
  head/devel/ocaml-findlib/files/patch-Makefile
  head/devel/ocaml-findlib/files/patch-src__bytes__Makefile
  head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
  head/devel/ocaml-findlib/files/patch-src_findlib_Makefile
  head/devel/ocaml-findlib/pkg-plist

Modified: head/devel/ocaml-findlib/Makefile
==============================================================================
--- head/devel/ocaml-findlib/Makefile	Thu Apr 30 19:34:46 2015	(r385055)
+++ head/devel/ocaml-findlib/Makefile	Thu Apr 30 19:37:06 2015	(r385056)
@@ -3,6 +3,7 @@
 
 PORTNAME=	findlib
 PORTVERSION=	1.5.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-

Modified: head/devel/ocaml-findlib/files/patch-Makefile
==============================================================================
--- head/devel/ocaml-findlib/files/patch-Makefile	Thu Apr 30 19:34:46 2015	(r385055)
+++ head/devel/ocaml-findlib/files/patch-Makefile	Thu Apr 30 19:37:06 2015	(r385056)
@@ -1,7 +1,7 @@
---- Makefile.orig	2014-06-25 12:23:05.000000000 +0200
-+++ Makefile	2014-06-28 20:36:14.000000000 +0200
+--- Makefile.orig	2014-10-23 10:08:26 UTC
++++ Makefile
 @@ -17,14 +17,14 @@ opt:
- 	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
+ 	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
  
  install:
 -	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"

Modified: head/devel/ocaml-findlib/files/patch-src__bytes__Makefile
==============================================================================
--- head/devel/ocaml-findlib/files/patch-src__bytes__Makefile	Thu Apr 30 19:34:46 2015	(r385055)
+++ head/devel/ocaml-findlib/files/patch-src__bytes__Makefile	Thu Apr 30 19:37:06 2015	(r385056)
@@ -1,6 +1,6 @@
---- src/bytes/Makefile.orig	2014-09-16 11:21:46 UTC
+--- src/bytes/Makefile.orig	2014-10-23 10:08:26 UTC
 +++ src/bytes/Makefile
-@@ -19,9 +19,9 @@
+@@ -19,9 +19,9 @@ opt:
  	$(OCAMLBUILD) $$files
  
  install: all

Modified: head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
==============================================================================
--- head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile	Thu Apr 30 19:34:46 2015	(r385055)
+++ head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile	Thu Apr 30 19:37:06 2015	(r385056)
@@ -1,5 +1,5 @@
---- src/findlib-toolbox/Makefile.orig	2014-06-25 12:23:06.000000000 +0200
-+++ src/findlib-toolbox/Makefile	2014-06-28 20:52:29.000000000 +0200
+--- src/findlib-toolbox/Makefile.orig	2014-10-23 10:08:26 UTC
++++ src/findlib-toolbox/Makefile
 @@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
  	 	findlib.cma make_wizard.ml
  

Modified: head/devel/ocaml-findlib/files/patch-src_findlib_Makefile
==============================================================================
--- head/devel/ocaml-findlib/files/patch-src_findlib_Makefile	Thu Apr 30 19:34:46 2015	(r385055)
+++ head/devel/ocaml-findlib/files/patch-src_findlib_Makefile	Thu Apr 30 19:37:06 2015	(r385056)
@@ -1,5 +1,5 @@
---- src/findlib/Makefile.orig	2014-06-25 12:23:06.000000000 +0200
-+++ src/findlib/Makefile	2014-06-29 13:48:58.000000000 +0200
+--- src/findlib/Makefile.orig	2014-10-23 10:08:26 UTC
++++ src/findlib/Makefile
 @@ -19,6 +19,7 @@ OCAMLDEP = ocamldep
  OCAMLLEX = ocamllex
  #CAMLP4O =  camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
@@ -8,8 +8,8 @@
  
  
  OBJECTS        = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \
-@@ -87,23 +88,23 @@ clean:
- 	#rm -f ocaml_args.ml
+@@ -97,23 +98,23 @@ clean:
+ 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
  
  install: all
 -	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"

Modified: head/devel/ocaml-findlib/pkg-plist
==============================================================================
--- head/devel/ocaml-findlib/pkg-plist	Thu Apr 30 19:34:46 2015	(r385055)
+++ head/devel/ocaml-findlib/pkg-plist	Thu Apr 30 19:37:06 2015	(r385056)
@@ -1,15 +1,7 @@
 bin/ocamlfind
-bin/safe_camlp4
 %%ETCDIR%%.conf
 %%OCAML_SITELIBDIR%%/bigarray/META
 %%OCAML_SITELIBDIR%%/bytes/META
-%%OCAML_SITELIBDIR%%/bytes/bytes.a
-%%OCAML_SITELIBDIR%%/bytes/bytes.cma
-%%OCAML_SITELIBDIR%%/bytes/bytes.cmi
-%%OCAML_SITELIBDIR%%/bytes/bytes.cmx
-%%OCAML_SITELIBDIR%%/bytes/bytes.cmxa
-%%OCAML_SITELIBDIR%%/bytes/bytes.cmxs
-%%OCAML_SITELIBDIR%%/camlp4/META
 %%OCAML_SITELIBDIR%%/compiler-libs/META
 %%OCAML_SITELIBDIR%%/dynlink/META
 %%OCAML_SITELIBDIR%%/findlib/META
@@ -26,12 +18,9 @@ bin/safe_camlp4
 %%OCAML_SITELIBDIR%%/findlib/fl_metatoken.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_package_base.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_package_base.mli
-%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard
-%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern
 %%OCAML_SITELIBDIR%%/findlib/topfind.cmi
 %%OCAML_SITELIBDIR%%/findlib/topfind.mli
 %%OCAML_SITELIBDIR%%/graphics/META
-%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META
 %%OCAML_SITELIBDIR%%/num-top/META
 %%OCAML_SITELIBDIR%%/num-top/num_top.cma
 %%OCAML_SITELIBDIR%%/num-top/num_top.cmi