Attachment #93031 for bug #130845




#

PORTNAME=	ocaml
PORTVERSION=	3.11.0
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \

CONFLICTS+=	ocaml-[0-9]* ocaml-nox11-[0-9]*
CONFIGURE_ARGS+=-no-tk
.else
USE_TK=		84+
.include	"${PORTSDIR}/Mk/bsd.tcl.mk"
PLIST_SUB+=	TK=""
CONFLICTS+=	ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
CONFIGURE_ARGS+=-tkdefs \
        "-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
.endif

.if ${ARCH} == sparc64 || ${ARCH} == ia64

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (ocaml-3.10.2.tar.bz2) = d86f8f8aa4574fa60dd6f89044580307	1	MD5 (ocaml-3.11.0.tar.bz2) = 6ed1c3ed660a15408362242fa8fa4668
2	SHA256 (ocaml-3.10.2.tar.bz2) = 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58	2	SHA256 (ocaml-3.11.0.tar.bz2) = 3faa9057bdac916413a5dee17180f5a8fbc7fb7589465208f72f692bddbd6776
3	SIZE (ocaml-3.10.2.tar.bz2) = 2284860	3	SIZE (ocaml-3.11.0.tar.bz2) = 2359311

Lines 66-71 lib/ocaml/bigarray.cma Link Here

(-)pkg-plist (-4 / +16 lines)
66	lib/ocaml/bigarray.cmi	66	lib/ocaml/bigarray.cmi
67	lib/ocaml/bigarray.cmx	67	lib/ocaml/bigarray.cmx
68	lib/ocaml/bigarray.cmxa	68	lib/ocaml/bigarray.cmxa
		69	lib/ocaml/bigarray.cmxs
69	lib/ocaml/bigarray.mli	70	lib/ocaml/bigarray.mli
70	lib/ocaml/buffer.cmi	71	lib/ocaml/buffer.cmi
71	lib/ocaml/buffer.cmx	72	lib/ocaml/buffer.cmx
Lines 93-98 lib/ocaml/caml/signals.h Link Here
93	lib/ocaml/caml/unixsupport.h	94	lib/ocaml/caml/unixsupport.h
94	lib/ocaml/camlheader	95	lib/ocaml/camlheader
95	lib/ocaml/camlheader_ur	96	lib/ocaml/camlheader_ur
		97	lib/ocaml/camlinternalLazy.cmi
		98	lib/ocaml/camlinternalLazy.cmx
		99	lib/ocaml/camlinternalLazy.ml
		100	lib/ocaml/camlinternalLazy.mli
		101	lib/ocaml/camlinternalLazy.p.cmx
96	lib/ocaml/camlinternalMod.cmi	102	lib/ocaml/camlinternalMod.cmi
97	lib/ocaml/camlinternalMod.cmx	103	lib/ocaml/camlinternalMod.cmx
98	lib/ocaml/camlinternalMod.ml	104	lib/ocaml/camlinternalMod.ml
Lines 136-145 lib/ocaml/camlp4/Camlp4Filters/Camlp4Pro Link Here
136	lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo	142	lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo
137	lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx	143	lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx
138	lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o	144	lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o
139	lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmi
140	lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmo
141	lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmx
142	lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.o
143	lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi	145	lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi
144	lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo	146	lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo
145	lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx	147	lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx
Lines 268-281 lib/ocaml/dbm.cma Link Here
268	lib/ocaml/dbm.cmi	270	lib/ocaml/dbm.cmi
269	lib/ocaml/dbm.cmx	271	lib/ocaml/dbm.cmx
270	lib/ocaml/dbm.cmxa	272	lib/ocaml/dbm.cmxa
		273	lib/ocaml/dbm.cmxs
271	lib/ocaml/dbm.mli	274	lib/ocaml/dbm.mli
272	lib/ocaml/digest.cmi	275	lib/ocaml/digest.cmi
273	lib/ocaml/digest.cmx	276	lib/ocaml/digest.cmx
274	lib/ocaml/digest.ml	277	lib/ocaml/digest.ml
275	lib/ocaml/digest.mli	278	lib/ocaml/digest.mli
276	lib/ocaml/digest.p.cmx	279	lib/ocaml/digest.p.cmx
		280	lib/ocaml/dynlink.a
277	lib/ocaml/dynlink.cma	281	lib/ocaml/dynlink.cma
278	lib/ocaml/dynlink.cmi	282	lib/ocaml/dynlink.cmi
		283	lib/ocaml/dynlink.cmx
		284	lib/ocaml/dynlink.cmxa
279	lib/ocaml/dynlink.mli	285	lib/ocaml/dynlink.mli
280	lib/ocaml/event.mli	286	lib/ocaml/event.mli
281	lib/ocaml/expunge	287	lib/ocaml/expunge
Lines 305-312 lib/ocaml/genlex.p.cmx Link Here
305	%%X11%%lib/ocaml/graphics.cmi	311	%%X11%%lib/ocaml/graphics.cmi
306	%%X11%%lib/ocaml/graphics.cmx	312	%%X11%%lib/ocaml/graphics.cmx
307	%%X11%%lib/ocaml/graphics.cmxa	313	%%X11%%lib/ocaml/graphics.cmxa
		314	%%X11%%lib/ocaml/graphics.cmxs
308	%%X11%%lib/ocaml/graphics.mli	315	%%X11%%lib/ocaml/graphics.mli
309	%%X11%%lib/ocaml/graphicsX11.cmi	316	%%X11%%lib/ocaml/graphicsX11.cmi
		317	%%X11%%lib/ocaml/graphicsX11.cmx
310	%%X11%%lib/ocaml/graphicsX11.mli	318	%%X11%%lib/ocaml/graphicsX11.mli
311	lib/ocaml/hashtbl.cmi	319	lib/ocaml/hashtbl.cmi
312	lib/ocaml/hashtbl.cmx	320	lib/ocaml/hashtbl.cmx
Lines 664-669 lib/ocaml/libasmrun.a Link Here
664	lib/ocaml/libasmrunp.a	672	lib/ocaml/libasmrunp.a
665	lib/ocaml/libbigarray.a	673	lib/ocaml/libbigarray.a
666	lib/ocaml/libcamlrun.a	674	lib/ocaml/libcamlrun.a
		675	lib/ocaml/libcamlrun_shared.so
667	%%X11%%lib/ocaml/libgraphics.a	676	%%X11%%lib/ocaml/libgraphics.a
668	lib/ocaml/libmldbm.a	677	lib/ocaml/libmldbm.a
669	lib/ocaml/libnums.a	678	lib/ocaml/libnums.a
Lines 711-716 lib/ocaml/num.mli Link Here
711	lib/ocaml/nums.a	720	lib/ocaml/nums.a
712	lib/ocaml/nums.cma	721	lib/ocaml/nums.cma
713	lib/ocaml/nums.cmxa	722	lib/ocaml/nums.cmxa
		723	lib/ocaml/nums.cmxs
714	lib/ocaml/obj.cmi	724	lib/ocaml/obj.cmi
715	lib/ocaml/obj.cmx	725	lib/ocaml/obj.cmx
716	lib/ocaml/obj.ml	726	lib/ocaml/obj.ml
Lines 870-875 lib/ocaml/str.cma Link Here
870	lib/ocaml/str.cmi	880	lib/ocaml/str.cmi
871	lib/ocaml/str.cmx	881	lib/ocaml/str.cmx
872	lib/ocaml/str.cmxa	882	lib/ocaml/str.cmxa
		883	lib/ocaml/str.cmxs
873	lib/ocaml/str.mli	884	lib/ocaml/str.mli
874	lib/ocaml/stream.cmi	885	lib/ocaml/stream.cmi
875	lib/ocaml/stream.cmx	886	lib/ocaml/stream.cmx
Lines 926-931 lib/ocaml/unix.cma Link Here
926	lib/ocaml/unix.cmi	937	lib/ocaml/unix.cmi
927	lib/ocaml/unix.cmx	938	lib/ocaml/unix.cmx
928	lib/ocaml/unix.cmxa	939	lib/ocaml/unix.cmxa
		940	lib/ocaml/unix.cmxs
929	lib/ocaml/unix.mli	941	lib/ocaml/unix.mli
930	lib/ocaml/unixLabels.cmi	942	lib/ocaml/unixLabels.cmi
931	lib/ocaml/unixLabels.cmx	943	lib/ocaml/unixLabels.cmx

Lines 79-81 Weak.Make.n Link Here

(-)files/mann (+1 lines)
79	Weak.S.n	79	Weak.S.n
80	Weak.n	80	Weak.n
81	CamlinternalMod.n	81	CamlinternalMod.n
		82	CamlinternalLazy.n




--- ./camlp4/man/Makefile.orig	2008-10-27 23:03:31.000000000 +0900
+++ ./camlp4/man/Makefile	2009-01-21 01:35:26.000000000 +0900
@@ -3,7 +3,6 @@
 include ../config/Makefile.cnf
 
 TARGET=camlp4.1
-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
 
 include ../config/Makefile.base
 
@@ -11,10 +10,6 @@
 	if test -n '$(MANDIR)'; then \
 	  $(MKDIR) $(MANDIR)/man1 ; \
 	  cp $(TARGET) $(MANDIR)/man1/. ; \




--- ./configure.orig	2008-11-07 19:34:16.000000000 +0900
+++ ./configure	2009-01-21 01:41:11.000000000 +0900
@@ -85,6 +85,8 @@
         withcurses=no;;
     -no-shared-libs)
         withsharedlibs=no;;

     -x11include*|--x11include*)
         x11_include_dir=$2; shift;;
     -x11lib*|--x11lib*)
@@ -739,6 +741,7 @@
   i386,*,gnu) profiling='prof';;
   i386,*,bsd_elf) profiling='prof';;
   amd64,*,macosx) profiling='prof';;
   i386,*,macosx) profiling='prof';;
+  *,*,freebsd) profiling='prof';;
   sparc,*,solaris)
     profiling='prof'
     case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
@@ -1183,127 +1186,24 @@
 x11_include="not found"
 x11_link="not found"
 

-    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

Return to bug 130845

Lines 6-13 Link Here

(-)Makefile (-6 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= ocaml	8	PORTNAME= ocaml
9	PORTVERSION= 3.10.2	9	PORTVERSION= 3.11.0
10	PORTREVISION= 1
11	CATEGORIES= lang	10	CATEGORIES= lang
12	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \	11	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \
13	ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \	12	ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
Lines 70-83 SFX= -notk Link Here
70	CONFLICTS+= ocaml-[0-9]* ocaml-nox11-[0-9]*	69	CONFLICTS+= ocaml-[0-9]* ocaml-nox11-[0-9]*
71	CONFIGURE_ARGS+=-no-tk	70	CONFIGURE_ARGS+=-no-tk
72	.else	71	.else
		72	USE_TK= 84+
		73	.include "${PORTSDIR}/Mk/bsd.tcl.mk"
73	PLIST_SUB+= TK=""	74	PLIST_SUB+= TK=""
74	CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]*	75	CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
75	CONFIGURE_ARGS+=-tkdefs \	76	CONFIGURE_ARGS+=-tkdefs \
76	"-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 ${THR_CPP}"\	77	"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}"\
77	-tklibs "-L${LOCALBASE}/lib ${THR_LD}"	78	-tklibs "-L${LOCALBASE}/lib ${THR_LD}"
78	BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.4:${PORTSDIR}/lang/tcl84 \
79	${LOCALBASE}/include/tk8.4:${PORTSDIR}/x11-toolkits/tk84
80	LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84
81	.endif	79	.endif
82		80
83	.if ${ARCH} == sparc64 \|\| ${ARCH} == ia64	81	.if ${ARCH} == sparc64 \|\| ${ARCH} == ia64

Lines 1-14 Link Here

(-)files/patch-camlp4-man_Makefile (-5 / +5 lines)
1	--- ./camlp4/man/Makefile.orig Thu Jul 3 20:14:49 2003	1	--- ./camlp4/man/Makefile.orig 2008-10-27 23:03:31.000000000 +0900
2	+++ ./camlp4/man/Makefile Sun May 21 14:02:41 2006	2	+++ ./camlp4/man/Makefile 2009-01-21 01:35:26.000000000 +0900
3	@@ -3,7 +3,6 @@	3	@@ -3,7 +3,6 @@
4	include ../config/Makefile	4	include ../config/Makefile.cnf
5		5
6	TARGET=camlp4.1	6	TARGET=camlp4.1
7	-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1	7	-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
8		8
9	all: $(TARGET)	9	include ../config/Makefile.base
10		10
11	@@ -18,10 +17,6 @@	11	@@ -11,10 +10,6 @@
12	if test -n '$(MANDIR)'; then \	12	if test -n '$(MANDIR)'; then \
13	$(MKDIR) $(MANDIR)/man1 ; \	13	$(MKDIR) $(MANDIR)/man1 ; \
14	cp $(TARGET) $(MANDIR)/man1/. ; \	14	cp $(TARGET) $(MANDIR)/man1/. ; \

Lines 1-6 Link Here

(-)files/patch-configure (-7 / +10 lines)
1	--- configure.orig 2008-01-04 16:26:38.000000000 +0300	1	--- ./configure.orig 2008-11-07 19:34:16.000000000 +0900
2	+++ configure 2008-04-06 23:16:20.000000000 +0400	2	+++ ./configure 2009-01-21 01:41:11.000000000 +0900
3	@@ -79,6 +79,8 @@	3	@@ -85,6 +85,8 @@
4	withcurses=no;;	4	withcurses=no;;
5	-no-shared-libs)	5	-no-shared-libs)
6	withsharedlibs=no;;	6	withsharedlibs=no;;
Lines 9-23 Link Here
9	-x11include\|--x11include)	9	-x11include\|--x11include)
10	x11_include_dir=$2; shift;;	10	x11_include_dir=$2; shift;;
11	-x11lib\|--x11lib)	11	-x11lib\|--x11lib)
12	@@ -686,6 +688,7 @@	12	@@ -739,6 +741,7 @@
13	i386,*,gnu) profiling='prof';;
14	i386,*,bsd_elf) profiling='prof';;	13	i386,*,bsd_elf) profiling='prof';;
		14	amd64,*,macosx) profiling='prof';;
15	i386,*,macosx) profiling='prof';;	15	i386,*,macosx) profiling='prof';;
16	+ ,,freebsd) profiling='prof';;	16	+ ,,freebsd) profiling='prof';;
17	sparc,*,solaris)	17	sparc,*,solaris)
18	profiling='prof'	18	profiling='prof'
19	case "$nativecc" in gcc) ;; ) cc_profile='-xpg';; esac;;	19	case "$nativecc" in gcc) ;; ) cc_profile='-xpg';; esac;;
20	@@ -1132,124 +1135,24 @@	20	@@ -1183,127 +1186,24 @@
21	x11_include="not found"	21	x11_include="not found"
22	x11_link="not found"	22	x11_link="not found"
23		23
Lines 129-136 Link Here
129	- if test $dir = /usr/lib; then	129	- if test $dir = /usr/lib; then
130	- x11_link="-lX11"	130	- x11_link="-lX11"
131	- else	131	- else
132	- x11_link="-L$dir -lX11"
133	- x11_libs="-L$dir"	132	- x11_libs="-L$dir"
		133	- case "$host" in
		134	- --bsd) x11_link="-R$dir -L$dir -lX11";;
		135	- *) x11_link="-L$dir -lX11";;
		136	- esac
134	- fi	137	- fi
135	- break	138	- break
136	- fi	139	- fi