Attachment 148929 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), 3.34 KB, created by joris on 2014-11-02 14:13:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joris

Created: 2014-11-02 14:13:50 UTC

Size: 3.34 KB

patch

obsolete

>diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
>index e3e7777..8fd4f12 100644
>--- a/devel/ocaml-opam/Makefile
>+++ b/devel/ocaml-opam/Makefile
>@@ -2,11 +2,16 @@
> # $FreeBSD$
> 
> PORTNAME=	opam
>-PORTVERSION=	1.1.1
>+PORTVERSION=	1.2.0
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.ocamlpro.com/pub/
>-PKGNAMEPREFIX=	ocaml-
>-DISTNAME=	opam-full-${PORTVERSION}
>+PKGNAMEPREFIX= ocaml-
>+
>+USE_GITHUB=	yes
>+
>+GH_ACCOUNT=	ocaml
>+GH_PROJECT=	opam
>+GH_TAGNAME=	1.2.0
>+GH_COMMIT=	cbe460b
> 
> MAINTAINER=	joris@giovannangeli.fr
> COMMENT=	Source-based package manager for OCaml
>@@ -15,6 +20,27 @@ LICENSE=	GPLv3
> 
> 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
>diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo
>index f9253f3..10a6ad4 100644
>--- a/devel/ocaml-opam/distinfo
>+++ b/devel/ocaml-opam/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (opam-full-1.1.1.tar.gz) = bfcb78109cf88612b5170b25bb96aa576ed3908c8a68b9164a7ae16f9f59ae38
>-SIZE (opam-full-1.1.1.tar.gz) = 2278273
>+SHA256 (opam-1.2.0.tar.gz) = d5d8941d7795660f2a78f918e98bd2e827193c6e2ba9874574507a79814fda8d
>+SIZE (opam-1.2.0.tar.gz) = 596559
>diff --git a/devel/ocaml-opam/files/patch-Makefile b/devel/ocaml-opam/files/patch-Makefile
>deleted file mode 100644
>index 9bd2a31..0000000
>--- a/devel/ocaml-opam/files/patch-Makefile
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- 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-plist b/devel/ocaml-opam/pkg-plist
>index 36a4dd9..cb50e06 100644
>--- a/devel/ocaml-opam/pkg-plist
>+++ b/devel/ocaml-opam/pkg-plist
>@@ -2,24 +2,22 @@ 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

Actions: View | Diff

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