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

John Marino marino at FreeBSD.org
Wed Apr 29 19:08:06 UTC 2015 

Author: marino
Date: Wed Apr 29 19:08:04 2015
New Revision: 385004
URL: https://svnweb.freebsd.org/changeset/ports/385004

Log:
  devel/ocaml-opam: Upgrade version 1.2.0 => 1.2.1
  
  PR:		199413
  Submitted by:	mmatalka (gmail)
  Revised by:	maintainer (Joris Giovannangeli)

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

Modified: head/devel/ocaml-opam/Makefile
==============================================================================
--- head/devel/ocaml-opam/Makefile	Wed Apr 29 18:46:29 2015	(r385003)
+++ head/devel/ocaml-opam/Makefile	Wed Apr 29 19:08:04 2015	(r385004)
@@ -2,59 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	opam
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
-MASTER_SITES=	http://ocaml-extlib.googlecode.com/files/:extlib \
-		https://github.com/ocaml/ocaml-re/archive/:ocamlre \
-		http://erratique.ch/software/cmdliner/releases/:cmdliner \
-		http://ocamlgraph.lri.fr/download/:ocamlgraph \
-		https://gforge.inria.fr/frs/download.php/file/33593/:cudf \
-		https://gforge.inria.fr/frs/download.php/file/33677/:dose \
-		http://erratique.ch/software/uutf/releases/:uutf \
-		http://erratique.ch/software/jsonm/releases/:jsonm \
-		GHL:gh
+MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ \
+		http://github.com/ocaml/opam/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	ocaml-
-DISTFILES=	${OPAM_EXT_DIST} \
-		${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}.tar.gz:gh
-EXTRACT_ONLY=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}.tar.gz
+DISTNAME=	opam-full-${DISTVERSION}
 
 MAINTAINER=	joris at giovannangeli.fr
 COMMENT=	Source-based package manager for OCaml
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	ocaml
-GH_PROJECT=	opam
-GH_TAGNAME=	1.2.0
-GH_COMMIT=	cbe460b
-
 USES=		gmake
 USE_OCAML=	yes
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	TERM=xterm
 ALL_TARGET=	lib-ext all man
 
-OPAM_EXT_DIST=	extlib-1.5.3.tar.gz:extlib \
-		ocaml-re-1.2.0.tar.gz:ocamlre \
-		cmdliner-0.9.4.tbz:cmdliner \
-		ocamlgraph-1.8.5.tar.gz:ocamlgraph \
-		cudf-0.7.tar.gz:cudf \
-		dose3-3.2.2.tar.gz:dose \
-		uutf-0.9.3.tbz:uutf \
-		jsonm-0.9.1.tbz:jsonm \
-
 OPTIONS_DEFINE=		RSYNC GIT WGET HG DARCS ASPCUD
 OPTIONS_DEFAULT=	RSYNC GIT WGET
 
-RSYNC_DESC=		"Support remote repository synchronized with Rsync"
-WGET_DESC=		"Support remote repository synchronized with git"
-GIT_DESC=		"Support remote repository synchronized with HTTP"
-HG_DESC=		"Support remote repository synchronized with mercurial"
-DARCS_DESC=		"Support remote repository synchronized with darcs"
-ASPCUD_DESC=		"Use aspcud as an external dependencies solver"
+RSYNC_DESC=		Remote repository synchronized with Rsync
+WGET_DESC=		Remote repository synchronized with git
+GIT_DESC=		Remote repository synchronized with HTTP
+HG_DESC=		Remote repository synchronized with mercurial
+DARCS_DESC=		Remote repository synchronized with darcs
+ASPCUD_DESC=		Use aspcud as an external dependencies solver
 
 WGET_RUN_DEPENDS:=	wget:${PORTSDIR}/ftp/wget
 RSYNC_RUN_DEPENDS:=	rsync:${PORTSDIR}/net/rsync
@@ -65,8 +39,4 @@ ASPCUD_RUN_DEPENDS:=	aspcud:${PORTSDIR}/
 
 MAKE_JOBS_UNSAFE=	yes
 
-post-extract:
-	${INSTALL} ${OPAM_EXT_DIST:C/:.*$//:S/^/${DISTDIR}\//} \
-		${WRKSRC}/src_ext/
-
 .include <bsd.port.mk>

Modified: head/devel/ocaml-opam/distinfo
==============================================================================
--- head/devel/ocaml-opam/distinfo	Wed Apr 29 18:46:29 2015	(r385003)
+++ head/devel/ocaml-opam/distinfo	Wed Apr 29 19:08:04 2015	(r385004)
@@ -1,18 +1,2 @@
-SHA256 (extlib-1.5.3.tar.gz) = c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021
-SIZE (extlib-1.5.3.tar.gz) = 70897
-SHA256 (ocaml-re-1.2.0.tar.gz) = a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f
-SIZE (ocaml-re-1.2.0.tar.gz) = 82965
-SHA256 (cmdliner-0.9.4.tbz) = ecb65e2cfd984ec07e97a78f334a80cda41fb8f8bb5e37c41fd33e6a0e2e69ef
-SIZE (cmdliner-0.9.4.tbz) = 43984
-SHA256 (ocamlgraph-1.8.5.tar.gz) = d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f
-SIZE (ocamlgraph-1.8.5.tar.gz) = 269438
-SHA256 (cudf-0.7.tar.gz) = 92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701
-SIZE (cudf-0.7.tar.gz) = 54821
-SHA256 (dose3-3.2.2.tar.gz) = a30a189f9f298ed1de96d7098440c951f3df2c8da626f7f37f38cbfddefc909c
-SIZE (dose3-3.2.2.tar.gz) = 254091
-SHA256 (uutf-0.9.3.tbz) = 1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877
-SIZE (uutf-0.9.3.tbz) = 31734
-SHA256 (jsonm-0.9.1.tbz) = 3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73
-SIZE (jsonm-0.9.1.tbz) = 64843
-SHA256 (ocaml-opam-cbe460b.tar.gz) = d5d8941d7795660f2a78f918e98bd2e827193c6e2ba9874574507a79814fda8d
-SIZE (ocaml-opam-cbe460b.tar.gz) = 596559
+SHA256 (opam-full-1.2.1.tar.gz) = f210ece7a2def34b486c9ccfb75de8febd64487b2ea4a14a7fa0358f37eacc3b
+SIZE (opam-full-1.2.1.tar.gz) = 1519602

Added: head/devel/ocaml-opam/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ocaml-opam/files/patch-configure	Wed Apr 29 19:08:04 2015	(r385004)
@@ -0,0 +1,104 @@
+--- configure	2015-04-29 20:23:39.092132000 +0200
++++ configure	2015-04-29 20:24:39.312802000 +0200
+@@ -599,8 +599,6 @@
+ OCAML_PKG_re
+ OCAML_PKG_extlib
+ OCAML_PKG_unix
+-fetch
+-FETCH
+ OCAMLFIND
+ OCAMLYACC
+ OCAMLLEXDOTOPT
+@@ -671,7 +669,6 @@
+ ac_user_opts='
+ enable_option_checking
+ enable_version_check
+-enable_certificate_check
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1292,10 +1289,6 @@
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-version-check Do not check OCaml version
+ 
+-  --disable-certificate-check
+-                          Do not check the certificate of OPAM's dependency
+-                          archives
+-
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -4156,73 +4149,6 @@
+ 
+ 
+ 
+-# Check whether --enable-certificate_check was given.
+-if test "${enable_certificate_check+set}" = set; then :
+-  enableval=$enable_certificate_check;
+-fi
+-
+-
+-if test "x${enable_certificate_check}" = "xno"; then :
+-
+-  curl_certificate_check=--insecure
+-  wget_certificate_check=--no-check-certificate
+-
+-fi
+-
+-for ac_prog in curl wget
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_FETCH+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$FETCH"; then
+-  ac_cv_prog_FETCH="$FETCH" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_FETCH="$ac_prog"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-FETCH=$ac_cv_prog_FETCH
+-if test -n "$FETCH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FETCH" >&5
+-$as_echo "$FETCH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  test -n "$FETCH" && break
+-done
+-test -n "$FETCH" || FETCH="no"
+-
+-
+-if test x"$FETCH" = x"curl" ; then
+-  fetch="curl $curl_certificate_check -OL"
+-
+-elif test x"$FETCH" = x"wget" ; then
+-  fetch="wget $wget_certificate_check"
+-
+-else
+-  as_fn_error $? "You must have either curl or wget installed." "$LINENO" 5
+-fi
+-
+ echo
+ 
+

More information about the svn-ports-head mailing list