ports/60219: [maintainer update] lang/ocaml (supersedes ports/60194)
Eugene Ossintsev
eugos at gmx.net
Sun Dec 14 03:09:17 UTC 2003
>Number: 60219
>Category: ports
>Synopsis: [maintainer update] lang/ocaml (supersedes ports/60194)
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 13 19:00:27 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Eugene Ossintsev
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD badger.home 4.9-STABLE FreeBSD 4.9-STABLE #0: Sat Dec 13 02:07:44 CET 2003 root at badger.home:/usr/obj/usr/src/sys/BADGER i386
>Description:
Added a patch to the original OCaml's configure script to fix building the
port with the option WITHOUT_X11.
Fixed several MakefileS (because of their GNU Make nature) to use them
with BSD Make. Thanks to Marwan Burelle who has noticed the problem.
Besides, pkg-plist is fixed, too.
>How-To-Repeat:
>Fix:
diff -ruN ocaml.orig/Makefile ocaml/Makefile
--- ocaml.orig/Makefile Sun Dec 14 03:31:03 2003
+++ ocaml/Makefile Sun Dec 14 00:12:15 2003
@@ -7,6 +7,7 @@
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}/ \
@@ -82,9 +83,7 @@
CONFIGURE_ARGS= -prefix ${PREFIX} \
-with-pthread
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= -tk-no-x11 -no-tk
-.else
+.if !defined(WITHOUT_X11)
CONFIGURE_ARGS+= -x11include ${X11BASE}/include \
-x11lib ${X11BASE}/lib
.if defined(WITHOUT_TK)
diff -ruN ocaml.orig/files/patch-camlp4-lib::Makefile ocaml/files/patch-camlp4-lib::Makefile
--- ocaml.orig/files/patch-camlp4-lib::Makefile Thu Jan 1 01:00:00 1970
+++ ocaml/files/patch-camlp4-lib::Makefile Sun Dec 14 02:41:45 2003
@@ -0,0 +1,10 @@
+--- camlp4/lib/Makefile.orig Sun Dec 14 02:41:09 2003
++++ camlp4/lib/Makefile Sun Dec 14 02:41:24 2003
+@@ -43,6 +43,6 @@
+
+ installopt:
+ cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/."
+- tar cf - $(TARGET:.cma=.$(A)) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
++ tar cf - $(TARGET:S/.cma$/.$(A)/) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
+
+ include .depend
diff -ruN ocaml.orig/files/patch-camlp4-meta::Makefile ocaml/files/patch-camlp4-meta::Makefile
--- ocaml.orig/files/patch-camlp4-meta::Makefile Thu Jan 1 01:00:00 1970
+++ ocaml/files/patch-camlp4-meta::Makefile Sun Dec 14 02:40:45 2003
@@ -0,0 +1,11 @@
+--- camlp4/meta/Makefile.orig Sun Dec 14 02:40:05 2003
++++ camlp4/meta/Makefile Sun Dec 14 02:40:20 2003
+@@ -49,7 +49,7 @@
+ cp camlp4r$(EXE) "$(BINDIR)/."
+ if test -f camlp4r.opt; then \
+ cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
+- for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \
++ for target in $(OBJSX) $(OBJSX:S/.cmx$/.$(O)/) ; do \
+ if test -f $$target; then \
+ cp $$target "$(LIBDIR)/camlp4/."; \
+ fi; \
diff -ruN ocaml.orig/files/patch-camlp4-ocaml_src-lib::Makefile ocaml/files/patch-camlp4-ocaml_src-lib::Makefile
--- ocaml.orig/files/patch-camlp4-ocaml_src-lib::Makefile Thu Jan 1 01:00:00 1970
+++ ocaml/files/patch-camlp4-ocaml_src-lib::Makefile Sun Dec 14 02:39:27 2003
@@ -0,0 +1,10 @@
+--- camlp4/ocaml_src/lib/Makefile.orig Sun Dec 14 02:38:28 2003
++++ camlp4/ocaml_src/lib/Makefile Sun Dec 14 02:38:55 2003
+@@ -43,6 +43,6 @@
+
+ installopt:
+ cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/."
+- tar cf - $(TARGET:.cma=.$(A)) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
++ tar cf - $(TARGET:S/.cma$/.$(A)/) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
+
+ include .depend
diff -ruN ocaml.orig/files/patch-camlp4-ocaml_src-meta::Makefile ocaml/files/patch-camlp4-ocaml_src-meta::Makefile
--- ocaml.orig/files/patch-camlp4-ocaml_src-meta::Makefile Thu Jan 1 01:00:00 1970
+++ ocaml/files/patch-camlp4-ocaml_src-meta::Makefile Sun Dec 14 02:37:34 2003
@@ -0,0 +1,11 @@
+--- camlp4/ocaml_src/meta/Makefile.orig Sun Dec 14 02:33:49 2003
++++ camlp4/ocaml_src/meta/Makefile Sun Dec 14 02:35:12 2003
+@@ -49,7 +49,7 @@
+ cp camlp4r$(EXE) "$(BINDIR)/."
+ if test -f camlp4r.opt; then \
+ cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
+- for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \
++ for target in $(OBJSX) $(OBJSX:S/.cmx$/.$(O)/) ; do \
+ if test -f $$target; then \
+ cp $$target "$(LIBDIR)/camlp4/."; \
+ fi; \
diff -ruN ocaml.orig/files/patch-configure ocaml/files/patch-configure
--- ocaml.orig/files/patch-configure Thu Jan 1 01:00:00 1970
+++ ocaml/files/patch-configure Sat Dec 13 13:44:21 2003
@@ -0,0 +1,125 @@
+--- 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
diff -ruN ocaml.orig/pkg-plist ocaml/pkg-plist
--- ocaml.orig/pkg-plist Sun Dec 14 03:31:03 2003
+++ ocaml/pkg-plist Sun Dec 14 00:15:23 2003
@@ -59,6 +59,7 @@
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
@@ -92,8 +93,10 @@
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
@@ -105,6 +108,7 @@
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
@@ -662,7 +666,7 @@
lib/ocaml/libasmrunp.a
lib/ocaml/libbigarray.a
lib/ocaml/libcamlrun.a
-lib/ocaml/libgraphics.a
+%%X11%%lib/ocaml/libgraphics.a
lib/ocaml/libmldbm.a
lib/ocaml/libnums.a
lib/ocaml/libstr.a
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list