head	1.16;
access;
symbols
	RELEASE_8_3_0:1.15
	RELEASE_9_0_0:1.14
	RELEASE_7_4_0:1.13
	RELEASE_8_2_0:1.13
	RELEASE_6_EOL:1.13
	RELEASE_8_1_0:1.13
	RELEASE_7_3_0:1.12
	RELEASE_8_0_0:1.12
	RELEASE_7_2_0:1.11
	RELEASE_7_1_0:1.9
	RELEASE_6_4_0:1.9
	RELEASE_5_EOL:1.9
	RELEASE_7_0_0:1.8
	RELEASE_6_3_0:1.8
	PRE_XORG_7:1.8
	RELEASE_4_EOL:1.8
	RELEASE_6_2_0:1.8
	RELEASE_6_1_0:1.6
	RELEASE_5_5_0:1.6
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.4
	RELEASE_4_11_0:1.4
	RELEASE_5_3_0:1.4
	RELEASE_4_10_0:1.3;
locks; strict;
comment	@# @;


1.16
date	2012.11.17.05.58.53;	author svnexp;	state Exp;
branches;
next	1.15;

1.15
date	2012.01.15.20.32.00;	author crees;	state Exp;
branches;
next	1.14;

1.14
date	2011.04.04.02.29.25;	author stas;	state Exp;
branches;
next	1.13;

1.13
date	2010.03.22.09.37.40;	author stas;	state Exp;
branches;
next	1.12;

1.12
date	2009.06.29.10.46.44;	author stas;	state Exp;
branches;
next	1.11;

1.11
date	2009.04.11.13.23.04;	author stas;	state Exp;
branches;
next	1.10;

1.10
date	2009.04.06.19.40.07;	author stas;	state Exp;
branches;
next	1.9;

1.9
date	2008.04.06.19.44.41;	author stas;	state Exp;
branches;
next	1.8;

1.8
date	2006.08.19.09.38.45;	author itetcu;	state Exp;
branches;
next	1.7;

1.7
date	2006.06.14.21.46.40;	author sat;	state Exp;
branches;
next	1.6;

1.6
date	2005.12.01.15.46.34;	author garga;	state Exp;
branches;
next	1.5;

1.5
date	2005.07.03.06.02.21;	author mi;	state Exp;
branches;
next	1.4;

1.4
date	2004.07.19.21.13.24;	author vs;	state Exp;
branches;
next	1.3;

1.3
date	2004.02.02.12.53.27;	author arved;	state Exp;
branches;
next	1.2;

1.2
date	2004.02.02.12.02.04;	author arved;	state Exp;
branches;
next	1.1;

1.1
date	2003.12.14.15.53.51;	author sergei;	state Exp;
branches;
next	;


desc
@@


1.16
log
@Switch exporter over
@
text
@$FreeBSD: head/lang/ocaml/files/patch-configure 300896 2012-07-14 13:54:48Z beat $

--- configure.orig	2011-07-04 22:15:01.000000000 +0100
+++ configure	2012-01-15 20:29:30.319674803 +0000
@@@@ -85,6 +85,8 @@@@
         withcurses=no;;
     -no-shared-libs)
         withsharedlibs=no;;
+    -no-x11|--no-x11)
+        x11_wanted=no;;
     -x11include*|--x11include*)
         x11_include_dir=$2; shift;;
     -x11lib*|--x11lib*)
@@@@ -521,7 +523,7 @@@@
       mksharedlib="$flexlink"
       mkmaindll="$flexlink -maindll"
       shared_libraries_supported=true;;
-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
+    *-*-linux-gnu|*-*-linux|*-*-freebsd*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
       sharedcccompopts="-fPIC"
       mksharedlib="$bytecc -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
@@@@ -636,6 +638,7 @@@@
     i[345]86-*-netbsd*)           natdynlink=true;;
     x86_64-*-netbsd*)             natdynlink=true;;
     i386-*-gnu0.3)                natdynlink=true;;
+    *-*-freebsd*)                 natdynlink=true;;
   esac
 fi
 
@@@@ -687,6 +690,7 @@@@
   hppa*-*-gnu*)                 arch=hppa; system=gnu;;
   powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
   powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
+  powerpc-*-freebsd*)           arch=power; model=ppc; system=bsd;;
   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
   powerpc-*-darwin*)            arch=power; system=rhapsody
                                 if $arch64; then model=ppc64; else model=ppc; fi;;
@@@@ -796,6 +800,7 @@@@
   i386,*,bsd_elf) profiling='prof';;
   amd64,*,macosx) profiling='prof';;
   i386,*,macosx) profiling='prof';;
+  *,*,freebsd) profiling='prof';;
   sparc,*,solaris)
     profiling='prof'
     case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
@@@@ -1256,133 +1261,24 @@@@
 x11_include="not found"
 x11_link="not found"
 
-for dir in \
-    $x11_include_dir          \
-                              \
-    /usr/X11R7/include        \
-    /usr/include/X11R7        \
-    /usr/local/X11R7/include  \
-    /usr/local/include/X11R7  \
-    /opt/X11R7/include        \
-                              \
-    /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/lib64      \
-    /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/lib64            \
-    /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.dylib || \
-     test -f $dir/libX11.sa; then
-    if test $dir = /usr/lib; then
-      x11_link="-lX11"
-    else
-      x11_libs="-L$dir"
-      case "$host" in
-        *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
-        *) x11_link="-L$dir -lX11";;
-      esac
-    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
   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"
@@@@ -1509,7 +1405,7 @@@@
   then tk_libs="$tk_libs $dllib"
   elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
   then
-    tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
+    tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj.$tclmin $dllib"
   elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
   then
     tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
@


1.15
log
@Fix build on FreeBSD 10

Submitted by:	avg
Approved by:	maintainer timeout (>8 weeks)
@
text
@d1 1
a1 1
$FreeBSD$
@


1.14
log
@- Re-enable native dynamic linking on FreeBSD.
- Bump port revision.

PR:		ports/156159
Submitted by:	Johan van Selst <johans@@stack.nl>
Pointy hat to:	me
@
text
@d1 4
a4 2
--- configure.orig	2010-07-28 06:18:22.000000000 -0700
+++ configure	2011-04-03 13:46:37.000000000 -0700
d14 12
a25 3
@@@@ -629,6 +631,7 @@@@
     i686-*-kfreebsd*)             natdynlink=true;;
     x86_64-*-kfreebsd*)           natdynlink=true;;
d31 1
a31 1
@@@@ -680,6 +683,7 @@@@
d39 1
a39 1
@@@@ -789,6 +793,7 @@@@
d47 1
a47 1
@@@@ -1249,133 +1254,24 @@@@
d192 1
a192 1
@@@@ -1502,7 +1398,7 @@@@
@


1.13
log
@- Fix build on powerpc.
@
text
@d1 2
a2 2
--- configure.orig	2009-05-20 08:33:09.000000000 -0700
+++ configure	2010-03-20 02:36:54.000000000 -0700
d12 9
a20 1
@@@@ -642,6 +644,7 @@@@
d28 1
a28 1
@@@@ -751,6 +754,7 @@@@
d36 1
a36 1
@@@@ -1195,133 +1199,24 @@@@
d181 1
a181 1
@@@@ -1448,7 +1343,7 @@@@
@


1.12
log
@- Update to 3.11.1.
@
text
@d1 2
a2 2
--- configure.orig	2009-05-20 19:33:09.000000000 +0400
+++ configure	2009-06-29 14:12:59.000000000 +0400
d12 9
a20 1
@@@@ -751,6 +753,7 @@@@
d28 1
a28 1
@@@@ -1195,133 +1198,24 @@@@
d173 1
a173 1
@@@@ -1448,7 +1342,7 @@@@
@


1.11
log
@- Update lang/ocaml to 3.11.0. [1]
- Fix devel/cil build with 3.11.0 by using proper object file name
- Fix devel/deputy build with 3.11.0 by using proper object file name
- Fix lang/mtasc. Ocamlp4 syntax has changed and usage of ';' as delimiters
  is not allowed now.
- Fix usage message in lang/mtasc.
- Implement a FreeBSD specific code for retriving the executable path in lang/mtasc.
- Update devel/omake to 0.9.8.5.
- Fix devel/omake compilation with 3.11 by dropping an unused reference from the code.
- Fix www/geneweb build with 3.11 by not emitting errors for warnings.
- Fix print/advi build. [2]
- Update lang/cduce to 0.5.3 (this fixes build with ocaml 3.11.0).

PR:		ports/130845 [1] [2] (based on)
Submitted by:	Hirohisa Yamaguchi <umq@@ueo.co.jp> [1],
		Tsurutani Naoki <turutani@@scphys.kyoto-u.ac.jp> [2]
@
text
@d1 2
a2 2
--- ./configure.orig	2008-11-07 19:34:16.000000000 +0900
+++ ./configure	2009-01-21 01:41:11.000000000 +0900
d12 1
a12 1
@@@@ -739,6 +741,7 @@@@
d20 1
a20 1
@@@@ -1183,127 +1186,24 @@@@
d27 6
d165 1
a165 1
@@@@ -1372,7 +1275,7 @@@@
@


1.10
log
@- Make ocaml to find tk again.
@
text
@d1 3
a3 3
--- configure.orig	2008-01-04 16:26:38.000000000 +0300
+++ configure	2009-04-06 23:35:00.000000000 +0400
@@@@ -79,6 +79,8 @@@@
d12 1
a12 2
@@@@ -686,6 +688,7 @@@@
   i386,*,gnu) profiling='prof';;
d14 1
d20 1
a20 1
@@@@ -1132,124 +1135,24 @@@@
a131 1
-      x11_link="-L$dir -lX11"
d133 4
@


1.9
log
@- Update to 3.10.2.

Thanks to:	Thomas Crimi <tcrimi@@procida.us>
@
text
@d2 1
a2 1
+++ configure	2008-04-06 23:16:20.000000000 +0400
d156 9
@


1.8
log
@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>
@
text
@d1 3
a3 3
--- configure.orig	Thu Mar 30 16:00:19 2006
+++ configure	Sat Aug 19 10:34:48 2006
@@@@ -78,6 +78,8 @@@@
d12 1
a12 2
@@@@ -667,6 +669,7 @@@@
   i386,*,linux_elf) profiling='prof';;
d15 1
d20 1
a20 1
@@@@ -1107,122 +1110,24 @@@@
d112 1
d127 1
@


1.7
log
@- Update to 3.09.2
- Add MASTER_SITE_GENTOO
- Unqoute a BROKEN

PR:		ports/97555
Submitted by:	sat
Tested by:	Joseph Koshy <jkoshy@@freebsd.org>, Denis Shaposhnikov <dsh@@vlink.ru>,
		Holger Lamm <holger@@e-gitt.net>, Hubert Tournier <hubert.tournier@@online.fr>,
		Dan Pelleg <daniel+unison@@pelleg.org> (many thanks are due)
@
text
@d1 12
a12 3
--- ./configure.orig	Thu Mar 30 14:00:19 2006
+++ ./configure	Sun May 21 14:02:41 2006
@@@@ -667,6 +667,7 @@@@
d20 1
a20 1
@@@@ -1107,117 +1108,14 @@@@
d144 10
@


1.6
log
@- Update to 3.09.0

PR:		ports/89780
Submitted by:	maintainer
@
text
@d1 3
a3 4
--- configure.orig	Wed Sep  7 12:41:56 2005
+++ configure	Wed Sep  7 12:30:03 2005
@@@@ -653,6 +653,7 @@@@
   alpha,*,digital) profiling='prof';;
d5 1
d11 1
a11 1
@@@@ -1123,117 +1124,14 @@@@
@


1.5
log
@OCaml folks use $(ARCH) in Makefiles to mean, what configure identified
as the architecture (and wrote out ${WRKSRC}/config/Makefile).
Our make, however, ignores assigments to this variable. Fortunately for
most concerned, make's ARCH is the same as configure's. Except on
sparc64.
This update fixes this problem as well as
	. adds a hunk to patch-configure to enable profiling on all
	  platforms;
	. modifies REPLINPLACE_ARGS to not even create .bak files instead
	  of removing them later.

at the moment, the build still dies on Panther due to a segfault in the
freshly built ocamlc.opt. It may be due to Panther's running 6-current,
however and there is no other sparc64 to check...

Notified by:	kris	(the sparc vs. sparc64 issue)
@
text
@d1 3
a3 4
--- configure.orig	Thu Jul 15 16:17:46 2004
+++ configure	Thu Jul 15 16:58:51 2004
@@@@ -652,7 +652,8 @@@@
 case "$arch,$model,$system" in
d11 1
a11 1
@@@@ -1113,116 +1113,14 @@@@
d74 1
@


1.4
log
@Update to 3.08.0

PR:		ports/69254
Submitted by:	Eugene Ossintsev (maintainer)
@
text
@d3 9
@


1.3
log
@Fix build on IA64, while I am here.
@
text
@d1 3
a3 21
--- configure.orig	Thu Sep 25 01:17:13 2003
+++ configure	Mon Feb  2 04:21:43 2004
@@@@ -559,6 +559,8 @@@@
   powerpc-*-darwin*)            arch=power; model=ppc; system=rhapsody;;
   arm*-*-linux*)                arch=arm; system=linux;;
   ia64-*-linux*)                arch=ia64; system=linux;;
+  ia64-*-freebsd*)		arch=ia64; system=freebsd;;
+  amd64-*-freebsd*)		arch=amd64; system=freebsd;;
   x86_64-*-linux*)              arch=amd64; system=linux;;
 esac
 
@@@@ -621,7 +623,7 @@@@
   power,*,bsd)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
   power,*,rhapsody) ;;
   arm,*,linux)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  ia64,*,linux)     asflags=-xexplicit
+  ia64,*,*)     asflags=-xexplicit
                     aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM) -Wa,-xexplicit';;
   amd64,*,*)        aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
 esac
@@@@ -1097,116 +1099,14 @@@@
d59 1
a59 1
+    x11_include="$x11_include_dir"
d120 2
a121 2
+    x11_link="-L$x11_lib_dir -lX11"
+    x11_libs="-L$x11_lib_dir"
@


1.2
log
@Fix build on AMD64

Submitted by:	stephane via maintainer
@
text
@d1 3
a3 3
--- configure.orig	Thu Sep 25 10:17:13 2003
+++ configure	Mon Feb  2 12:54:26 2004
@@@@ -559,6 +559,7 @@@@
d7 1
d12 10
a21 1
@@@@ -1097,116 +1098,14 @@@@
@


1.1
log
@- Added a patch to the original OCaml's configure script
  to fix building the port when using WITHOUT_X11 knob.
- Fixed Makefiles to avoid gmake-isms.
- Fix pkg-plist

PR:		60219
Submitted by:	maintainer
Noticed by:	Dmitry Morozovsky <marck@@rinet.ru>,
		Marwan Burelle <Marwan.Burelle@@ens.fr>
@
text
@d2 10
a11 2
+++ configure	Thu Dec 11 13:39:49 2003
@@@@ -1097,116 +1097,14 @@@@
@

