From f1f3b1f4eb517c718c74578ccc05e1269bf9f10f Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 10 Jan 2024 15:18:23 +0100 Subject: [PATCH] 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(-) delete mode 100644 sysutils/ntpstat/files/patch-Makefile diff --git a/sysutils/ntpstat/Makefile b/sysutils/ntpstat/Makefile index c0ee1bdd25e0b..73ef98aede5b8 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 f0e5db9b727d5..0000000000000 --- 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 f1d1f7acede44..1fb4f625130df 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