Date: Sat, 19 Aug 2006 10:37:55 +0600 (YEKST) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102261: [MAINTAINER] lang/ocaml: fix WITHOUT_X11 building Message-ID: <20060819043755.8B6EB12030@fonon.realnet> Resent-Message-ID: <200608190640.k7J6eF9u084699@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102261 >Category: ports >Synopsis: [MAINTAINER] lang/ocaml: fix WITHOUT_X11 building >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Aug 19 06:40:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD >Description: - Don't depend on X11 when WITHOUT_X11 was defined, even if X11 exists on target machine. >How-To-Repeat: >Fix: --- ocaml-notk-3.09.2_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/lang/ocaml/Makefile /var/tmp/ocaml/Makefile --- /usr/ports/lang/ocaml/Makefile Wed Aug 2 20:00:20 2006 +++ /var/tmp/ocaml/Makefile Sat Aug 19 10:29:44 2006 @@ -7,7 +7,7 @@ PORTNAME= ocaml PORTVERSION= 3.09.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \ ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \ @@ -59,7 +59,7 @@ CONFIGURE_ARGS+=-no-pthread .endif -.if !defined(WITHOUT_X11) || exists(${X11BASE}/lib/libX11.a) +.if !defined(WITHOUT_X11) PLIST_SUB+= X11="" USE_XLIB= yes CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib @@ -68,6 +68,7 @@ WITHOUT_TK= yes SFX= -nox11 CONFLICTS+= ocaml-[0-9]* ocaml-notk-[0-9]* +CONFIGURE_ARGS+=-no-x11 .endif .if defined(WITHOUT_TK) diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-configure /var/tmp/ocaml/files/patch-configure --- /usr/ports/lang/ocaml/files/patch-configure Thu Jun 15 03:46:40 2006 +++ /var/tmp/ocaml/files/patch-configure Sat Aug 19 10:34:51 2006 @@ -1,6 +1,15 @@ ---- ./configure.orig Thu Mar 30 14:00:19 2006 -+++ ./configure Sun May 21 14:02:41 2006 -@@ -667,6 +667,7 @@ +--- configure.orig Thu Mar 30 16:00:19 2006 ++++ configure Sat Aug 19 10:34:48 2006 +@@ -78,6 +78,8 @@ + withcurses=no;; + -no-shared-libs) + withsharedlibs=no;; ++ -no-x11|--no-x11) ++ x11_wanted=no;; + -x11include*|--x11include*) + x11_include_dir=$2; shift;; + -x11lib*|--x11lib*) +@@ -667,6 +669,7 @@ i386,*,linux_elf) profiling='prof';; i386,*,gnu) profiling='prof';; i386,*,bsd_elf) profiling='prof';; @@ -8,7 +17,7 @@ sparc,*,solaris) profiling='prof' case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; -@@ -1107,117 +1108,14 @@ +@@ -1107,122 +1110,24 @@ x11_include="not found" x11_link="not found" @@ -132,3 +141,13 @@ if test "$x11_include" = "not found" || test "$x11_link" = "not found" then + echo "X11 not found, the \"graph\" library will not be supported." + x11_include="" ++elif test "$x11_wanted" = "no" ++then ++ echo "X11 support was disabled, the \"graph\" library will not be supported." ++ x11_include="" ++ x11_link="" + else + echo "Location of X11 include files: $x11_include/X11" + echo "Options for linking with X11: $x11_link" --- ocaml-notk-3.09.2_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060819043755.8B6EB12030>