Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Feb 2023 23:16:27 GMT
From:      Ryan Moeller <freqlabs@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 723f83e80dd2 - main - sysutils/openzfs*: Minor port housekeeping
Message-ID:  <202302072316.317NGRXe095351@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by freqlabs (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=723f83e80dd2345815f320d6446f60b51da386be

commit 723f83e80dd2345815f320d6446f60b51da386be
Author:     Ryan Moeller <freqlabs@FreeBSD.org>
AuthorDate: 2023-02-07 23:10:24 +0000
Commit:     Ryan Moeller <freqlabs@FreeBSD.org>
CommitDate: 2023-02-07 23:15:37 +0000

    sysutils/openzfs*: Minor port housekeeping
    
    Update the WWW to the official openzfs/zfs github repo, since the ZoF
    repo is no longer used after merging to ZoL and renaming to openzfs/zfs.
    
    While here, make a few small changes suggested by portlint.
    
    Approved by:    lwhsu (implicit)
    PR:     267453
    Sponsored by:   iXsystems, Inc.
---
 sysutils/openzfs-kmod/Makefile | 3 ++-
 sysutils/openzfs/Makefile      | 8 +++++---
 sysutils/openzfs/pkg-message   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index e7bebf4065fa..f7693248db3d 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	openzfs
 PORTVERSION=	2023012600
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
 
 MAINTAINER=	freqlabs@FreeBSD.org
 COMMENT=	OpenZFS kernel module for FreeBSD
-WWW=		https://github.com/zfsonfreebsd/ZoF
+WWW=		https://github.com/openzfs/zfs
 
 LICENSE=	CDDL
 
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 2e767f812a9a..6ba1c17d5e03 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	openzfs
 PORTVERSION=	2023012600
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	freqlabs@FreeBSD.org
 COMMENT=	OpenZFS userland for FreeBSD
-WWW=		https://github.com/zfsonfreebsd/ZoF
+WWW=		https://github.com/openzfs/zfs
 
 LICENSE=	CDDL
 
@@ -35,6 +35,8 @@ USE_GITHUB=	yes
 GH_PROJECT=	zfs
 GH_TAGNAME=	dc5c8006f
 
+USE_LDCONFIG=	yes
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -54,7 +56,7 @@ PYTHON_NO_DEPENDS=yes
 
 post-extract:
 	# Change certain shebangs into something that shebang fix understands
-	cd ${WRKSRC} && sed -i '' '1s:@PYTHON_SHEBANG@:python3:' \
+	cd ${WRKSRC} && ${SED} -i '' '1s:@PYTHON_SHEBANG@:python3:' \
 		tests/test-runner/bin/zts-report.py.in \
 		tests/test-runner/bin/test-runner.py.in \
 		cmd/arcstat.in \
diff --git a/sysutils/openzfs/pkg-message b/sysutils/openzfs/pkg-message
index 1447ef490598..1101f72fc507 100644
--- a/sysutils/openzfs/pkg-message
+++ b/sysutils/openzfs/pkg-message
@@ -2,7 +2,7 @@
 { type: install
   message: <<EOM
 Ensure that any zfs-related commands, such as zpool, zfs, as used in scripts
-and in your terminal sessions, use the correct path of /usr/local/sbin/ and
+and in your terminal sessions, use the correct path of ${PREFIX}/sbin/ and
 not the /sbin/ commands provided by the FreeBSD base system.
 
 Consider setting this in your shell profile defaults!



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302072316.317NGRXe095351>