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

(-)ocaml/Makefile (-4 / +18 lines)
Lines 19-27 Link Here
19
MAINTAINER=	patrick@watson.org
19
MAINTAINER=	patrick@watson.org
20
COMMENT=	An ML language based on a complete class-based objective system
20
COMMENT=	An ML language based on a complete class-based objective system
21
21
22
.if defined(WITHOUT_X11)
23
PLIST_SUB+=	X11="@comment "
24
WITHOUT_TK=	yes
25
TKSFX=		-nox11
26
.else
27
PLIST_SUB+=	X11=""
28
USE_XLIB=       yes
29
.endif
30
22
.if defined(WITHOUT_TK)
31
.if defined(WITHOUT_TK)
23
PLIST_SUB+=	TK="@comment "
32
PLIST_SUB+=	TK="@comment "
33
.if !defined(WITHOUT_X11)
24
TKSFX=		-notk
34
TKSFX=		-notk
35
.endif
25
.else
36
.else
26
PLIST_SUB+=	TK=""
37
PLIST_SUB+=	TK=""
27
BUILD_DEPENDS+=	${LOCALBASE}/include/tcl8.3:${PORTSDIR}/lang/tcl83
38
BUILD_DEPENDS+=	${LOCALBASE}/include/tcl8.3:${PORTSDIR}/lang/tcl83
Lines 29-35 Link Here
29
LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
40
LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
30
.endif
41
.endif
31
42
32
USE_XLIB=	yes
33
HAS_CONFIGURE=	yes
43
HAS_CONFIGURE=	yes
34
ALL_TARGET=	world.opt
44
ALL_TARGET=	world.opt
35
45
Lines 67-80 Link Here
67
		camlp4.1 ocpp.1
77
		camlp4.1 ocpp.1
68
78
69
CONFIGURE_ARGS=	-prefix ${PREFIX} \
79
CONFIGURE_ARGS=	-prefix ${PREFIX} \
70
		-x11include ${X11BASE}/include \
71
		-x11lib ${X11BASE}/lib \
72
		-with-pthread
80
		-with-pthread
73
81
82
.if defined(WITHOUT_X11)
83
CONFIGURE_ARGS+= -tk-no-x11 -no-tk
84
.else
85
CONFIGURE_ARGS+= -x11include ${X11BASE}/include \
86
		 -x11lib ${X11BASE}/lib
74
.if defined(WITHOUT_TK)
87
.if defined(WITHOUT_TK)
75
CONFIGURE_ARGS+=-no-tk
88
CONFIGURE_ARGS+= -no-tk
76
.else
89
.else
77
CONFIGURE_ARGS+=-tkdefs "-I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3"
90
CONFIGURE_ARGS+=-tkdefs "-I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3"
91
.endif
78
.endif
92
.endif
79
93
80
.if !defined(NOPORTDOCS)
94
.if !defined(NOPORTDOCS)
(-)ocaml/pkg-plist (-9 / +9 lines)
Lines 30-36 Link Here
30
lib/ocaml/stublibs/dllnums.so
30
lib/ocaml/stublibs/dllnums.so
31
lib/ocaml/stublibs/dllbigarray.so
31
lib/ocaml/stublibs/dllbigarray.so
32
lib/ocaml/stublibs/dllthreads.so
32
lib/ocaml/stublibs/dllthreads.so
33
lib/ocaml/stublibs/dllgraphics.so
33
%%X11%%lib/ocaml/stublibs/dllgraphics.so
34
lib/ocaml/stublibs/dllmldbm.so
34
lib/ocaml/stublibs/dllmldbm.so
35
%%TK%%lib/ocaml/stublibs/dlllabltk.so
35
%%TK%%lib/ocaml/stublibs/dlllabltk.so
36
%%TK%%lib/ocaml/stublibs/dlltkanim.so
36
%%TK%%lib/ocaml/stublibs/dlltkanim.so
Lines 239-250 Link Here
239
lib/ocaml/condition.mli
239
lib/ocaml/condition.mli
240
lib/ocaml/mutex.mli
240
lib/ocaml/mutex.mli
241
lib/ocaml/thread.mli
241
lib/ocaml/thread.mli
242
lib/ocaml/libgraphics.a
242
%%X11%%lib/ocaml/libgraphics.a
243
lib/ocaml/graphicsX11.mli
243
%%X11%%lib/ocaml/graphicsX11.mli
244
lib/ocaml/graphics.mli
244
%%X11%%lib/ocaml/graphics.mli
245
lib/ocaml/graphicsX11.cmi
245
%%X11%%lib/ocaml/graphicsX11.cmi
246
lib/ocaml/graphics.cmi
246
%%X11%%lib/ocaml/graphics.cmi
247
lib/ocaml/graphics.cma
247
%%X11%%lib/ocaml/graphics.cma
248
lib/ocaml/libmldbm.a
248
lib/ocaml/libmldbm.a
249
lib/ocaml/dbm.mli
249
lib/ocaml/dbm.mli
250
lib/ocaml/dbm.cmi
250
lib/ocaml/dbm.cmi
Lines 730-737 Link Here
730
lib/ocaml/bigarray.cmx
730
lib/ocaml/bigarray.cmx
731
lib/ocaml/bigarray.a
731
lib/ocaml/bigarray.a
732
lib/ocaml/libthreadsnat.a
732
lib/ocaml/libthreadsnat.a
733
lib/ocaml/graphics.a
733
%%X11%%lib/ocaml/graphics.a
734
lib/ocaml/graphics.cmxa
734
%%X11%%lib/ocaml/graphics.cmxa
735
lib/ocaml/dbm.a
735
lib/ocaml/dbm.a
736
lib/ocaml/dbm.cmxa
736
lib/ocaml/dbm.cmxa
737
lib/ocaml/dbm.cmx
737
lib/ocaml/dbm.cmx

Return to bug 53289