Attachment #251978 for bug #280227




PORTNAME=	opam
DISTVERSION=	2.2.0
CATEGORIES=	devel
MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
PKGNAMEPREFIX=	ocaml-
DISTNAME=	opam-full-${DISTVERSION}-2

MAINTAINER=	hannes@mehnert.org
COMMENT=	Source-based package manager for OCaml


GNU_CONFIGURE=	yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS=	--with-vendored-deps --with-mccs

MAKE_JOBS_UNSAFE=	yes
ALL_TARGET=	cold

LDFLAGS_armv6=	-Wl,-z,notext
LDFLAGS_armv7=	-Wl,-z,notext

MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
RSYNC_RUN_DEPENDS=	rsync:net/rsync

pre-configure:
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler)

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam

Removed Link Here

(-)a/devel/ocaml-opam/files/patch-Makefile (-11 lines)
1	--- Makefile.orig 2023-05-27 12:33:21 UTC
2	+++ Makefile
3	@@ -258,7 +258,7 @@
4
5	.PHONY: compiler cold
6	compiler:
7	- env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT)
8	+ env CC="$(CC)" MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT)
9
10	src_ext/secondary/ocaml/bin/ocaml:
11	env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_TARGETS="world opt" BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT)




--- shell/bootstrap-ocaml.sh.orig	2023-05-27 13:09:27 UTC
+++ shell/bootstrap-ocaml.sh
@@ -42,6 +42,9 @@
   mkdir -p ${V}
 fi
 cd ${V}
+for p in ../../src_ext/ocaml-patches/*.patch; do
+  patch -p1 < $p;
+done;
 PATH_PREPEND=
 LIB_PREPEND=
 INC_PREPEND=




--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig	2023-05-27 13:17:37 UTC
+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
@@ -0,0 +1,32 @@
+--- a/configure.orig	2023-05-27 13:13:22 UTC
++++ a/configure
+@@ -14256,12 +14256,20 @@ case $host in #(
+     arch=amd64; system=win64 ;; #(
+   powerpc64le*-*-linux*) :
+     arch=power; model=ppc64le; system=elf ;; #(
++  powerpc64le*-*-freebsd*) :
++    arch=power; model=ppc64le; system=bsd_elf ;; #(
+   powerpc*-*-linux*) :
+     arch=power; if $arch64; then :
+   model=ppc64
+ else
+   model=ppc
+ fi; system=elf ;; #(
++  powerpc*-*-freebsd*) :
++    arch=power; if $arch64; then :
++  model=ppc64
++else
++  model=ppc
++fi; system=bsd_elf ;; #(
+   s390x*-*-linux*) :
+     arch=s390x; model=z10; system=elf ;; #(
+   # expected to match "gnueabihf" as well as "musleabihf"
+@@ -14281,6 +14289,8 @@
+     arch=arm; model=armv6; system=linux_eabi ;; #(
+   armv6*-*-freebsd*) :
+     arch=arm; model=armv6; system=freebsd ;; #(
++  armv7*-*-freebsd*) :
++    arch=arm; model=armv7; system=freebsd ;; #(
+   earmv6*-*-netbsd*) :
+     arch=arm; model=armv6; system=netbsd ;; #(
+   earmv7*-*-netbsd*) :

Return to bug 280227

Lines 1-9 Link Here

(-)b/devel/ocaml-opam/Makefile (-7 / +4 lines)
1	PORTNAME= opam	1	PORTNAME= opam
2	DISTVERSION= 2.1.6	2	DISTVERSION= 2.2.0
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/	4	MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
5	PKGNAMEPREFIX= ocaml-	5	PKGNAMEPREFIX= ocaml-
6	DISTNAME= opam-full-${DISTVERSION}	6	DISTNAME= opam-full-${DISTVERSION}-2
7		7
8	MAINTAINER= hannes@mehnert.org	8	MAINTAINER= hannes@mehnert.org
9	COMMENT= Source-based package manager for OCaml	9	COMMENT= Source-based package manager for OCaml
Lines 24-33 USE_BINUTILS= yes Link Here
24		24
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share	26	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
27	CONFIGURE_ARGS= --disable-checks	27	CONFIGURE_ARGS= --with-vendored-deps --with-mccs
28		28
29	MAKE_JOBS_UNSAFE= yes	29	MAKE_JOBS_UNSAFE= yes
30	ALL_TARGET= cold-lib-ext cold-all	30	ALL_TARGET= cold
31		31
32	LDFLAGS_armv6= -Wl,-z,notext	32	LDFLAGS_armv6= -Wl,-z,notext
33	LDFLAGS_armv7= -Wl,-z,notext	33	LDFLAGS_armv7= -Wl,-z,notext
Lines 48-56 GIT_RUN_DEPENDS= git:devel/git Link Here
48	MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL}	48	MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL}
49	RSYNC_RUN_DEPENDS= rsync:net/rsync	49	RSYNC_RUN_DEPENDS= rsync:net/rsync
50		50
51	pre-configure:
52	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler)
53
54	post-install:	51	post-install:
55	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer	52	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer
56	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam	53	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam

Removed Link Here

(-)a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh (-12 lines)
1	--- shell/bootstrap-ocaml.sh.orig 2023-05-27 13:09:27 UTC
2	+++ shell/bootstrap-ocaml.sh
3	@@ -42,6 +42,9 @@
4	mkdir -p ${V}
5	fi
6	cd ${V}
7	+for p in ../../src_ext/ocaml-patches/*.patch; do
8	+ patch -p1 < $p;
9	+done;
10	PATH_PREPEND=
11	LIB_PREPEND=
12	INC_PREPEND=

Removed Link Here

(-)a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch (-35 lines)
1	--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2023-05-27 13:17:37 UTC
2	+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
3	@@ -0,0 +1,32 @@
4	+--- a/configure.orig 2023-05-27 13:13:22 UTC
5	++++ a/configure
6	+@@ -14256,12 +14256,20 @@ case $host in #(
7	+ arch=amd64; system=win64 ;; #(
8	+ powerpc64le--linux*) :
9	+ arch=power; model=ppc64le; system=elf ;; #(
10	++ powerpc64le--freebsd*) :
11	++ arch=power; model=ppc64le; system=bsd_elf ;; #(
12	+ powerpc--linux*) :
13	+ arch=power; if $arch64; then :
14	+ model=ppc64
15	+ else
16	+ model=ppc
17	+ fi; system=elf ;; #(
18	++ powerpc--freebsd*) :
19	++ arch=power; if $arch64; then :
20	++ model=ppc64
21	++else
22	++ model=ppc
23	++fi; system=bsd_elf ;; #(
24	+ s390x--linux*) :
25	+ arch=s390x; model=z10; system=elf ;; #(
26	+ # expected to match "gnueabihf" as well as "musleabihf"
27	+@@ -14281,6 +14289,8 @@
28	+ arch=arm; model=armv6; system=linux_eabi ;; #(
29	+ armv6--freebsd*) :
30	+ arch=arm; model=armv6; system=freebsd ;; #(
31	++ armv7--freebsd*) :
32	++ arch=arm; model=armv7; system=freebsd ;; #(
33	+ earmv6--netbsd*) :
34	+ arch=arm; model=armv6; system=netbsd ;; #(
35	+ earmv7--netbsd*) :