From nobody Sun Oct 30 20:06:35 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 4N0nNr1JFpz4gT3n; Sun, 30 Oct 2022 20:06:36 +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 4N0nNr02Mqz3c6Q; Sun, 30 Oct 2022 20:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667160396; 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=ZBI1kter4HJCZnI1xbh5PWgqs0XY8JSN092pyPwbBgk=; b=P3FrnEFzi9pKuTyxSquXzJYxX7YlnqjCAXHrBRyWRG2zknd8S2f+4d7PVKhWwlK0nbHw48 f5BUoc9yBj9qEZZ0d3y2xZX740qXq/d6hmIrNNz/qJtjFswkRr9a3m5azcnMZZno8k0ZAH 2S1IxIi9S9AmkMozJoGQVL/ktdKw06dDnIrg6K7zc+3Xi4kfGJDtimGj6recisE1dxbhDJ m4K5CwdpGbzGPuhJKrLeWZhKeAIRtEgu68dPcJ6yBdIWFFrgKYGkODEeq0BDjYRLqNo+fl c89PoeQZOrcD7pgcK+xYNdGQdrDgNT2/ze+adA3IQO8rrrApdf0l5iyvala9Gg== 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 4N0nNq6Fyhz18KT; Sun, 30 Oct 2022 20:06:35 +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 29UK6Znn011502; Sun, 30 Oct 2022 20:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29UK6Zx2011501; Sun, 30 Oct 2022 20:06:35 GMT (envelope-from git) Date: Sun, 30 Oct 2022 20:06:35 GMT Message-Id: <202210302006.29UK6Zx2011501@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 9e33b6856e0e - main - sysutils/libudisks: Rework port 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e33b6856e0e9fe01cb064db9488e137fe4e7b40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667160396; 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=ZBI1kter4HJCZnI1xbh5PWgqs0XY8JSN092pyPwbBgk=; b=tBR6u9NwwRVCoePsU3zJrNnoKNvk1br1gNtSrDz+Zn9/iVetgzHKiNxDR4A9ig9KBtvMOh uQ/O8qrfBPWHYY/AYr0cUJ6CWa6e4cCuJKguHXf/pVliGJ3lvGwdhDILv6VqA6DADfZNAG 0xgEA6eX0xNz9bcbcBWubGUy5oa1F03zc9K6aNj7vkJiNWaogofO/Zsecxf6VEALNnrhSv gimbME7PTkJNvM1iDKqkch5BpW54CpJveig/DCsiiinjil8Zf7udsB0JlMTrEkDdB2Z7oZ rGBa+HjcCzYTVQqjgyRO00h5FVVB2RnB0/B5Ovw5rFXgKeMH9jp5YFhi6ywxtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667160396; a=rsa-sha256; cv=none; b=sd0hNCLot97w0MOJceW0VHfZs0G6AM6/W16HHNwG4a8Q9G3CYJ3jHMuALmEfBTCFimnThd s0o++NeiFyxmGNTcQLFGVtdJBntVF/klnydmUiNmFXjn35l7l/MT48viq52e4JQqI7Shct AvfW1hQNpvrpO0/Zk+mb28jJPBXR/3/MPB8Rgm9LEH6YU77W86uZpnLytZtnDvjwlVoNCj JlbcZbKIpEz6LgS2oj/1a90iic3NloGLI1TECeHZi06pwHihbgrH7vJGkNEWGmfgyX3Njc b060aL4M8Bix6MOvjWyBo7VWRtr0OhxEWb2iS+xwhbeek6252cQ7evbbGYt7mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e33b6856e0e9fe01cb064db9488e137fe4e7b40 commit 9e33b6856e0e9fe01cb064db9488e137fe4e7b40 Author: Daniel Engberg AuthorDate: 2022-10-30 19:52:48 +0000 Commit: Daniel Engberg CommitDate: 2022-10-30 20:05:13 +0000 sysutils/libudisks: Rework port - Use upstream release archive as recommended by Porters Handbook (USE_GITHUB section) which also removes dependency of gtk-doc except when UDISKSCTL is enabled - Update comments in Makefile - Use framework helpers for DOCS - Rearrange Makefile to improve readability PR: 267268 Reviewed by: pauamma (maintainer) --- sysutils/libudisks/Makefile | 46 +++++++++++++++------------------ sysutils/libudisks/distinfo | 6 ++--- sysutils/libudisks/pkg-plist | 61 -------------------------------------------- 3 files changed, 24 insertions(+), 89 deletions(-) diff --git a/sysutils/libudisks/Makefile b/sysutils/libudisks/Makefile index 614192a0b50b..84c89dbbeb67 100644 --- a/sysutils/libudisks/Makefile +++ b/sysutils/libudisks/Makefile @@ -1,8 +1,8 @@ PORTNAME= libudisks -PORTVERSION= 2.9.4 -# Obviates the need to specify GH_TAGNAME and repeat the version number later -DISTVERSIONPREFIX= udisks- +DISTVERSION= 2.9.4 CATEGORIES= sysutils +MASTER_SITES= https://github.com/storaged-project/udisks/releases/download/udisks-${DISTVERSION}/ +DISTNAME= udisks-${DISTVERSION} MAINTAINER= pauamma@FreeBSD.org COMMENT= Library to manipulate storage devices, from udisks @@ -14,43 +14,39 @@ LICENSE_FILE= ${WRKSRC}/COPYING # pkaction takes care of libpolkit-agent-1 and libpolkit-gobject-1 # which are what we really want (see UDISKSCTL_LIB_DEPENDS). BUILD_DEPENDS= bash:shells/bash \ - gtkdocize:textproc/gtk-doc \ pkaction:sysutils/polkit # For some reason, configure wants autopoint from gettext-tools even when # NLS is disabled. -USES= autoreconf:build gettext-tools:build gmake gnome \ - libtool:build pkgconfig - -USE_GITHUB= yes -GH_ACCOUNT= storaged-project -GH_PROJECT= udisks - +USES= gettext-tools:build gmake gnome libtool pkgconfig tar:bz2 USE_GNOME= glib20 introspection - USE_LDCONFIG= yes GNU_CONFIGURE= yes -# config.status errors out without --disable-dependency-tracking, with or -# without USES=gmake. --with-libintl-prefix is needed because otherwise +# --with-libintl-prefix is needed because otherwise # configure won't find libintl when PREFIX != LOCALBASE. -CONFIGURE_ARGS= --disable-daemon --disable-dependency-tracking \ +CONFIGURE_ARGS= --disable-daemon \ + --with-html-dir=${PREFIX}/share/doc \ --with-libintl-prefix=${LOCALBASE} -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= DISTVERSION=${DISTVERSION} +DOCSDIR= ${PREFIX}/share/doc/udisks2 +PORTDOCS= * -OPTIONS_DEFINE= UDISKSCTL NLS DOCS +OPTIONS_DEFINE= UDISKSCTL NLS DOCS OPTIONS_DEFAULT= UDISKSCTL NLS DOCS -OPTIONS_SUB= yes -UDISKSCTL_DESC= Install udisksctl command line utility -DOCS_CONFIGURE_ENABLE= gtk-doc -NLS_USES= gettext-runtime +OPTIONS_SUB= yes + +UDISKSCTL_DESC= Install udisksctl command line utility + +NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls -UDISKSCTL_LIB_DEPENDS= libpolkit-agent-1.so:sysutils/polkit \ - libpolkit-gobject-1.so:sysutils/polkit -pre-configure: - cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ./autogen.sh +UDISKSCTL_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc \ + xsltproc:textproc/libxslt +UDISKSCTL_LIB_DEPENDS= libpolkit-agent-1.so:sysutils/polkit \ + libpolkit-gobject-1.so:sysutils/polkit +UDISKSCTL_CONFIGURE_ENABLE= man post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libudisks2.so.0.0.0 diff --git a/sysutils/libudisks/distinfo b/sysutils/libudisks/distinfo index 081d612bc776..2c8b7245e92b 100644 --- a/sysutils/libudisks/distinfo +++ b/sysutils/libudisks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665970803 -SHA256 (storaged-project-udisks-udisks-2.9.4_GH0.tar.gz) = 5917ad67f33648935748cb98f71668431ab07ce4dc4cfd5403e0c0a2af48696a -SIZE (storaged-project-udisks-udisks-2.9.4_GH0.tar.gz) = 1464740 +TIMESTAMP = 1666434207 +SHA256 (udisks-2.9.4.tar.bz2) = b6b60ebab0d5e09624120c5d158882e87d8c2473db60783b63deeba74cb18d1c +SIZE (udisks-2.9.4.tar.bz2) = 1699288 diff --git a/sysutils/libudisks/pkg-plist b/sysutils/libudisks/pkg-plist index 535add1437f8..768335927033 100644 --- a/sysutils/libudisks/pkg-plist +++ b/sysutils/libudisks/pkg-plist @@ -17,67 +17,6 @@ libdata/pkgconfig/udisks2.pc %%UDISKSCTL%%man/man1/udisksctl.1.gz %%UDISKSCTL%%share/bash-completion/completions/udisksctl share/gir-1.0/UDisks-2.0.gir -%%DOCS%%share/gtk-doc/html/udisks2/UDisksBlock.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksClient.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksDrive.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksDriveAta.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksEncrypted.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksFilesystem.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksJob.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksLoop.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksMDRaid.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksManager.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksObject.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksObjectInfo.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksObjectManagerClient.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksPartition.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksPartitionTable.html -%%DOCS%%share/gtk-doc/html/udisks2/UDisksSwapspace.html -%%DOCS%%share/gtk-doc/html/udisks2/annotation-glossary.html -%%DOCS%%share/gtk-doc/html/udisks2/api-index-%%PORTVERSION%%.html -%%DOCS%%share/gtk-doc/html/udisks2/api-index-deprecated.html -%%DOCS%%share/gtk-doc/html/udisks2/api-index.html -%%DOCS%%share/gtk-doc/html/udisks2/ch03.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Block.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Drive.Ata.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Drive.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Encrypted.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Filesystem.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Job.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Loop.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.MDRaid.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Manager.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Partition.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.PartitionTable.html -%%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Swapspace.html -%%DOCS%%share/gtk-doc/html/udisks2/gio-hierarchy.html -%%DOCS%%share/gtk-doc/html/udisks2/home.png -%%DOCS%%share/gtk-doc/html/udisks2/index.html -%%DOCS%%share/gtk-doc/html/udisks2/left-insensitive.png -%%DOCS%%share/gtk-doc/html/udisks2/left.png -%%DOCS%%share/gtk-doc/html/udisks2/mount_options.html -%%DOCS%%share/gtk-doc/html/udisks2/overview.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-block-devices.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-drives.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-jobs.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-manager-well-known-object.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-md-raid.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-overview.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-udisks2-well-known-object.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-dbus.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-iscsi-session.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-library-generated.html -%%DOCS%%share/gtk-doc/html/udisks2/ref-library.html -%%DOCS%%share/gtk-doc/html/udisks2/right-insensitive.png -%%DOCS%%share/gtk-doc/html/udisks2/right.png -%%DOCS%%share/gtk-doc/html/udisks2/style.css -%%DOCS%%share/gtk-doc/html/udisks2/udisks-polkit-actions.html -%%DOCS%%share/gtk-doc/html/udisks2/udisks-std-options.html -%%DOCS%%share/gtk-doc/html/udisks2/udisks2-UDisksError.html -%%DOCS%%share/gtk-doc/html/udisks2/udisks2.devhelp2 -%%DOCS%%share/gtk-doc/html/udisks2/udisksctl.1.html -%%DOCS%%share/gtk-doc/html/udisks2/up-insensitive.png -%%DOCS%%share/gtk-doc/html/udisks2/up.png %%NLS%%share/locale/af/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ar/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/as/LC_MESSAGES/udisks2.mo