Attachment #37956 for bug #60219

View | Details | Raw Unified | Return to bug 60219
Collapse All | Expand All





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

CONFIGURE_ARGS=	-prefix ${PREFIX} \
		-with-pthread

.if !defined(WITHOUT_X11)
CONFIGURE_ARGS+=	-tk-no-x11 -no-tk
.else
CONFIGURE_ARGS+=	-x11include ${X11BASE}/include \
			-x11lib ${X11BASE}/lib
.if defined(WITHOUT_TK)

Line 0 Link Here

(-)ocaml/files/patch-camlp4-lib::Makefile (+10 lines)
	1	--- camlp4/lib/Makefile.orig Sun Dec 14 02:41:09 2003
	2	+++ camlp4/lib/Makefile Sun Dec 14 02:41:24 2003
	3	@@ -43,6 +43,6 @@
	4
	5	installopt:
	6	cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/."
	7	- tar cf - $(TARGET:.cma=.$(A)) \| (cd "$(LIBDIR)/camlp4/."; tar xf -)
	8	+ tar cf - $(TARGET:S/.cma$/.$(A)/) \| (cd "$(LIBDIR)/camlp4/."; tar xf -)
	9
	10	include .depend

Line 0 Link Here

(-)ocaml/files/patch-camlp4-meta::Makefile (+11 lines)
	1	--- camlp4/meta/Makefile.orig Sun Dec 14 02:40:05 2003
	2	+++ camlp4/meta/Makefile Sun Dec 14 02:40:20 2003
	3	@@ -49,7 +49,7 @@
	4	cp camlp4r$(EXE) "$(BINDIR)/."
	5	if test -f camlp4r.opt; then \
	6	cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
	7	- for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \
	8	+ for target in $(OBJSX) $(OBJSX:S/.cmx$/.$(O)/) ; do \
	9	if test -f $$target; then \
	10	cp $$target "$(LIBDIR)/camlp4/."; \
	11	fi; \

Line 0 Link Here

(-)ocaml/files/patch-camlp4-ocaml_src-lib::Makefile (+10 lines)
	1	--- camlp4/ocaml_src/lib/Makefile.orig Sun Dec 14 02:38:28 2003
	2	+++ camlp4/ocaml_src/lib/Makefile Sun Dec 14 02:38:55 2003
	3	@@ -43,6 +43,6 @@
	4
	5	installopt:
	6	cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/."
	7	- tar cf - $(TARGET:.cma=.$(A)) \| (cd "$(LIBDIR)/camlp4/."; tar xf -)
	8	+ tar cf - $(TARGET:S/.cma$/.$(A)/) \| (cd "$(LIBDIR)/camlp4/."; tar xf -)
	9
	10	include .depend

Line 0 Link Here

(-)ocaml/files/patch-camlp4-ocaml_src-meta::Makefile (+11 lines)
	1	--- camlp4/ocaml_src/meta/Makefile.orig Sun Dec 14 02:33:49 2003
	2	+++ camlp4/ocaml_src/meta/Makefile Sun Dec 14 02:35:12 2003
	3	@@ -49,7 +49,7 @@
	4	cp camlp4r$(EXE) "$(BINDIR)/."
	5	if test -f camlp4r.opt; then \
	6	cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
	7	- for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \
	8	+ for target in $(OBJSX) $(OBJSX:S/.cmx$/.$(O)/) ; do \
	9	if test -f $$target; then \
	10	cp $$target "$(LIBDIR)/camlp4/."; \
	11	fi; \




--- configure.orig	Thu Sep 25 10:17:13 2003
+++ configure	Thu Dec 11 13:39:49 2003
@@ -1097,116 +1097,14 @@
 x11_include="not found"
 x11_link="not found"
 
-for dir in \
-    $x11_include_dir          \
-                              \
-    /usr/X11R6/include        \
-    /usr/include/X11R6        \
-    /usr/local/X11R6/include  \
-    /usr/local/include/X11R6  \
-    /opt/X11R6/include        \
-                              \
-    /usr/X11/include          \
-    /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
-    /opt/X11/include          \
-                              \
-    /usr/X11R5/include        \
-    /usr/include/X11R5        \
-    /usr/local/X11R5/include  \
-    /usr/local/include/X11R5  \
-    /usr/local/x11r5/include  \
-    /opt/X11R5/include        \
-                              \
-    /usr/X11R4/include        \
-    /usr/include/X11R4        \
-    /usr/local/X11R4/include  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-do
-  if test -f $dir/X11/X.h; then
-    x11_include=$dir
-    break
-  fi
-done
-
-if test "$x11_include" = "not found"; then
-  x11_try_lib_dir=''
-else
-  x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
+if [ -n "$x11_include_dir" ]; then
+    x11_include="$x11_include_dir"
 fi
 
-for dir in \
-    $x11_lib_dir          \
-    $x11_try_lib_dir      \
-                          \
-    /usr/X11R6/lib        \
-    /usr/lib/X11R6        \
-    /usr/local/X11R6/lib  \
-    /usr/local/lib/X11R6  \
-    /opt/X11R6/lib        \
-                          \
-    /usr/X11/lib          \
-    /usr/lib/X11          \
-    /usr/local/X11/lib    \
-    /usr/local/lib/X11    \
-    /opt/X11/lib          \
-                          \
-    /usr/X11R5/lib        \
-    /usr/lib/X11R5        \
-    /usr/local/X11R5/lib  \
-    /usr/local/lib/X11R5  \
-    /usr/local/x11r5/lib  \
-    /opt/X11R5/lib        \
-                          \
-    /usr/X11R4/lib        \
-    /usr/lib/X11R4        \
-    /usr/local/X11R4/lib  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11      \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
-do
-  if test -f $dir/libX11.a || \
-     test -f $dir/libX11.so || \
-     test -f $dir/libX11.dll.a || \
-     test -f $dir/libX11.sa; then
-    if test $dir = /usr/lib; then
-      x11_link="-lX11"
-    else
-      x11_link="-L$dir -lX11"
-      x11_libs="-L$dir"
-    fi
-    break
-  fi
-done
-
+if [ -n "$x11_lib_dir" ]; then
+    x11_link="-L$x11_lib_dir -lX11"
+    x11_libs="-L$x11_lib_dir"
+fi
 
 if test "$x11_include" = "not found" || test "$x11_link" = "not found"
 then




lib/ocaml/camlp4/gramext.cmi
lib/ocaml/camlp4/gramext.cmx
lib/ocaml/camlp4/gramext.mli
lib/ocaml/camlp4/gramlib.a
lib/ocaml/camlp4/gramlib.cma
lib/ocaml/camlp4/gramlib.cmxa
lib/ocaml/camlp4/grammar.cmi

lib/ocaml/camlp4/pa_op.cmo
lib/ocaml/camlp4/pa_r.cmo
lib/ocaml/camlp4/pa_r.cmx
lib/ocaml/camlp4/pa_r.o
lib/ocaml/camlp4/pa_rp.cmo
lib/ocaml/camlp4/pa_rp.cmx
lib/ocaml/camlp4/pa_rp.o
lib/ocaml/camlp4/pa_ru.cmo
lib/ocaml/camlp4/pa_scheme.cmo
lib/ocaml/camlp4/pa_sml.cmo

lib/ocaml/camlp4/pr_depend.cmo
lib/ocaml/camlp4/pr_dump.cmo
lib/ocaml/camlp4/pr_dump.cmx
lib/ocaml/camlp4/pr_dump.o
lib/ocaml/camlp4/pr_extend.cmo
lib/ocaml/camlp4/pr_extfun.cmo
lib/ocaml/camlp4/pr_null.cmo

lib/ocaml/libasmrunp.a
lib/ocaml/libbigarray.a
lib/ocaml/libcamlrun.a
%%X11%%lib/ocaml/libgraphics.a
lib/ocaml/libmldbm.a
lib/ocaml/libnums.a
lib/ocaml/libstr.a

Return to bug 60219

Lines 7-12 Link Here

(-)ocaml/Makefile (-3 / +2 lines)
7		7
8	PORTNAME= ocaml	8	PORTNAME= ocaml
9	PORTVERSION= 3.07	9	PORTVERSION= 3.07
		10	PORTREVISION= 1
10	CATEGORIES= lang	11	CATEGORIES= lang
11	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME}/ \	12	MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME}/ \
12	ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME}/ \	13	ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME}/ \
Lines 82-90 Link Here
82	CONFIGURE_ARGS= -prefix ${PREFIX} \	83	CONFIGURE_ARGS= -prefix ${PREFIX} \
83	-with-pthread	84	-with-pthread
84		85
85	.if defined(WITHOUT_X11)	86	.if !defined(WITHOUT_X11)
86	CONFIGURE_ARGS+= -tk-no-x11 -no-tk
87	.else
88	CONFIGURE_ARGS+= -x11include ${X11BASE}/include \	87	CONFIGURE_ARGS+= -x11include ${X11BASE}/include \
89	-x11lib ${X11BASE}/lib	88	-x11lib ${X11BASE}/lib
90	.if defined(WITHOUT_TK)	89	.if defined(WITHOUT_TK)

Line 0 Link Here

(-)ocaml/files/patch-configure (+125 lines)
		1	--- configure.orig Thu Sep 25 10:17:13 2003
		2	+++ configure Thu Dec 11 13:39:49 2003
		3	@@ -1097,116 +1097,14 @@
		4	x11_include="not found"
		5	x11_link="not found"
		6
		7	-for dir in \
		8	- $x11_include_dir \
		9	- \
		10	- /usr/X11R6/include \
		11	- /usr/include/X11R6 \
		12	- /usr/local/X11R6/include \
		13	- /usr/local/include/X11R6 \
		14	- /opt/X11R6/include \
		15	- \
		16	- /usr/X11/include \
		17	- /usr/include/X11 \
		18	- /usr/local/X11/include \
		19	- /usr/local/include/X11 \
		20	- /opt/X11/include \
		21	- \
		22	- /usr/X11R5/include \
		23	- /usr/include/X11R5 \
		24	- /usr/local/X11R5/include \
		25	- /usr/local/include/X11R5 \
		26	- /usr/local/x11r5/include \
		27	- /opt/X11R5/include \
		28	- \
		29	- /usr/X11R4/include \
		30	- /usr/include/X11R4 \
		31	- /usr/local/X11R4/include \
		32	- /usr/local/include/X11R4 \
		33	- \
		34	- /usr/X386/include \
		35	- /usr/x386/include \
		36	- /usr/XFree86/include/X11 \
		37	- \
		38	- /usr/include \
		39	- /usr/local/include \
		40	- /usr/unsupported/include \
		41	- /usr/athena/include \
		42	- /usr/lpp/Xamples/include \
		43	- \
		44	- /usr/openwin/include \
		45	- /usr/openwin/share/include \
		46	- ; \
		47	-do
		48	- if test -f $dir/X11/X.h; then
		49	- x11_include=$dir
		50	- break
		51	- fi
		52	-done
		53	-
		54	-if test "$x11_include" = "not found"; then
		55	- x11_try_lib_dir=''
		56	-else
		57	- x11_try_lib_dir=`echo $x11_include \| sed -e 's\|include\|lib\|'`
		58	+if [ -n "$x11_include_dir" ]; then
		59	+ x11_include="$x11_include_dir"
		60	fi
		61
		62	-for dir in \
		63	- $x11_lib_dir \
		64	- $x11_try_lib_dir \
65	- \
66	- /usr/X11R6/lib \
67	- /usr/lib/X11R6 \
68	- /usr/local/X11R6/lib \
69	- /usr/local/lib/X11R6 \
70	- /opt/X11R6/lib \
71	- \
72	- /usr/X11/lib \
73	- /usr/lib/X11 \
74	- /usr/local/X11/lib \
75	- /usr/local/lib/X11 \
76	- /opt/X11/lib \
77	- \
78	- /usr/X11R5/lib \
79	- /usr/lib/X11R5 \
80	- /usr/local/X11R5/lib \
81	- /usr/local/lib/X11R5 \
82	- /usr/local/x11r5/lib \
83	- /opt/X11R5/lib \
84	- \
85	- /usr/X11R4/lib \
86	- /usr/lib/X11R4 \
87	- /usr/local/X11R4/lib \
88	- /usr/local/lib/X11R4 \
89	- \
90	- /usr/X386/lib \
91	- /usr/x386/lib \
92	- /usr/XFree86/lib/X11 \
93	- \
94	- /usr/lib \
95	- /usr/local/lib \
96	- /usr/unsupported/lib \
97	- /usr/athena/lib \
98	- /usr/lpp/Xamples/lib \
99	- /lib/usr/lib/X11 \
100	- \
101	- /usr/openwin/lib \
102	- /usr/openwin/share/lib \
103	- ; \
104	-do
105	- if test -f $dir/libX11.a \|\| \
106	- test -f $dir/libX11.so \|\| \
107	- test -f $dir/libX11.dll.a \|\| \
108	- test -f $dir/libX11.sa; then
109	- if test $dir = /usr/lib; then
110	- x11_link="-lX11"
111	- else
112	- x11_link="-L$dir -lX11"
113	- x11_libs="-L$dir"
114	- fi
115	- break
116	- fi
117	-done
118	-
119	+if [ -n "$x11_lib_dir" ]; then
120	+ x11_link="-L$x11_lib_dir -lX11"
121	+ x11_libs="-L$x11_lib_dir"
122	+fi
123
124	if test "$x11_include" = "not found" \|\| test "$x11_link" = "not found"
125	then

Lines 59-64 Link Here

(-)ocaml/pkg-plist (-1 / +5 lines)
59	lib/ocaml/camlp4/gramext.cmi	59	lib/ocaml/camlp4/gramext.cmi
60	lib/ocaml/camlp4/gramext.cmx	60	lib/ocaml/camlp4/gramext.cmx
61	lib/ocaml/camlp4/gramext.mli	61	lib/ocaml/camlp4/gramext.mli
		62	lib/ocaml/camlp4/gramlib.a
62	lib/ocaml/camlp4/gramlib.cma	63	lib/ocaml/camlp4/gramlib.cma
63	lib/ocaml/camlp4/gramlib.cmxa	64	lib/ocaml/camlp4/gramlib.cmxa
64	lib/ocaml/camlp4/grammar.cmi	65	lib/ocaml/camlp4/grammar.cmi
Lines 92-99 Link Here
92	lib/ocaml/camlp4/pa_op.cmo	93	lib/ocaml/camlp4/pa_op.cmo
93	lib/ocaml/camlp4/pa_r.cmo	94	lib/ocaml/camlp4/pa_r.cmo
94	lib/ocaml/camlp4/pa_r.cmx	95	lib/ocaml/camlp4/pa_r.cmx
		96	lib/ocaml/camlp4/pa_r.o
95	lib/ocaml/camlp4/pa_rp.cmo	97	lib/ocaml/camlp4/pa_rp.cmo
96	lib/ocaml/camlp4/pa_rp.cmx	98	lib/ocaml/camlp4/pa_rp.cmx
		99	lib/ocaml/camlp4/pa_rp.o
97	lib/ocaml/camlp4/pa_ru.cmo	100	lib/ocaml/camlp4/pa_ru.cmo
98	lib/ocaml/camlp4/pa_scheme.cmo	101	lib/ocaml/camlp4/pa_scheme.cmo
99	lib/ocaml/camlp4/pa_sml.cmo	102	lib/ocaml/camlp4/pa_sml.cmo
Lines 105-110 Link Here
105	lib/ocaml/camlp4/pr_depend.cmo	108	lib/ocaml/camlp4/pr_depend.cmo
106	lib/ocaml/camlp4/pr_dump.cmo	109	lib/ocaml/camlp4/pr_dump.cmo
107	lib/ocaml/camlp4/pr_dump.cmx	110	lib/ocaml/camlp4/pr_dump.cmx
		111	lib/ocaml/camlp4/pr_dump.o
108	lib/ocaml/camlp4/pr_extend.cmo	112	lib/ocaml/camlp4/pr_extend.cmo
109	lib/ocaml/camlp4/pr_extfun.cmo	113	lib/ocaml/camlp4/pr_extfun.cmo
110	lib/ocaml/camlp4/pr_null.cmo	114	lib/ocaml/camlp4/pr_null.cmo
Lines 662-668 Link Here
662	lib/ocaml/libasmrunp.a	666	lib/ocaml/libasmrunp.a
663	lib/ocaml/libbigarray.a	667	lib/ocaml/libbigarray.a
664	lib/ocaml/libcamlrun.a	668	lib/ocaml/libcamlrun.a
665	lib/ocaml/libgraphics.a	669	%%X11%%lib/ocaml/libgraphics.a
666	lib/ocaml/libmldbm.a	670	lib/ocaml/libmldbm.a
667	lib/ocaml/libnums.a	671	lib/ocaml/libnums.a
668	lib/ocaml/libstr.a	672	lib/ocaml/libstr.a