Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jan 2024 15:29:53 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f1f3b1f4eb51 - main - sysutils/ntpstat: eliminate MAN1PREFIX and move to share/man
Message-ID:  <202401101529.40AFTr7r050806@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

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

commit f1f3b1f4eb517c718c74578ccc05e1269bf9f10f
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-10 14:18:23 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-10 15:29:49 +0000

    sysutils/ntpstat: eliminate MAN1PREFIX and move to share/man
    
    While here use MAKE_ARGS instead of patching
---
 sysutils/ntpstat/Makefile             |  3 ++-
 sysutils/ntpstat/files/patch-Makefile | 13 -------------
 sysutils/ntpstat/pkg-plist            |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/sysutils/ntpstat/Makefile b/sysutils/ntpstat/Makefile
index c0ee1bdd25e0..73ef98aede5b 100644
--- a/sysutils/ntpstat/Makefile
+++ b/sysutils/ntpstat/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ntpstat
 DISTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	cy@FreeBSD.org
@@ -19,7 +20,7 @@ SHEBANG_FILES=	ntpstat
 USE_GITHUB=	yes
 GH_ACCOUNT=	mlichvar
 
-MAKE_ENV=	STAGEDIR=${STAGEDIR} PREFIX=${PREFIX} MAN1PREFIX=${MAN1PREFIX}
+MAKE_ARGS=	prefix="${STAGEDIR}${PREFIX}" mandir="${STAGEDIR}${PREFIX}/share"
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/sysutils/ntpstat/files/patch-Makefile b/sysutils/ntpstat/files/patch-Makefile
deleted file mode 100644
index f0e5db9b727d..000000000000
--- a/sysutils/ntpstat/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2020-06-11 03:31:47.000000000 -0700
-+++ Makefile	2022-05-20 08:47:56.467564000 -0700
-@@ -1,8 +1,8 @@
- NAME = ntpstat
- 
--prefix = /usr/local
-+prefix = $(STAGEDIR)/$(PREFIX)
- bindir = $(prefix)/bin
--mandir = $(prefix)/share/man
-+mandir = $(STAGEDIR)/$(MAN1PREFIX)/man
- man1dir = $(mandir)/man1
- 
- all:
diff --git a/sysutils/ntpstat/pkg-plist b/sysutils/ntpstat/pkg-plist
index f1d1f7acede4..1fb4f625130d 100644
--- a/sysutils/ntpstat/pkg-plist
+++ b/sysutils/ntpstat/pkg-plist
@@ -1,2 +1,2 @@
 bin/ntpstat
-man/man1/ntpstat.1.gz
+share/man/man1/ntpstat.1.gz



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