Attachment 154263 Details for Bug 194529 – upgrade to 1.2.0 and add optionnal dependencies

[patch] upgrade to 1.2.0 and add optionnal dependencies

patch (text/plain), 5.84 KB, created by joris on 2015-03-13 10:04:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joris

Created: 2015-03-13 10:04:15 UTC

Size: 5.84 KB

patch

obsolete

>diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
>index 8a09289..e3e7777 100644
>--- a/devel/ocaml-opam/Makefile
>+++ b/devel/ocaml-opam/Makefile
>@@ -2,67 +2,19 @@
> # $FreeBSD$
> 
> PORTNAME=	opam
>-PORTVERSION=	1.2.0
>+PORTVERSION=	1.1.1
> CATEGORIES=	devel
>-PKGNAMEPREFIX= ocaml-
>+MASTER_SITES=	http://www.ocamlpro.com/pub/
>+PKGNAMEPREFIX=	ocaml-
>+DISTNAME=	opam-full-${PORTVERSION}
> 
> MAINTAINER=	joris@giovannangeli.fr
> COMMENT=	Source-based package manager for OCaml
> 
> LICENSE=	GPLv3
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	ocaml
>-GH_PROJECT=	opam
>-GH_TAGNAME=	1.2.0
>-GH_COMMIT=	cbe460b
>-
>-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 \
>-		GH:gh
>-
>-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 \
>-
>-DISTFILES=	${OPAM_EXT_DIST} \
>-		${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}.tar.gz:gh
>-
>-EXTRACT_ONLY=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}.tar.gz
>-
> BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
> 
>-OPTIONS_DEFINE=	RSYNC GIT WGET HG DARCS ASPCUD
>-
>-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"
>-
>-OPTIONS_DEFAULT=	RSYNC GIT WGET
>-
>-WGET_RUN_DEPENDS:=wget:${PORTSDIR}/ftp/wget
>-RSYNC_RUN_DEPENDS:=rsync:${PORTSDIR}/net/rsync
>-GIT_RUN_DEPENDS:=git:${PORTSDIR}/devel/git
>-HG_RUN_DEPENDS:=hg:${PORTSDIR}/devel/mercurial
>-DARCS_RUN_DEPENDS:=darcs:${PORTSDIR}/devel/hs-darcs
>-ASPCUD_RUN_DEPENDS:=aspcud:${PORTSDIR}/math/aspcud
>-
>-ALL_TARGET= lib-ext all man
>-
> USES=		gmake
> USE_OCAML=	yes
> GNU_CONFIGURE=	yes
>@@ -70,7 +22,4 @@ MAKE_ENV+=	TERM=xterm
> 
> MAKE_JOBS_UNSAFE= yes
> 
>-post-extract:
>-	${INSTALL} ${OPAM_EXT_DIST:C/:.*$//:S/^/${DISTDIR}\//} ${WRKSRC}/src_ext/
>-
> .include <bsd.port.mk>
>diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo
>index 14e741f..f9253f3 100644
>--- a/devel/ocaml-opam/distinfo
>+++ b/devel/ocaml-opam/distinfo
>@@ -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.1.1.tar.gz) = bfcb78109cf88612b5170b25bb96aa576ed3908c8a68b9164a7ae16f9f59ae38
>+SIZE (opam-full-1.1.1.tar.gz) = 2278273
>diff --git a/devel/ocaml-opam/files/patch-Makefile b/devel/ocaml-opam/files/patch-Makefile
>new file mode 100644
>index 0000000..9bd2a31
>--- /dev/null
>+++ b/devel/ocaml-opam/files/patch-Makefile
>@@ -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
>diff --git a/devel/ocaml-opam/pkg-descr b/devel/ocaml-opam/pkg-descr
>index 51398b6..72cf86e 100644
>--- a/devel/ocaml-opam/pkg-descr
>+++ b/devel/ocaml-opam/pkg-descr
>@@ -2,4 +2,4 @@ OPAM is a source-based package manager for OCaml. It supports multiple
> simultaneous compiler installations, flexible package constraints, and
> a Git-friendly development workflow.
> 
>-WWW: https://opam.ocaml.org/
>+WWW: http://opam.ocamlpro.com/index.html
>diff --git a/devel/ocaml-opam/pkg-plist b/devel/ocaml-opam/pkg-plist
>index cb50e06..36a4dd9 100644
>--- a/devel/ocaml-opam/pkg-plist
>+++ b/devel/ocaml-opam/pkg-plist
>@@ -2,22 +2,24 @@ bin/opam
> bin/opam-admin
> bin/opam-installer
> man/man1/opam-admin-check.1.gz
>-man/man1/opam-admin-depexts.1.gz
> man/man1/opam-admin-make.1.gz
>-man/man1/opam-admin-stats.1.gz
> man/man1/opam-admin.1.gz
>+man/man1/opam-check.1.gz
> man/man1/opam-config.1.gz
>+man/man1/opam-help.1.gz
>+man/man1/opam-info.1.gz
> man/man1/opam-init.1.gz
> man/man1/opam-install.1.gz
>-man/man1/opam-installer.1.gz
> man/man1/opam-list.1.gz
> man/man1/opam-pin.1.gz
> man/man1/opam-reinstall.1.gz
>+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

Flags:

joris: maintainer-approval+

Actions: View | Diff

Attachments on bug 194529: 148560 | 148892 | 148896 | 148929 | 148930 | 154263 | 154264