diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-08-19 09:38:45 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-08-19 09:38:45 +0000 |
| commit | 6309d0dc0689bb5464783e6bf209fb5e5ec6c926 (patch) | |
| tree | a63cb5b214241c7af759324ef29558d5cb0f8fd8 /lang/ocaml | |
| parent | bc7a1fddcc52085a7c515df1c19b4285845947aa (diff) | |
| download | ports-6309d0dc0689bb5464783e6bf209fb5e5ec6c926.tar.gz ports-6309d0dc0689bb5464783e6bf209fb5e5ec6c926.zip | |
Don't depend on X11 when WITHOUT_X11 was defined, even if X11 exists on
target machine.
PR: ports/102261
Submitted by: Stanislav Sedov (maintainer)
Requested by: John E Hein <jhein@timing.com>
Notes
Notes:
svn path=/head/; revision=170977
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile | 5 | ||||
| -rw-r--r-- | lang/ocaml/files/patch-configure | 27 |
2 files changed, 26 insertions, 6 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 451ff79af5bd..f62fd965f0e8 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -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 @@ THR_LD= #empty 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 @@ PLIST_SUB+= X11="@comment " WITHOUT_TK= yes SFX= -nox11 CONFLICTS+= ocaml-[0-9]* ocaml-notk-[0-9]* +CONFIGURE_ARGS+=-no-x11 .endif .if defined(WITHOUT_TK) diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index 1d822d8d7d15..b3da3425d791 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -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" |