ports/89701: [MAINTAINER UPDATE] lang/metaocaml

Geoffrey Mainland mainland at apeiron.net
Mon Nov 28 23:20:05 UTC 2005 

>Number:         89701
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] lang/metaocaml
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 28 23:20:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Geoffrey Mainland
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD hamilton.apeiron.net 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Nov 19 16:09:49 EST 2005 toor at hamilton.apeiron.net:/usr/obj/usr/src/sys/HAMILTON i386



>Description:
	Update lang/metaocaml to 3.08.a27.
>How-To-Repeat:

>Fix:
diff -ruN /usr/ports/lang/metaocaml/Makefile metaocaml/Makefile
--- /usr/ports/lang/metaocaml/Makefile	Thu Sep 15 13:21:27 2005
+++ metaocaml/Makefile	Mon Nov 28 15:25:45 2005
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	metaocaml
-PORTVERSION=	3.08.a23
+PORTVERSION=	3.08.a27
 CATEGORIES=	lang
-MASTER_SITES=	http://www.metaocaml.org/dist/ \
-		http://www.metaocaml.org/dist/old/ \
+MASTER_SITES=	http://www.metaocaml.org/dist/old/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
-DISTNAME=	MetaOCaml_308_alpha_023
+DISTNAME=	MetaOCaml_308_alpha_027
 
 MAINTAINER=	mainland at apeiron.net
 COMMENT=	The MetaOCaml compiler and programming environment
@@ -76,9 +75,12 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
+# We would like to use bsd.tcl.mk here, but we can't USE_TCL after including
+# bsd.port.pre.mk and we can't test WITH_LABLTK before including bsd.port.pre.mk
 .if defined(WITH_LABLTK)
 LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 CONFIGURE_ARGS+=-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4"
+CONFIGURE_ARGS+=-tklibs "-L${LOCALBASE}/lib"
 PLIST_SUB+=	LABLTK=""
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=-tk-no-x11
diff -ruN /usr/ports/lang/metaocaml/distinfo metaocaml/distinfo
--- /usr/ports/lang/metaocaml/distinfo	Thu Sep 15 13:21:27 2005
+++ metaocaml/distinfo	Sun Nov 27 21:01:08 2005
@@ -1,2 +1,3 @@
-MD5 (MetaOCaml_308_alpha_023.tar.gz) = e24bf3a24bd10839f80d4b8a963c8dde
-SIZE (MetaOCaml_308_alpha_023.tar.gz) = 2643391
+MD5 (MetaOCaml_308_alpha_027.tar.gz) = cbe2ed6f3465fdd2bab138babebf8087
+SHA256 (MetaOCaml_308_alpha_027.tar.gz) = 204b1458752062d2301542acf2ef8356a1cde23d0026f281f0fc04b11be4bf82
+SIZE (MetaOCaml_308_alpha_027.tar.gz) = 2673440
diff -ruN /usr/ports/lang/metaocaml/files/patch-camlp4::man::Makefile metaocaml/files/patch-camlp4::man::Makefile
--- /usr/ports/lang/metaocaml/files/patch-camlp4::man::Makefile	Wed Dec 31 19:00:00 1969
+++ metaocaml/files/patch-camlp4::man::Makefile	Sun Nov 27 16:11:31 2005
@@ -0,0 +1,21 @@
+--- camlp4/man/Makefile.orig	Fri Mar 25 18:56:24 2005
++++ camlp4/man/Makefile	Sat Nov  5 22:27:56 2005
+@@ -3,7 +3,6 @@
+ include ../config/Makefile
+ 
+ TARGET=camlp4.1
+-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
+ 
+ all: $(TARGET)
+ 
+@@ -18,10 +17,6 @@
+ 	if test -n '$(MANDIR)'; then \
+ 	  $(MKDIR) $(MANDIR)/man1 ; \
+ 	  cp $(TARGET) $(MANDIR)/man1/. ; \
+-	  for i in $(ALIASES); do \
+-            rm -f $(MANDIR)/man1/$$i; \
+-            echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
+-          done; \
+ 	fi
+ 
+ camlp4.1: camlp4.1.tpl
diff -ruN /usr/ports/lang/metaocaml/files/patch-camlp4_man_Makefile metaocaml/files/patch-camlp4_man_Makefile
--- /usr/ports/lang/metaocaml/files/patch-camlp4_man_Makefile	Mon Jun 27 10:05:52 2005
+++ metaocaml/files/patch-camlp4_man_Makefile	Wed Dec 31 19:00:00 1969
@@ -1,21 +0,0 @@
---- camlp4/man/Makefile.orig	Sat Nov 22 17:30:44 2003
-+++ camlp4/man/Makefile	Sat Nov 22 04:48:25 2003
-@@ -3,7 +3,6 @@
- include ../config/Makefile
- 
- TARGET=camlp4.1
--ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
- 
- all: $(TARGET)
- 
-@@ -18,10 +17,6 @@
- 	if test -n '$(MANDIR)'; then \
- 	  $(MKDIR) $(MANDIR)/man1 ; \
- 	  cp $(TARGET) $(MANDIR)/man1/. ; \
--	  for i in $(ALIASES); do \
--            rm -f $(MANDIR)/man1/$$i; \
--            echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
--          done; \
- 	fi
- 
- camlp4.1: camlp4.1.tpl
diff -ruN /usr/ports/lang/metaocaml/files/patch-configure metaocaml/files/patch-configure
--- /usr/ports/lang/metaocaml/files/patch-configure	Mon Jun 27 10:05:52 2005
+++ metaocaml/files/patch-configure	Sun Nov 27 16:11:40 2005
@@ -1,6 +1,14 @@
---- configure.orig	Thu Jul 15 16:17:46 2004
-+++ configure	Thu Jul 15 16:58:51 2004
-@@ -1113,116 +1113,14 @@
+--- configure.orig	Mon Oct 17 10:20:41 2005
++++ configure	Sat Nov  5 22:40:41 2005
+@@ -653,6 +653,7 @@
+   alpha,*,digital) profiling='prof';;
+   i386,*,linux_elf) profiling='prof';;
+   i386,*,bsd_elf) profiling='prof';;
++  *,*,freebsd) profiling='prof';;
+   sparc,*,solaris)
+     profiling='prof'
+     case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
+@@ -1123,117 +1124,14 @@
  x11_include="not found"
  x11_link="not found"
  
@@ -63,6 +71,7 @@
 -    $x11_lib_dir          \
 -    $x11_try_lib_dir      \
 -                          \
+-    /usr/X11R6/lib64      \
 -    /usr/X11R6/lib        \
 -    /usr/lib/X11R6        \
 -    /usr/local/X11R6/lib  \
diff -ruN /usr/ports/lang/metaocaml/files/patch-ocamldoc::Makefile metaocaml/files/patch-ocamldoc::Makefile
--- /usr/ports/lang/metaocaml/files/patch-ocamldoc::Makefile	Wed Dec 31 19:00:00 1969
+++ metaocaml/files/patch-ocamldoc::Makefile	Sat Nov  5 22:24:05 2005
@@ -0,0 +1,22 @@
+--- ocamldoc/Makefile.orig	Sat Nov 22 17:38:34 2003
++++ ocamldoc/Makefile	Sat Nov 22 04:34:14 2003
+@@ -40,7 +40,7 @@
+ OCAMLDOC_LIBA=odoc_info.a
+ INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
+ INSTALL_BINDIR=$(OCAMLBIN)
+-INSTALL_MANODIR=$(MANDIR)/man3
++INSTALL_MANODIR=$(MANDIR)/mann
+ 
+ INSTALL_MLIS=odoc_info.mli 
+ INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
+@@ -281,7 +281,9 @@
+ 	$(CP) ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
+ 	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
+ 	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
+-	$(CP) stdlib_man/* $(INSTALL_MANODIR)
++	for f in stdlib_man/*; do \
++		$(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
++	done
+ 
+ installopt:
+ 	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
diff -ruN /usr/ports/lang/metaocaml/files/patch-ocamldoc_Makefile metaocaml/files/patch-ocamldoc_Makefile
--- /usr/ports/lang/metaocaml/files/patch-ocamldoc_Makefile	Mon Jun 27 10:05:52 2005
+++ metaocaml/files/patch-ocamldoc_Makefile	Wed Dec 31 19:00:00 1969
@@ -1,22 +0,0 @@
---- ocamldoc/Makefile.orig	Sat Nov 22 17:38:34 2003
-+++ ocamldoc/Makefile	Sat Nov 22 04:34:14 2003
-@@ -40,7 +40,7 @@
- OCAMLDOC_LIBA=odoc_info.a
- INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
- INSTALL_BINDIR=$(OCAMLBIN)
--INSTALL_MANODIR=$(MANDIR)/man3
-+INSTALL_MANODIR=$(MANDIR)/mann
- 
- INSTALL_MLIS=odoc_info.mli 
- INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
-@@ -281,7 +281,9 @@
- 	$(CP) ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
- 	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
- 	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
--	$(CP) stdlib_man/* $(INSTALL_MANODIR)
-+	for f in stdlib_man/*; do \
-+		$(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
-+	done
- 
- installopt:
- 	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
diff -ruN /usr/ports/lang/metaocaml/files/patch-stdlib::Makefile metaocaml/files/patch-stdlib::Makefile
--- /usr/ports/lang/metaocaml/files/patch-stdlib::Makefile	Wed Dec 31 19:00:00 1969
+++ metaocaml/files/patch-stdlib::Makefile	Sat Nov  5 22:24:05 2005
@@ -0,0 +1,11 @@
+--- stdlib/Makefile.orig	Sat Aug 20 02:39:05 2005
++++ stdlib/Makefile	Sat Aug 20 02:39:27 2005
+@@ -47,7 +47,7 @@
+ 	rm -f std_exit.p.cmi
+ 
+ install:
+-	cp stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
++	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
+            $(LIBDIR)
+ 
+ installopt: installopt-default installopt-$(PROFILING)
diff -ruN /usr/ports/lang/metaocaml/files/patch-stdlib_Makefile metaocaml/files/patch-stdlib_Makefile
--- /usr/ports/lang/metaocaml/files/patch-stdlib_Makefile	Thu Sep 15 13:21:27 2005
+++ metaocaml/files/patch-stdlib_Makefile	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- stdlib/Makefile.orig	Sat Aug 20 02:39:05 2005
-+++ stdlib/Makefile	Sat Aug 20 02:39:27 2005
-@@ -47,7 +47,7 @@
- 	rm -f std_exit.p.cmi
- 
- install:
--	cp stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
-+	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi  *.mli *.ml camlheader camlheader_ur \
-            $(LIBDIR)
- 
- installopt: installopt-default installopt-$(PROFILING)
diff -ruN /usr/ports/lang/metaocaml/pkg-plist metaocaml/pkg-plist
--- /usr/ports/lang/metaocaml/pkg-plist	Thu Sep 15 13:21:27 2005
+++ metaocaml/pkg-plist	Mon Nov 28 16:35:25 2005
@@ -81,6 +81,7 @@
 lib/metaocaml/lib/caml/memory.h
 lib/metaocaml/lib/caml/misc.h
 lib/metaocaml/lib/caml/mlvalues.h
+lib/metaocaml/lib/caml/printexc.h
 lib/metaocaml/lib/caml/signals.h
 lib/metaocaml/lib/camlheader
 lib/metaocaml/lib/camlheader_ur
@@ -89,6 +90,10 @@
 lib/metaocaml/lib/camlinternalOO.ml
 lib/metaocaml/lib/camlinternalOO.mli
 lib/metaocaml/lib/camlinternalOO.p.cmx
+lib/metaocaml/lib/camlp4/argl.cmi
+lib/metaocaml/lib/camlp4/argl.cmo
+lib/metaocaml/lib/camlp4/argl.cmx
+lib/metaocaml/lib/camlp4/argl.o
 lib/metaocaml/lib/camlp4/ast2pt.cmi
 lib/metaocaml/lib/camlp4/ast2pt.mli
 lib/metaocaml/lib/camlp4/camlp4.a
@@ -98,17 +103,22 @@
 lib/metaocaml/lib/camlp4/camlp4o.cma
 lib/metaocaml/lib/camlp4/camlp4r.cma
 lib/metaocaml/lib/camlp4/extfold.cmi
+lib/metaocaml/lib/camlp4/extfold.cmx
 lib/metaocaml/lib/camlp4/extfold.mli
 lib/metaocaml/lib/camlp4/extfun.cmi
+lib/metaocaml/lib/camlp4/extfun.cmx
 lib/metaocaml/lib/camlp4/extfun.mli
 lib/metaocaml/lib/camlp4/fstream.cmi
+lib/metaocaml/lib/camlp4/fstream.cmx
 lib/metaocaml/lib/camlp4/fstream.mli
 lib/metaocaml/lib/camlp4/gramext.cmi
+lib/metaocaml/lib/camlp4/gramext.cmx
 lib/metaocaml/lib/camlp4/gramext.mli
 lib/metaocaml/lib/camlp4/gramlib.a
 lib/metaocaml/lib/camlp4/gramlib.cma
 lib/metaocaml/lib/camlp4/gramlib.cmxa
 lib/metaocaml/lib/camlp4/grammar.cmi
+lib/metaocaml/lib/camlp4/grammar.cmx
 lib/metaocaml/lib/camlp4/grammar.mli
 lib/metaocaml/lib/camlp4/mLast.cmi
 lib/metaocaml/lib/camlp4/mLast.mli
@@ -167,6 +177,7 @@
 lib/metaocaml/lib/camlp4/pcaml.cmi
 lib/metaocaml/lib/camlp4/pcaml.mli
 lib/metaocaml/lib/camlp4/plexer.cmi
+lib/metaocaml/lib/camlp4/plexer.cmx
 lib/metaocaml/lib/camlp4/plexer.mli
 lib/metaocaml/lib/camlp4/pr_depend.cmo
 lib/metaocaml/lib/camlp4/pr_depend.cmx
@@ -206,8 +217,10 @@
 lib/metaocaml/lib/camlp4/spretty.cmi
 lib/metaocaml/lib/camlp4/spretty.mli
 lib/metaocaml/lib/camlp4/stdpp.cmi
+lib/metaocaml/lib/camlp4/stdpp.cmx
 lib/metaocaml/lib/camlp4/stdpp.mli
 lib/metaocaml/lib/camlp4/token.cmi
+lib/metaocaml/lib/camlp4/token.cmx
 lib/metaocaml/lib/camlp4/token.mli
 lib/metaocaml/lib/char.cmi
 lib/metaocaml/lib/char.cmx
@@ -585,6 +598,12 @@
 %%X11%%lib/metaocaml/lib/stublibs/dllgraphics.so
 %%LABLTK%%lib/metaocaml/bin/labltk
 %%LABLTK%%lib/metaocaml/bin/ocamlbrowser
+%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmi
+%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmx
+%%LABLTK%%lib/metaocaml/lib/labltk/balloon.mli
+%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmi
+%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmx
+%%LABLTK%%lib/metaocaml/lib/labltk/bell.mli
 %%LABLTK%%lib/metaocaml/lib/labltk/button.cmi
 %%LABLTK%%lib/metaocaml/lib/labltk/button.cmx
 %%LABLTK%%lib/metaocaml/lib/labltk/button.mli
@@ -895,12 +914,6 @@
 %%LABLTK%%lib/metaocaml/lib/labltk/wm.mli
 %%LABLTK%%lib/metaocaml/lib/stublibs/dlllabltk.so
 %%LABLTK%%lib/metaocaml/lib/stublibs/dlltkanim.so
-%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmi
-%%LABLTK%%lib/metaocaml/lib/labltk/balloon.cmx
-%%LABLTK%%lib/metaocaml/lib/labltk/balloon.mli
-%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmi
-%%LABLTK%%lib/metaocaml/lib/labltk/bell.cmx
-%%LABLTK%%lib/metaocaml/lib/labltk/bell.mli
 %%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile
 %%LABLTK%%%%EXAMPLESDIR%%/camltk/Makefile.nt
 %%LABLTK%%%%EXAMPLESDIR%%/camltk/addition.ml
@@ -938,12 +951,12 @@
 @dirrm lib/metaocaml/bin
 @dirrm lib/metaocaml/lib/caml
 @dirrm lib/metaocaml/lib/camlp4
+%%LABLTK%%@dirrm lib/metaocaml/lib/labltk
 @dirrm lib/metaocaml/lib/ocamldoc/custom
 @dirrm lib/metaocaml/lib/ocamldoc
 @dirrm lib/metaocaml/lib/stublibs
 @dirrm lib/metaocaml/lib/threads
 @dirrm lib/metaocaml/lib/vmthreads
-%%LABLTK%%@dirrm lib/metaocaml/lib/labltk
 @dirrm lib/metaocaml/lib
 @dirrm lib/metaocaml
 @dirrm %%DATADIR%%/man/man1


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list