ports/132153: update lang/ocaml

[Tsurutani Naoki]

>Number:         132153
>Category:       ports
>Synopsis:       update lang/ocaml
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 27 09:10:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Tsurutani Naoki
>Release:        FreeBSD 7.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 7.1-STABLE FreeBSD 7.1-STABLE #17: Wed Jan 7 11:14:01 JST 2009 turutani at h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386


	
>Description:
	update lang/ocaml to 3.11.0.
	change dependency to tk84.
	lang/ocaml-doc should also be updated.
	i do not know about the dependence to tk8x;
	tk83 or earlier can work fine.
	
>How-To-Repeat:
	
>Fix:
	here is a patch to ports:

diff -urN ocaml.orig/Makefile ocaml/Makefile
--- ocaml.orig/Makefile	2008-04-25 04:36:14.000000000 +0900
+++ ocaml/Makefile	2009-02-27 17:24:46.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.10.2
-PORTREVISION=	1
+PORTVERSION=	3.11.0
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
@@ -73,11 +72,11 @@
 PLIST_SUB+=	TK=""
 CONFLICTS+=	ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
 CONFIGURE_ARGS+=-tkdefs \
-	"-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 ${THR_CPP}"\
+	"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}"\
 	-tklibs "-L${LOCALBASE}/lib ${THR_LD}"
-BUILD_DEPENDS+=	${LOCALBASE}/include/tcl8.4:${PORTSDIR}/lang/tcl84 \
-		${LOCALBASE}/include/tk8.4:${PORTSDIR}/x11-toolkits/tk84
-LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
+USE_TCL_BUILD=	84+
+USE_TK=		84+
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
 .endif
 
 .if ${ARCH} == sparc64 || ${ARCH} == ia64
diff -urN ocaml.orig/distinfo ocaml/distinfo
--- ocaml.orig/distinfo	2008-04-11 04:33:23.000000000 +0900
+++ ocaml/distinfo	2009-02-27 12:03:44.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (ocaml-3.10.2.tar.bz2) = d86f8f8aa4574fa60dd6f89044580307
-SHA256 (ocaml-3.10.2.tar.bz2) = 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
-SIZE (ocaml-3.10.2.tar.bz2) = 2284860
+MD5 (ocaml-3.11.0.tar.bz2) = 6ed1c3ed660a15408362242fa8fa4668
+SHA256 (ocaml-3.11.0.tar.bz2) = 3faa9057bdac916413a5dee17180f5a8fbc7fb7589465208f72f692bddbd6776
+SIZE (ocaml-3.11.0.tar.bz2) = 2359311
diff -urN ocaml.orig/files/patch-configure ocaml/files/patch-configure
--- ocaml.orig/files/patch-configure	2008-04-11 04:33:23.000000000 +0900
+++ ocaml/files/patch-configure	2009-02-27 16:22:09.000000000 +0900
@@ -1,6 +1,6 @@
 --- configure.orig	2008-01-04 16:26:38.000000000 +0300
 +++ configure	2008-04-06 23:16:20.000000000 +0400
-@@ -79,6 +79,8 @@
+@@ -85,6 +85,8 @@
          withcurses=no;;
      -no-shared-libs)
          withsharedlibs=no;;
@@ -9,7 +9,7 @@
      -x11include*|--x11include*)
          x11_include_dir=$2; shift;;
      -x11lib*|--x11lib*)
-@@ -686,6 +688,7 @@
+@@ -738,6 +740,7 @@
    i386,*,gnu) profiling='prof';;
    i386,*,bsd_elf) profiling='prof';;
    i386,*,macosx) profiling='prof';;
@@ -17,7 +17,7 @@
    sparc,*,solaris)
      profiling='prof'
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
-@@ -1132,124 +1135,24 @@
+@@ -1183,127 +1186,24 @@
  x11_include="not found"
  x11_link="not found"
  
@@ -129,8 +129,11 @@
 -    if test $dir = /usr/lib; then
 -      x11_link="-lX11"
 -    else
--      x11_link="-L$dir -lX11"
 -      x11_libs="-L$dir"
+-      case "$host" in
+-        *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+-        *) x11_link="-L$dir -lX11";;
+-      esac
 -    fi
 -    break
 -  fi
diff -urN ocaml.orig/files/patch-stdlib_Makefile ocaml/files/patch-stdlib_Makefile
--- ocaml.orig/files/patch-stdlib_Makefile	2006-08-02 23:00:20.000000000 +0900
+++ ocaml/files/patch-stdlib_Makefile	1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
---- ./stdlib/Makefile.orig	Mon Nov 29 17:53:30 2004
-+++ ./stdlib/Makefile	Sun May 21 14:02:41 2006
-@@ -48,8 +48,7 @@
- 	rm -f std_exit.p.cmi
- 
- install:
--	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
--           $(LIBDIR)
-+	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
- 
- installopt: installopt-default installopt-$(PROFILING)
- 
	


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