Commit graph

50 commits

Author SHA1 Message Date
Alexey Dokuchaev
854e293062 Further pre-update cleanups for `lang/ocaml':
- Do not suppress .bak-files when patching things with ``sed(1) -i'',
  those can be useful for debugging and catching no-ops
- Drop `files/manfiles', it is no longer used (looks like a relic from
  pre-staging times)
- Do not pass ``-as "${AS} ${ASFLAGS}"'' in the initial CONFIGURE_ARGS:
  when ARM support was added in r361233, appropriate values are passed
  conditionally (subject to ${ARCH}), see line 69
- Simplify handling of CFLAGS (obtained from RedHat package): rather
  than passing them as part of the compiler and "fixing" one generated
  Makefile in `post-configure', teach the configure script about them
2017-12-18 14:48:49 +00:00
Alexey Dokuchaev
9333f46c41 In sight of long-overdue update of `lang/ocaml', start cleaning things up:
- Remove hunks from `patch-configure' that are irrelevant on *BSD
- Do not aggressively edit configure script in `post-patch', especially
  when it is not required (e.g. no variables are expanded).  This was
  the reason for bogus changes committed in r403835 by wen@ and r403898
  by marino@ (cf. "$bytecclinkopts $bytecclinkopts $bytecclinkopts");
  now ``make makepatch'' command is idempotent again
- Do not needlessly pass STAGEDIR via MAKE_ENV: it is correctly passed
  via MAKE_ARGS (as DESTDIR), and OCaml's build system is aware of it,
  while nowhere referencing STAGEDIR variable
- Drop permission fix for ld.conf that was added in r169472 by itetcu@
  11 years 4 months ago: it is no-op these days

Build logs remain identical (modulo the whitespace), regression tests pass.
2017-12-18 06:55:06 +00:00
Alexey Dokuchaev
7874ef5212 First step to unbreak `lang/ocaml' on aarch64: teach configure script that
the architecture exists on FreeBSD.  Unfortunately, this is not enough for
build to succeed, it now complains that as(1) is not found:

  ../boot/ocamlrun ../ocamlopt -strict-sequence -w +33..39 -g -warn-error A
  -bin-annot -nostdlib -safe-string `./Compflags camlinternalFormatBasics.cmx`
  -c camlinternalFormatBasics.ml
  sh: as: not found
  File "camlinternalFormatBasics.ml", line 1:
  Error: Assembler error, input left in file /tmp/camlasm4329ae.s
  gmake[7]: *** [Makefile.shared:84: camlinternalFormatBasics.cmx] Error 2

Developed on:	ref11-aarch64.freebsd.org
2017-12-15 15:31:08 +00:00
Alexey Dokuchaev
79cfdfcb24 Improve handling of the system architecture in `lang/ocaml'.
OCaml is using ARCH variable throughout its makefiles, which clashes with
our own variable of the same name.  To workaround it, OCAML_ARCH variable
was introduced which is set based on ARCH, and makefiles later patched in
the `post-configure' target.

This approach does not scale well with porting OCaml to new architectures
as being fragile and sometimes making the build non-idempotent under some
circumstances.

Instead of "fixing" makefiles post-configure, rename ARCH to SYSTEM_ARCH:
this avoids the clash altogether and lets configure script to set correct
values for supported architectures in the first place with no adjustments
required afterwards.

Tested on:	i386, amd64, powerpc
2017-12-15 15:15:02 +00:00
Guido Falsi
c80bd713b0 Fix packaging on armv6 by enabling profiling libraries.
PR:		206615
Submitted by:	mikael.urankar at gmail.com
Approved by:	michipili at gmail.com (maintainer)
2016-03-24 20:55:15 +00:00
Alexey Dokuchaev
e4358ce5e5 As usual, routinely update to the next version in r403835 had removed support
for DragonFly (readded in r403898) and FreeBSD/powerpc.  Put it back (again).
2016-01-04 04:27:26 +00:00
John Marino
5630b0f07c lang/ocaml: Unbreak DragonFly
The previous upgrade removed all the dragonfly patches.  Bring those
back to restore the port on DragonFly.

PR:	203589
2015-12-17 10:00:27 +00:00
Wen Heping
4776950de3 - Update to 4.02.3
PR:		203589
Submitted by:	michipili@gmail.com(maintainer)
2015-12-16 03:31:51 +00:00
Antoine Brodin
e6f63e5a7e Backout r398381, it fails to package
With hat:	portmgr
MFH:		2015Q4
2015-10-02 06:40:02 +00:00
Mikhail Teterin
bfb758cc57 Upgrade from 4.02.1 to 4.02.3. Disable adding of explicit -O to compiler flags,
because that ends up lowering optimization for most people (from -O2).

Approved by:	maintainer

(The upgrade is too minor to justify revision bumping of depending ports.)
2015-10-01 19:24:12 +00:00
Alexey Dokuchaev
00ddfaed6a Fix the build on PowerPC (again) that was broken as of r385012. 2015-07-30 09:37:16 +00:00
Sunpoet Po-Chuan Hsieh
544075d8c9 - Remove incomplete check for configure arguments to fix build when CONFIGURE_ARGS contains =
PR:		199884
Submitted by:	sunpoet (myself)
Approved by:	Michael Grunewald <michipili@gmail.com> (maintainer)
2015-05-03 13:35:34 +00:00
John Marino
8b541afa7a lang/ocaml: Upgrade version 4.01 => 4.02
PR:		195736
Submitted by:	Michael Gruenewald (maintainer)
Add'l fixes:	marino

Besides typical port cleanup, the dragonfly patches which had been
removed for the update were added back to the configure patch.
2015-04-29 20:45:23 +00:00
John Marino
eaf44736bb lang/ocaml: Improve jobcontrol in ocamlbuild
Apply patch for upstream issue 0005371.  It improves job control in
ocamlbuild and fixes some faulty sigpipe affecting ports build with
ocamlbuild.

PR:		189710
Submitted by:	edwin (skylable.com)
patch by:	glondu
Approved by:	maintainer (Michael Gruenewald)
2014-08-19 13:55:11 +00:00
Alexey Dokuchaev
f7e3b725b5 Unbreak the build and packaging on PowerPC. 2014-08-02 11:57:17 +00:00
John Marino
26b53b5bc4 lang/ocaml: Add ARMv6 support
Redports confirms that changes do not break i386 and amd64 builds (8x).

PR:		189063
Submitted by:	maintainer (Michael Gruenewald)
Patch by:	Andy Ray
2014-07-08 13:11:04 +00:00
John Marino
e3a3698100 lang/ocaml: Remove DEF_OPT option (non-default option)
The option reacts poorly with ocamlp4, and phasing out DEF_OPT
completely will prevent a lot of breakage with ports that also
interact with ocamlp4.

PR:		189176
Submitted by:	Anil Madhavapeddy
Prepared by:	maintainer (Michael Gruenewald)
2014-06-10 23:40:37 +00:00
John Marino
c1d7b20915 lang/ocaml: Fix NO_PROFILE setting and native compiler for DragonFly
The ocaml port was not respecting a NO_PROFILE definition in make.conf,
which causes a stage check failure (missing files) if it is set. Improve
that logic and patch the configure script in numerous places to support
building the native code compiler on DragonFly.  This is one of those
famous ports that think all BSDs have the pattern "bsd" in their target
triplet.

Continued under PR: ports/188158
2014-05-07 08:27:28 +00:00
John Marino
ae5ca3bbc1 lang/ocaml: Upgrade version 4.00.1 to 4.01.0 and stage
This is a significant update from the maintainer.  Not only has stage
support been added (and verified with an 8x pass on RedPorts), but
installed binaries are no longer stripped which was the cause of the
coccinelle malfunction seen on DragonFly.

Licensing was also defined, and the X11 build failure caused by the
use of the -R linker flag without the -Wl prefix has also been
rectified. [2]

PR:		ports/188158 [1]
Submitted by:	maintainer (Michael Gruenewald)

PR:		ports/188330 [2]
Submitted by:	madpilot
Approved by:	maintainer
2014-04-26 17:20:32 +00:00
John Marino
57d1903de7 ocaml update 1/4: lang/ocaml upgrade from 3.12 to 4.00
There have been manual outstanding PRs on OCAML that have dragged on
for well more than a year.  In the meantime, FreeBSD has been painfully
stucking on version 3.12 of Ocaml.  Meanwhile, DragonFly's dports have
been maintaining version 4.00.

With a "Just do it" attitude, the dports version of Ocaml has been brought
in.  This doesn't have stage support, nor is the the latest version
available.  The idea is just get a working base Ocaml 4.00 in ports and
then have the maintainer update the appropriate PRs.

As a consequence, updates to omake, ocaml-findlib, and ocaml-images is
also required and upcoming.

Urged by:	portmgr (bapt)
Related PR:	ports/173364
Related PR:	ports/173453
2014-03-26 17:50:28 +00:00
Chris Rees
6f78b2dbb4 Fix build on FreeBSD 10
Submitted by:	avg
Approved by:	maintainer timeout (>8 weeks)
2012-01-15 20:32:00 +00:00
Michael Scheidell
b7948d7840 - Install expunge script with right permissions [1]
- needed to take the MAN()!= out because it causes multiple background shells and can hurt INDEX performance [2]

PR:		ports/163275 [1]
Approved by:	gabor (mentor) [2]
2011-12-29 20:33:27 +00:00
Stanislav Sedov
c1e280dd24 - 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
2011-04-04 02:29:25 +00:00
Stanislav Sedov
82cba462f4 - Update to 3.12.0.
PR:		ports/155155
Submitted by:	wen heping <wenheping@gmail.com>, Jaap Boender <jaapb@kerguelen.org>
2011-03-31 07:36:54 +00:00
Stanislav Sedov
bf9e0b67a7 - Fix build on powerpc. 2010-03-22 09:37:40 +00:00
Stanislav Sedov
3df12a2718 - Update to 3.11.1. 2009-06-29 10:46:44 +00:00
Stanislav Sedov
8a59eb88f4 - Fix a couple of serious bugs in threading code (#4666 and #4678).
Obtained from:	ocaml cvs
2009-05-09 19:54:23 +00:00
Stanislav Sedov
c6762e8051 - 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]
2009-04-11 13:23:05 +00:00
Stanislav Sedov
36d7489eab - Make ocaml to find tk again. 2009-04-06 19:40:07 +00:00
Pav Lucistnik
fb3b71be54 - Remove empty files 2008-04-10 11:56:28 +00:00
Stanislav Sedov
0588ad6621 - Update to 3.10.2.
Thanks to:	Thomas Crimi <tcrimi@procida.us>
2008-04-06 19:44:41 +00:00
Stanislav Sedov
3e359bb0dc - Update to 3.09.3
ChangeLog:
- Mainly bugfix release

Approved by:	sem (mentor)
2006-09-23 17:37:24 +00:00
Ion-Mihai Tetcu
6309d0dc06 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>
2006-08-19 09:38:45 +00:00
Ion-Mihai Tetcu
92f54efd68 - Add support for threaded Tk by passing PTHREAD_LIBS to configure in -tklibs
swith. This allows build with threaded Tk (otherwise configure fails to use
  Tk). Also depend on threaded Tk by default in case of THREADS support - with
  non-pthread tk library it will not be stable enough
- Add OPTIONS
- Enable builds of non-threaded targets
- Depend on X in case if X is installed, since configure does this by default.
- Rename patchfiles to make portlint happy
- Eliminate the number of reinplace patterns (remove duplicates, optimize)
- Move manpage list in the separate files
- Pass pthread flags to compiler (PTHREAD_CFLAGS/LIBS safety)
- Remove some ugly hacks on setting permissions etc (eliminated by setting
  correct permission in COPY_TREE macros)
- Eliminate duplicate entries in PLIST in case of unstalling optimized binaries,
  also optimize this part
- Remove unused PLIST_SUB variable
- Miscelanios cleanups in Makefile
- Pass maintainership to submitter

The following files was added:
- files/man1
- files/manlinks
- files/mann
- files/patch-camlp4-man_Makefile
- files/patch-camlp4_lib_Makefile
- files/patch-ocamldoc_Makefile
- files/patch-stdlib_Makefile

I removed the following files:
- files/patch-camlp4-man::Makefile
- files/patch-camlp4::lib::Makefile
- files/patch-ocamldoc::Makefile
- files/patch-stdlib::Makefile

Also add bsd.ocaml.mk until it will be included in Mk/

PR:		ports/101122
Submitted by:	Stanislav Sedov
2006-08-02 14:00:20 +00:00
Andrew Pantyukhin
c143dec854 - 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)
2006-06-14 21:46:40 +00:00
Renato Botelho
5807826ac5 - Update to 3.09.0
PR:		ports/89780
Submitted by:	maintainer
2005-12-01 15:46:34 +00:00
Mikhail Teterin
3df8eb7768 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)
2005-07-03 06:02:21 +00:00
Mario Sergio Fujikawa Ferreira
e7ce76c85c o Update to 3.08.3
o Uphold both CFLAGS and INSTALL_* permission safeness
o Both sort and update PLIST
o Tested against net/mldonkey-devel for 24 hours
2005-04-23 01:34:05 +00:00
Volker Stolz
526d3996ba Update to 3.08.0
PR:		ports/69254
Submitted by:	Eugene Ossintsev (maintainer)
2004-07-19 21:13:24 +00:00
Tilman Keskinoz
7c99d4cdef Fix build on IA64, while I am here. 2004-02-02 12:53:27 +00:00
Tilman Keskinoz
d596711e41 Fix build on AMD64
Submitted by:	stephane via maintainer
2004-02-02 12:02:04 +00:00
Sergei Kolobov
359a13588b - 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>
2003-12-14 15:53:51 +00:00
Sergei Kolobov
b56504f927 - Update to 3.07 (patchlevel 2
- Fix MASTER_SITES list
- Update MANN and MLINK
- Re-sort pkg-plist for better maintenance
- Assign maintainership to the submitter

PR:		59602
Submitted by:	Eugene Ossintsev <eugos@gmx.net>
Approved by:	previous maintainer
2003-12-06 00:05:05 +00:00
Jens Schweikhardt
3905eb963a New patch to unbreak the build (configure step runs thread program that
never terminates and hogs the CPU).

Approved by: MAINTAINER timeout
PR:	ports/45233
2003-03-29 13:06:59 +00:00
Kevin Lo
6aa02c012e Update to version 3.06
PR: 41822
Submitted by: Ronald Kuehn <rk@ronald.org>
2002-08-21 02:14:35 +00:00
Christian Weisgerber
ecc678ac50 Update to ocaml 3.05.
PR:		41299
Submitted by:	Ronald Kuehn <rk@ronald.org>
Approved by:	maintainer timeout
2002-08-12 14:22:37 +00:00
Patrick Li
de6c00910f Update to 3.04
PR:		33820
Submitted by:	Ronald Kuehn <rk@ronald.org>
Approved by:	maintainer
2002-02-11 05:22:16 +00:00
Dirk Meyer
79c07b4f16 Deletion of patches didn't make it.
Thanks to Stephane.Legrand@bigfoot.com for reporting it.

PR:		25816
Submitted by:	patrick@watson.org
2001-03-20 04:34:01 +00:00
James E. Housley
c10edbe218 Attached patch allows OCAML to detect and use FreeBSD's native
pthreads in Thread module. Also fixes the bug in OCAML
distribution which nobody apparently noticed before.

Use TK 8.3 instead of 8.2 for labltk

PR:		23305
Submitted by:	Alexander N. Kabaev <ak03@gte.com>
Submitted by:	Patrick M Doane <patrick@watson.org>
2001-02-17 23:01:11 +00:00
R. Imura
fb3062ab44 Update to version 2.04.
PR:		16656
Submitted by:	Ronald Kuehn <kuehn@rz.tu-clausthal.de>
Approved by:	maintainer
2000-02-28 15:44:36 +00:00