From nobody Fri Apr 22 10:51:16 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4BFE71989E98; Fri, 22 Apr 2022 10:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KlB6D1kBdz57vw; Fri, 22 Apr 2022 10:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650624676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4X/ptuaOn+r/3tEguaeMqv5uTQjY3Dar7bqkkAxG1g=; b=Be5YbYx1fxuKR8l6qTomwlQT2wCx1MEmwi2UhE/c7x/e0aWE+EsSqEesq+z3GS2Z0I/hLK W+qoJ1mKaEMImZxw9NuhD7VcThgHXV4npzoDIa0ktI1tqFAMrgKb9s8QpwPhjI+6yg3WC/ cJ9efF4aIMVmttXspFmELOQTIAq2PEwePjtzr4BLPcxp2HqTLngCjKZ+u1aiZk7sB/EBlb Kko8w+IUb22sFEZNXZAd0Ys/Oepl5dDG+c02laNdYOhCgu2LYa8WMhQrd9Hf8gScrAX8eT ohpdRYbiz+syr+mrfoHmlu67F3Y34bpwsR33Ec2Dga427R9350D5LYypXPzbCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B52D1BDB9; Fri, 22 Apr 2022 10:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23MApGCk016277; Fri, 22 Apr 2022 10:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23MApGgp016276; Fri, 22 Apr 2022 10:51:16 GMT (envelope-from git) Date: Fri, 22 Apr 2022 10:51:16 GMT Message-Id: <202204221051.23MApGgp016276@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 33ae54607420 - main - lang/ocaml: simplify handling of the documentation distfiles List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33ae5460742095b7415a091a3d34f1d81d85c98c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650624676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4X/ptuaOn+r/3tEguaeMqv5uTQjY3Dar7bqkkAxG1g=; b=hWWfTkW+UxkI7vKspzGO1iE+XWcmzIBJSEahUDn7GDyeIaUf7mtFZT8Xx080sNJGuISw7p 3jKKzrlG1O3wXgBCEQYFOamgnO8u1ediyBxVkAqMnO4FlLREwJHtVM0nIzNBy/PuAkfu9n izKqTg6CASc2TQ9Q/LjgdKtPS40H7pTpJh3sZClPPqAQCXxDDMDSiZeyRCbw27lC6ApT3h jLOuuEizUV7PJDYarDOlJDJuUOYkhlN3q9LJRyqLIvckzFRedYZd2/jAjRWfiMX9xoEZ75 DmrLhyhFyk0RRpJuEthah48J7itBVxJJTXnyKiBXZuY8igvSkFuCLScY7ZODzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650624676; a=rsa-sha256; cv=none; b=e3mECNbc3AbktZ9Ze3YbP/AK+GYQs0s8SSZjkiU7Se2UDrMpEJv29tCAZ38PdPy6zdeoO6 Oi0O/X6D5ueim7fOw4vny8gpde+nBlhu55FeRS36CaAb8M0Bqy/dyAUrWg75BkzC0AUZiX UB7Y5Ui/SMOlV4CGpo+k+bDgKWJ8Y9Ydj7IdxAU0AOamEd+oj9x5q69WXT0OrCtTnHBL4R 7UjNQ+f8ak+Depx1vEPp47a4Yz9HDh+ecQOuc3LO2qLk9vQgolxGcyFb5vH2Rwg53OoOMs 5xPjhxHPZajCGMbRlh0fo+aUd8LKS0tRyYDzYkM38Ew8sWzn5JDIgX1yKH1KIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=33ae5460742095b7415a091a3d34f1d81d85c98c commit 33ae5460742095b7415a091a3d34f1d81d85c98c Author: Alexey Dokuchaev AuthorDate: 2022-04-22 10:47:40 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-22 10:47:40 +0000 lang/ocaml: simplify handling of the documentation distfiles - Make use of the options helper, DOCS_DISTFILES, and get rid of the poorly readable .if ${PORT_OPTIONS:MDOCS} block - Drop useless `post-extract' target, all needed files are extracted automagically by the framework - GC left-over CMP_LIB_DESC, MODOPT, PATTERN, and DOCSDISTNAME knobs --- lang/ocaml/Makefile | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 618228828938..2de010864af4 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -6,6 +6,8 @@ PORTVERSION= 4.07.1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \ http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_ONLY= ${_DISTFILES:M*.tar.*} PKGNAMESUFFIX= ${SFX} MAINTAINER= michipili@gmail.com @@ -49,28 +51,16 @@ CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \ OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES OPTIONS_DEFAULT=X11 THREADS -CMP_LIB_DESC= Install compiler libraries - -MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt -PATTERN= [[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]] -DOCSDISTNAME= ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/} CONFLICTS= metaocaml -.include +PORTDOCS= htmlman ${DISTNAME:R}-refman.ps.gz ${DISTNAME:R}-refman.pdf -.if ${PORT_OPTIONS:MDOCS} -DISTFILES:= ${DISTNAME}${EXTRACT_SUFX} \ - ${DOCSDISTNAME}-refman-html.tar.gz:docs \ - ${DOCSDISTNAME}-refman.ps.gz:docs \ - ${DOCSDISTNAME}-refman.pdf:docs -EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} \ - ${DOCSDISTNAME}-refman-html.tar.gz -PLIST_SUB+= DOC="" -PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf -.else -PLIST_SUB+= DOC="@comment " -.endif +DOCS_DISTFILES= ${DISTNAME:R}-refman-html.tar.gz:docs \ + ${DISTNAME:R}-refman.ps.gz:docs \ + ${DISTNAME:R}-refman.pdf:docs + +.include .if ${ARCH} == armv6 || ${ARCH} == armv7 CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS} -meabi=5" @@ -119,16 +109,6 @@ USE_GCC= yes LLD_UNSAFE= yes .endif -post-extract: -.if ${PORT_OPTIONS:MDOCS} - @if ! (cd ${WRKDIR} && \ - ${TAR} xf ${_DISTDIR}${DOCSDISTNAME}-refman-html.tar.gz \ - ) \ - then \ - exit 1; \ - fi; -.endif - post-patch: @${REINPLACE_CMD} \ -e '\|MKLIB=|s|ar rc|${AR} rc|' \ @@ -157,8 +137,8 @@ post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR}) - ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${_DISTDIR}${DISTNAME:R}-refman.ps.gz ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${_DISTDIR}${DISTNAME:R}-refman.pdf ${STAGEDIR}${DOCSDIR} .endif # Spacetime profiling is only available for native code on 64-bit targets .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc