svn commit: r349354 - in head/devel/ocaml-opam: . files

[John Marino]

Author: marino
Date: Thu Mar 27 19:19:01 2014
New Revision: 349354
URL: http://svnweb.freebsd.org/changeset/ports/349354
QAT: https://qat.redports.org/buildarchive/r349354/

Log:
  devel/ocaml-opam: Update 1.1.0 -> 1.1.1 and unbreak
  
  Updating to the latest point version did not fix the problems.  The
  first is that now the built tool ocp-build requires TERM to be set in
  the environment, otherwise it returns non-zero result with an error
  message (hidden by /dev/null in first instance) and breaks the build.
  
  Later the build failed the FS because it was saving preferences at $HOME.
  Adding -no-user-prefs switch to the command seems to suppress that.
  
  Finally, the GNU makefile is not jobs safe, so indicate that.  The GNU
  makefile does not participate much in the overall build.

Added:
  head/devel/ocaml-opam/files/
  head/devel/ocaml-opam/files/patch-Makefile   (contents, props changed)
Modified:
  head/devel/ocaml-opam/Makefile
  head/devel/ocaml-opam/distinfo
  head/devel/ocaml-opam/pkg-plist

Modified: head/devel/ocaml-opam/Makefile
==============================================================================
--- head/devel/ocaml-opam/Makefile	Thu Mar 27 18:45:39 2014	(r349353)
+++ head/devel/ocaml-opam/Makefile	Thu Mar 27 19:19:01 2014	(r349354)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opam
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocamlpro.com/pub/
 PKGNAMEPREFIX=	ocaml-
@@ -13,12 +13,13 @@ COMMENT=	Source-based package manager fo
 
 LICENSE=	GPLv3
 
-BROKEN=		Does not build
-
 BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USES=		gmake
 USE_OCAML=	yes
 GNU_CONFIGURE=	yes
+MAKE_ENV+=	TERM=xterm
+
+MAKE_JOBS_UNSAFE= yes
 
 .include <bsd.port.mk>

Modified: head/devel/ocaml-opam/distinfo
==============================================================================
--- head/devel/ocaml-opam/distinfo	Thu Mar 27 18:45:39 2014	(r349353)
+++ head/devel/ocaml-opam/distinfo	Thu Mar 27 19:19:01 2014	(r349354)
@@ -1,2 +1,2 @@
-SHA256 (opam-full-1.1.0.tar.gz) = c0ab5e85b6cd26e533a40686e08aea173387d15bead817026f5b08f264642583
-SIZE (opam-full-1.1.0.tar.gz) = 2271477
+SHA256 (opam-full-1.1.1.tar.gz) = bfcb78109cf88612b5170b25bb96aa576ed3908c8a68b9164a7ae16f9f59ae38
+SIZE (opam-full-1.1.1.tar.gz) = 2278273

Added: head/devel/ocaml-opam/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ocaml-opam/files/patch-Makefile	Thu Mar 27 19:19:01 2014	(r349354)
@@ -0,0 +1,10 @@
+--- Makefile.orig	2014-01-14 17:04:37.000000000 +0100
++++ Makefile
+@@ -1,6 +1,6 @@
+ -include Makefile.config
+ 
+-LOCAL_OCPBUILD=./ocp-build/ocp-build -no-use-ocamlfind
++LOCAL_OCPBUILD=./ocp-build/ocp-build -no-use-ocamlfind -no-user-prefs
+ OCPBUILD ?= $(LOCAL_OCPBUILD)
+ SRC_EXT=src_ext
+ TARGETS = opam opam-admin opam-installer

Modified: head/devel/ocaml-opam/pkg-plist
==============================================================================
--- head/devel/ocaml-opam/pkg-plist	Thu Mar 27 18:45:39 2014	(r349353)
+++ head/devel/ocaml-opam/pkg-plist	Thu Mar 27 19:19:01 2014	(r349354)
@@ -1,5 +1,6 @@
 bin/opam
 bin/opam-admin
+bin/opam-installer
 man/man1/opam-admin-check.1.gz
 man/man1/opam-admin-make.1.gz
 man/man1/opam-admin.1.gz
@@ -16,7 +17,9 @@ man/man1/opam-remote.1.gz
 man/man1/opam-remove.1.gz
 man/man1/opam-repository.1.gz
 man/man1/opam-search.1.gz
+man/man1/opam-show.1.gz
 man/man1/opam-switch.1.gz
+man/man1/opam-uninstall.1.gz
 man/man1/opam-update.1.gz
 man/man1/opam-upgrade.1.gz
 man/man1/opam.1.gz