Attachment 232896 Details for Bug 263005 – Upgrade to 1.11

[patch] Upgrade to 1.11

archivers_ocaml-zip.diff (text/plain), 5.87 KB, created by Thierry Thomas on 2022-04-02 15:21:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2022-04-02 15:21:31 UTC

Size: 5.87 KB

patch

obsolete

>From 19f8394d5bce139241424969cb021602dec281cd Mon Sep 17 00:00:00 2001
>From: Thierry Thomas <thierry@FreeBSD.org>
>Date: Wed, 30 Mar 2022 11:36:12 +0200
>Subject: [PATCH] archivers/ocaml-zip: upgrade to 1.11
>
>This is needed to upgrade math/alt-ergo and chase OCaml.
>---
> archivers/ocaml-zip/Makefile             | 34 +++++++++++++-----------
> archivers/ocaml-zip/distinfo             |  6 ++---
> archivers/ocaml-zip/files/META           |  7 -----
> archivers/ocaml-zip/files/patch-Makefile | 11 --------
> archivers/ocaml-zip/pkg-descr            |  2 +-
> archivers/ocaml-zip/pkg-plist            | 23 ++++++++++++++++
> 6 files changed, 45 insertions(+), 38 deletions(-)
> delete mode 100644 archivers/ocaml-zip/files/META
> delete mode 100644 archivers/ocaml-zip/files/patch-Makefile
> create mode 100644 archivers/ocaml-zip/pkg-plist
>
>diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile
>index f22d0dcbb499..02840b356200 100644
>--- a/archivers/ocaml-zip/Makefile
>+++ b/archivers/ocaml-zip/Makefile
>@@ -1,11 +1,10 @@
> # Created by: Stanislav Sedov <ssedov@mbsd.msk.ru>
> 
>-PORTNAME=	zip
>-PORTVERSION=	1.06
>+PORTNAME=	camlzip
>+PORTVERSION=	111
>+DISTVERSIONPREFIX=	rel
> CATEGORIES=	archivers
>-MASTER_SITES=	https://download.ocamlcore.org/camlzip/camlzip/${PORTVERSION}/
> PKGNAMEPREFIX=	ocaml-
>-DISTNAME=	caml${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	OCaml library to manipulate ZIP/GZIP/JAR archives
>@@ -13,26 +12,29 @@ COMMENT=	OCaml library to manipulate ZIP/GZIP/JAR archives
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	xavierleroy
>+
>+USES=		gmake
> USE_OCAML=	yes
>-USE_OCAML_LDCONFIG=yes
>+USE_OCAML_FINDLIB=	yes
>+USE_OCAML_LDCONFIG=	yes
> USE_OCAML_WASH=	yes
> 
> ALL_TARGET=	all allopt
>-INSTALL_TARGET=	install installopt
>-PATTERN=	([[:space:]]*)cp([[:space:]]+.*)
> 
>-post-extract:
>+pre-configure:
> # PREFIX, CFLAGS and permissions safeness
>-	@${REINPLACE_CMD} -E \
>-		-e "s,${PATTERN},\1\$${BSD_INSTALL_DATA}\2," \
>+	${REINPLACE_CMD} -E \
> 		-e "s,(-ccopt[[:space:]])-g,\1\"${CFLAGS}\"," \
>-		-e "s,^(INSTALLDIR=).*,\1${STAGEDIR}${OCAMLFIND_DESTDIR}/zip," \
>-		-e "/ldconf/d" ${WRKSRC}/Makefile
>+		-e "s,ocamlfind install,ocamlfind install -destdir ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR} -ldconf ${STAGEDIR}${PREFIX}/${OCAML_LDCONF}," \
>+			${WRKSRC}/Makefile
>+
>+pre-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
> 
> post-install:
>-	${INSTALL_DATA} ${FILESDIR}/META ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME}
>-	@${FIND} ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
>-		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/zip/dllcamlzip.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/zip/zip.cmxs
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/zip/dllcamlzip.so
> 
> .include <bsd.port.mk>
>diff --git a/archivers/ocaml-zip/distinfo b/archivers/ocaml-zip/distinfo
>index 0d53eac6e7f2..a37685c93518 100644
>--- a/archivers/ocaml-zip/distinfo
>+++ b/archivers/ocaml-zip/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1559737560
>-SHA256 (camlzip-1.06.tar.gz) = c83877f9972943e6f2e147cf9715a785da2fc8531e7bed3ab4787043b8f4cf54
>-SIZE (camlzip-1.06.tar.gz) = 26499
>+TIMESTAMP = 1648625183
>+SHA256 (xavierleroy-camlzip-rel111_GH0.tar.gz) = ffbbc5de3e1c13dc0e59272376d232d2ede91b327551063d47fddb74f1d5ed37
>+SIZE (xavierleroy-camlzip-rel111_GH0.tar.gz) = 28483
>diff --git a/archivers/ocaml-zip/files/META b/archivers/ocaml-zip/files/META
>deleted file mode 100644
>index bf215a6b2c0a..000000000000
>--- a/archivers/ocaml-zip/files/META
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-name="zip"
>-version="1.04"
>-description="reading and writing ZIP, JAR and GZIP files"
>-requires="unix"
>-archive(byte)="zip.cma"
>-archive(native)="zip.cmxa"
>-linkopts = ""
>diff --git a/archivers/ocaml-zip/files/patch-Makefile b/archivers/ocaml-zip/files/patch-Makefile
>deleted file mode 100644
>index 051d0f353c2d..000000000000
>--- a/archivers/ocaml-zip/files/patch-Makefile
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.orig	2015-10-01 02:48:15 UTC
>-+++ Makefile
>-@@ -56,7 +56,7 @@ clean:
>- 
>- install:
>- 	mkdir -p $(INSTALLDIR)
>--	${BSD_INSTALL_DATA} zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
>-+	${BSD_INSTALL_DATA} zip.cma zip.cmi gzip.cmi zip.mli gzip.mli zlib.cmi zlib.mli libcamlzip.a $(INSTALLDIR)
>- 	if test -f dllcamlzip.so; then \
>- 	  ${BSD_INSTALL_DATA} dllcamlzip.so $(INSTALLDIR); \
>-           installdir=$(INSTALLDIR); \
>diff --git a/archivers/ocaml-zip/pkg-descr b/archivers/ocaml-zip/pkg-descr
>index 07788a8c2838..9c59a008a7f7 100644
>--- a/archivers/ocaml-zip/pkg-descr
>+++ b/archivers/ocaml-zip/pkg-descr
>@@ -2,4 +2,4 @@ This Objective Caml library provides easy access to compressed files in ZIP
> and GZIP format, as well as to Java JAR files.  It provides functions
> for reading from and writing to compressed files in these formats.
> 
>-WWW: http://pauillac.inria.fr/~xleroy/software.html
>+WWW: https://github.com/xavierleroy/camlzip
>diff --git a/archivers/ocaml-zip/pkg-plist b/archivers/ocaml-zip/pkg-plist
>new file mode 100644
>index 000000000000..7476a2e90eea
>--- /dev/null
>+++ b/archivers/ocaml-zip/pkg-plist
>@@ -0,0 +1,23 @@
>+%%OCAML_SITELIBDIR%%/camlzip/META
>+%%OCAML_SITELIBDIR%%/zip/META
>+%%OCAML_SITELIBDIR%%/zip/dllcamlzip.so
>+%%OCAML_SITELIBDIR%%/zip/gzip.cmi
>+%%OCAML_SITELIBDIR%%/zip/gzip.cmt
>+%%OCAML_SITELIBDIR%%/zip/gzip.cmti
>+%%OCAML_SITELIBDIR%%/zip/gzip.cmx
>+%%OCAML_SITELIBDIR%%/zip/gzip.mli
>+%%OCAML_SITELIBDIR%%/zip/libcamlzip.a
>+%%OCAML_SITELIBDIR%%/zip/zip.a
>+%%OCAML_SITELIBDIR%%/zip/zip.cma
>+%%OCAML_SITELIBDIR%%/zip/zip.cmi
>+%%OCAML_SITELIBDIR%%/zip/zip.cmt
>+%%OCAML_SITELIBDIR%%/zip/zip.cmti
>+%%OCAML_SITELIBDIR%%/zip/zip.cmx
>+%%OCAML_SITELIBDIR%%/zip/zip.cmxa
>+%%OCAML_SITELIBDIR%%/zip/zip.cmxs
>+%%OCAML_SITELIBDIR%%/zip/zip.mli
>+%%OCAML_SITELIBDIR%%/zip/zlib.cmi
>+%%OCAML_SITELIBDIR%%/zip/zlib.cmt
>+%%OCAML_SITELIBDIR%%/zip/zlib.cmti
>+%%OCAML_SITELIBDIR%%/zip/zlib.cmx
>+%%OCAML_SITELIBDIR%%/zip/zlib.mli
>-- 
>2.35.1
>

Actions: View | Diff

Attachments on bug 263005: 232896