git: 76675a9a4153 - main - sysutils/b43-fwcutter: install the manpage under $PREFIX/share/man

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Mon, 22 Jan 2024 11:50:32 UTC
The branch main has been updated by danfe:

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

commit 76675a9a4153bc78979d303dc4c45a3509984ef4
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2024-01-22 11:49:44 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2024-01-22 11:49:44 +0000

    sysutils/b43-fwcutter: install the manpage under $PREFIX/share/man
    
    While here, drop needless ``install -d'' commands from the `install'
    target recipe which are created as part of standard stage hierarchy.
---
 sysutils/b43-fwcutter/Makefile             |  3 +--
 sysutils/b43-fwcutter/files/patch-Makefile | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/sysutils/b43-fwcutter/Makefile b/sysutils/b43-fwcutter/Makefile
index f7b314be1328..c280f5a761ce 100644
--- a/sysutils/b43-fwcutter/Makefile
+++ b/sysutils/b43-fwcutter/Makefile
@@ -14,7 +14,6 @@ USES=		gmake tar:bzip2
 
 MAKE_ARGS=	V=1
 
-PLIST_FILES=	bin/b43-fwcutter \
-		man/man1/b43-fwcutter.1.gz
+PLIST_FILES=	bin/b43-fwcutter share/man/man1/b43-fwcutter.1.gz
 
 .include <bsd.port.mk>
diff --git a/sysutils/b43-fwcutter/files/patch-Makefile b/sysutils/b43-fwcutter/files/patch-Makefile
index 5672be798760..f183cd487f3c 100644
--- a/sysutils/b43-fwcutter/files/patch-Makefile
+++ b/sysutils/b43-fwcutter/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-08-21 20:17:01.000000000 +0800
-+++ Makefile	2014-02-21 09:40:52.782172201 +0800
-@@ -51,10 +51,10 @@
+--- Makefile.orig	2014-06-25 14:04:20 UTC
++++ Makefile
+@@ -51,10 +51,8 @@ $(BIN): $(call OBJS,$(SRCS))
  	$(QUIET_CC) $(CFLAGS) -o $(BIN) $(call OBJS,$(SRCS)) $(LDFLAGS)
  
  install: all
@@ -8,10 +8,8 @@
 -	install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/
 -	install -d -o 0 -g 0 -m 755 $(PREFIX)/man/man1/
 -	install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/man/man1/
-+	install -d -m 755 $(DESTDIR)$(PREFIX)/bin/
-+	$(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(PREFIX)/bin/
-+	install -d -m 755 $(DESTDIR)$(PREFIX)/man/man1/
-+	$(BSD_INSTALL_MAN) $(BIN).1 $(DESTDIR)$(PREFIX)/man/man1/
++	$(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(PREFIX)/bin
++	$(BSD_INSTALL_MAN) $(BIN).1 $(DESTDIR)$(PREFIX)/share/man/man1
  
  clean:
  	-rm -Rf obj dep *.orig *.rej *~