- Install expunge script with right permissions [1]

- needed to take the MAN()!= out because it causes multiple background shells and can hurt INDEX performance [2]

PR:		ports/163275 [1]
Approved by:	gabor (mentor) [2]

6 files changed, 110 insertions, 102 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 62735fb2217a..6dba2babc5b9 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -48,9 +48,7 @@ PLIST_SUB+=	PROF="@comment "
 PLIST_SUB+=	PROF=""
 .endif
 
-MAN1!=	${CAT} ${FILESDIR}/man1
-MANN!=	${CAT} ${FILESDIR}/mann
-MLINKS!=${CAT} ${FILESDIR}/manlinks
+.include "${FILESDIR}/manfiles"
 
 .if !defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS=""
diff --git a/lang/ocaml/files/man1 b/lang/ocaml/files/man1
deleted file mode 100644
index c7dbf91d14bf..000000000000
--- a/lang/ocaml/files/man1
+++ /dev/null
@@ -1,13 +0,0 @@
-ocaml.1
-ocamlbuild.1
-ocamlc.1
-ocamlcp.1
-ocamldebug.1
-ocamldep.1
-ocamldoc.1
-ocamllex.1
-ocamlmktop.1
-ocamlopt.1
-ocamlprof.1
-ocamlrun.1
-ocamlyacc.1
diff --git a/lang/ocaml/files/manfiles b/lang/ocaml/files/manfiles
new file mode 100644
index 000000000000..c19f86fbc761
--- /dev/null
+++ b/lang/ocaml/files/manfiles
@@ -0,0 +1,98 @@
+MAN1=	ocaml.1 \
+	ocamlbuild.1 \
+	ocamlc.1 \
+	ocamlcp.1 \
+	ocamldebug.1 \
+	ocamldep.1 \
+	ocamldoc.1 \
+	ocamllex.1 \
+	ocamlmktop.1 \
+	ocamlopt.1 \
+	ocamlprof.1 \
+	ocamlrun.1 \
+	ocamlyacc.1
+
+MANN=	Arg.n \
+	Array.n \
+	ArrayLabels.n \
+	Bigarray.Array1.n \
+	Bigarray.Array2.n \
+	Bigarray.Array3.n \
+	Bigarray.Genarray.n \
+	Bigarray.n \
+	Buffer.n \
+	Callback.n \
+	CamlinternalOO.n \
+	CamlinternalLazy.n \
+	CamlinternalMod.n \
+	Char.n \
+	Complex.n \
+	Digest.n \
+	Filename.n \
+	Format.n \
+	Gc.n \
+	Genlex.n \
+	Hashtbl.HashedType.n \
+	Hashtbl.Make.n \
+	Hashtbl.S.n \
+	Hashtbl.n \
+	Int32.n \
+	Int64.n \
+	Lazy.n \
+	Lexing.n \
+	List.n \
+	ListLabels.n \
+	Map.Make.n \
+	Map.OrderedType.n \
+	Map.S.n \
+	Map.n \
+	Marshal.n \
+	MoreLabels.Hashtbl.HashedType.n \
+	MoreLabels.Hashtbl.Make.n \
+	MoreLabels.Hashtbl.S.n \
+	MoreLabels.Hashtbl.n \
+	MoreLabels.Map.Make.n \
+	MoreLabels.Map.OrderedType.n \
+	MoreLabels.Map.S.n \
+	MoreLabels.Map.n \
+	MoreLabels.Set.Make.n \
+	MoreLabels.Set.OrderedType.n \
+	MoreLabels.Set.S.n \
+	MoreLabels.Set.n \
+	MoreLabels.n \
+	Nativeint.n \
+	Num.n \
+	Obj.n \
+	Oo.n \
+	Parsing.n \
+	Pervasives.LargeFile.n \
+	Pervasives.n \
+	Printexc.n \
+	Printf.n \
+	Queue.n \
+	Random.n \
+	Random.State.n \
+	Scanf.Scanning.n \
+	Scanf.n \
+	Set.Make.n \
+	Set.OrderedType.n \
+	Set.S.n \
+	Set.n \
+	Sort.n \
+	Stack.n \
+	StdLabels.Array.n \
+	StdLabels.List.n \
+	StdLabels.String.n \
+	StdLabels.n \
+	Str.n \
+	Stream.n \
+	String.n \
+	StringLabels.n \
+	Sys.n \
+	Unix.LargeFile.n \
+	Unix.n \
+	Weak.Make.n \
+	Weak.S.n \
+	Weak.n
+
+MLINKS=	ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1
diff --git a/lang/ocaml/files/manlinks b/lang/ocaml/files/manlinks
deleted file mode 100644
index f2a700858794..000000000000
--- a/lang/ocaml/files/manlinks
+++ /dev/null
@@ -1,4 +0,0 @@
-ocamlc.1
-ocamlc.opt.1
-ocamlopt.1
-ocamlopt.opt.1
diff --git a/lang/ocaml/files/mann b/lang/ocaml/files/mann
deleted file mode 100644
index 8540f41cb8ab..000000000000
--- a/lang/ocaml/files/mann
+++ /dev/null
@@ -1,82 +0,0 @@
-Arg.n
-Array.n
-ArrayLabels.n
-Bigarray.Array1.n
-Bigarray.Array2.n
-Bigarray.Array3.n
-Bigarray.Genarray.n
-Bigarray.n
-Buffer.n
-Callback.n
-CamlinternalOO.n
-Char.n
-Complex.n
-Digest.n
-Filename.n
-Format.n
-Gc.n
-Genlex.n
-Hashtbl.HashedType.n
-Hashtbl.Make.n
-Hashtbl.S.n
-Hashtbl.n
-Int32.n
-Int64.n
-Lazy.n
-Lexing.n
-List.n
-ListLabels.n
-Map.Make.n
-Map.OrderedType.n
-Map.S.n
-Map.n
-Marshal.n
-MoreLabels.Hashtbl.HashedType.n
-MoreLabels.Hashtbl.Make.n
-MoreLabels.Hashtbl.S.n
-MoreLabels.Hashtbl.n
-MoreLabels.Map.Make.n
-MoreLabels.Map.OrderedType.n
-MoreLabels.Map.S.n
-MoreLabels.Map.n
-MoreLabels.Set.Make.n
-MoreLabels.Set.OrderedType.n
-MoreLabels.Set.S.n
-MoreLabels.Set.n
-MoreLabels.n
-Nativeint.n
-Num.n
-Obj.n
-Oo.n
-Parsing.n
-Pervasives.LargeFile.n
-Pervasives.n
-Printexc.n
-Printf.n
-Queue.n
-Random.n
-Random.State.n
-Scanf.Scanning.n
-Scanf.n
-Set.Make.n
-Set.OrderedType.n
-Set.S.n
-Set.n
-Sort.n
-Stack.n
-StdLabels.Array.n
-StdLabels.List.n
-StdLabels.String.n
-StdLabels.n
-Str.n
-Stream.n
-String.n
-StringLabels.n
-Sys.n
-Unix.LargeFile.n
-Unix.n
-Weak.Make.n
-Weak.S.n
-Weak.n
-CamlinternalMod.n
-CamlinternalLazy.n
diff --git a/lang/ocaml/files/patch-Makefile b/lang/ocaml/files/patch-Makefile
new file mode 100644
index 000000000000..1da3b2fac31e
--- /dev/null
+++ b/lang/ocaml/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2010-06-16 03:32:26.000000000 +0200
++++ Makefile	2011-12-14 10:02:05.745076468 +0100
+@@ -288,7 +288,7 @@
+ 	cp lex/ocamllex $(BINDIR)/ocamllex$(EXE)
+ 	cp yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE)
+ 	cp toplevel/toplevellib.cma $(LIBDIR)/toplevellib.cma
+-	cp expunge $(LIBDIR)/expunge$(EXE)
++	${BSD_INSTALL_SCRIPT} expunge $(LIBDIR)/expunge$(EXE)
+ 	cp typing/outcometree.cmi typing/outcometree.mli $(LIBDIR)
+ 	cp toplevel/topstart.cmo $(LIBDIR)
+ 	cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \