Attachment #148929 for bug #194529

Lines 2-12 Link Here

(-)b/devel/ocaml-opam/Makefile (-4 / +30 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= opam	4	PORTNAME= opam
5	PORTVERSION= 1.1.1	5	PORTVERSION= 1.2.0
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://www.ocamlpro.com/pub/	7	PKGNAMEPREFIX= ocaml-
8	PKGNAMEPREFIX= ocaml-	8
9	DISTNAME= opam-full-${PORTVERSION}	9	USE_GITHUB= yes
		10
		11	GH_ACCOUNT= ocaml
		12	GH_PROJECT= opam
		13	GH_TAGNAME= 1.2.0
		14	GH_COMMIT= cbe460b
10		15
11	MAINTAINER= joris@giovannangeli.fr	16	MAINTAINER= joris@giovannangeli.fr
12	COMMENT= Source-based package manager for OCaml	17	COMMENT= Source-based package manager for OCaml
Lines 15-20 LICENSE= GPLv3 Link Here
15		20
16	BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl	21	BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl
17		22
		23
		24	OPTIONS_DEFINE= RSYNC GIT WGET HG DARCS ASPCUD
		25
		26	RSYNC_DESC= "Support remote repository synchronized with Rsync"
		27	WGET_DESC= "Support remote repository synchronized with git"
		28	GIT_DESC= "Support remote repository synchronized with HTTP"
		29	HG_DESC= "Support remote repository synchronized with mercurial"
		30	DARCS_DESC= "Support remote repository synchronized with darcs"
		31	ASPCUD_DESC= "Use aspcud as an external dependencies solver"
		32
		33	OPTIONS_DEFAULT= RSYNC GIT WGET
		34
		35	WGET_RUN_DEPENDS:=wget:${PORTSDIR}/ftp/wget
		36	RSYNC_RUN_DEPENDS:=rsync:${PORTSDIR}/net/rsync
		37	GIT_RUN_DEPENDS:=git:${PORTSDIR}/devel/git
		38	HG_RUN_DEPENDS:=hg:${PORTSDIR}/devel/mercurial
		39	DARCS_RUN_DEPENDS:=darcs:${PORTSDIR}/devel/hs-darcs
		40	ASPCUD_RUN_DEPENDS:=aspcud:${PORTSDIR}/math/aspcud
		41
		42	ALL_TARGET= lib-ext all man
		43
18	USES= gmake	44	USES= gmake
19	USE_OCAML= yes	45	USE_OCAML= yes
20	GNU_CONFIGURE= yes	46	GNU_CONFIGURE= yes

Lines 1-2 Link Here

(-)b/devel/ocaml-opam/distinfo (-2 / +2 lines)
1	SHA256 (opam-full-1.1.1.tar.gz) = bfcb78109cf88612b5170b25bb96aa576ed3908c8a68b9164a7ae16f9f59ae38	1	SHA256 (opam-1.2.0.tar.gz) = d5d8941d7795660f2a78f918e98bd2e827193c6e2ba9874574507a79814fda8d
2	SIZE (opam-full-1.1.1.tar.gz) = 2278273	2	SIZE (opam-1.2.0.tar.gz) = 596559

Removed Link Here

(-)a/devel/ocaml-opam/files/patch-Makefile (-10 lines)
1	--- Makefile.orig 2014-01-14 17:04:37.000000000 +0100
2	+++ Makefile
3	@@ -1,6 +1,6 @@
4	-include Makefile.config
5
6	-LOCAL_OCPBUILD=./ocp-build/ocp-build -no-use-ocamlfind
7	+LOCAL_OCPBUILD=./ocp-build/ocp-build -no-use-ocamlfind -no-user-prefs
8	OCPBUILD ?= $(LOCAL_OCPBUILD)
9	SRC_EXT=src_ext
10	TARGETS = opam opam-admin opam-installer




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

Return to bug 194529

Lines 2-25 bin/opam Link Here

(-)b/devel/ocaml-opam/pkg-plist (-5 / +3 lines)
2	bin/opam-admin	2	bin/opam-admin
3	bin/opam-installer	3	bin/opam-installer
4	man/man1/opam-admin-check.1.gz	4	man/man1/opam-admin-check.1.gz
		5	man/man1/opam-admin-depexts.1.gz
5	man/man1/opam-admin-make.1.gz	6	man/man1/opam-admin-make.1.gz
		7	man/man1/opam-admin-stats.1.gz
6	man/man1/opam-admin.1.gz	8	man/man1/opam-admin.1.gz
7	man/man1/opam-check.1.gz
8	man/man1/opam-config.1.gz	9	man/man1/opam-config.1.gz
9	man/man1/opam-help.1.gz
10	man/man1/opam-info.1.gz
11	man/man1/opam-init.1.gz	10	man/man1/opam-init.1.gz
12	man/man1/opam-install.1.gz	11	man/man1/opam-install.1.gz
		12	man/man1/opam-installer.1.gz
13	man/man1/opam-list.1.gz	13	man/man1/opam-list.1.gz
14	man/man1/opam-pin.1.gz	14	man/man1/opam-pin.1.gz
15	man/man1/opam-reinstall.1.gz	15	man/man1/opam-reinstall.1.gz
16	man/man1/opam-remote.1.gz
17	man/man1/opam-remove.1.gz	16	man/man1/opam-remove.1.gz
18	man/man1/opam-repository.1.gz	17	man/man1/opam-repository.1.gz
19	man/man1/opam-search.1.gz	18	man/man1/opam-search.1.gz
20	man/man1/opam-show.1.gz	19	man/man1/opam-show.1.gz
21	man/man1/opam-switch.1.gz	20	man/man1/opam-switch.1.gz
22	man/man1/opam-uninstall.1.gz
23	man/man1/opam-update.1.gz	21	man/man1/opam-update.1.gz
24	man/man1/opam-upgrade.1.gz	22	man/man1/opam-upgrade.1.gz
25	man/man1/opam.1.gz	23	man/man1/opam.1.gz