tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

security/doas: manpage error on macOS (patch included)



Hi,

I just tried to install security/doas from HEAD and received an error due
to manpages trying to install in the wrong location. I'm running on macOS
10.15.7 and the error appears to be Darwin-specific.

---

=> Creating installation directories
mkdir -p /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/bin
cp doas /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/bin/
cp vidoas /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/bin/
chmod 4755 /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/bin/doas
mkdir -p /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/share/man/man1
cp doas.1.final /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/share/man/man1/doas.1
mkdir -p /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/share/man/man5
cp doas.conf.5.final /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/share/man/man5/doas.conf.5
=> Automatic manual page handling
=> Generating post-install file lists
pkg_create: can't stat `/Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/man/man1/doas.1.gz'
pkg_create: can't stat `/Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/man/man5/doas.conf.5.gz'=> Checking file-check results for doas-6.3p2
ERROR: ************************************************************
ERROR: The following files are in the PLIST but not in /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg:
ERROR:         /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/man/man1/doas.1.gz
ERROR:         /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/man/man5/doas.conf.5.gz
ERROR: ************************************************************
ERROR: The following files are in /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg but not in the PLIST:
ERROR:         /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/share/man/man1/doas.1
ERROR:         /Volumes/pkgsrc/obj/security/doas/work/.destdir/opt/pkg/share/man/man5/doas.conf.5
*** Error code 1

---

The error is caused by the following in the doas Makefile:
---
    # On MacOS the default man page path is /usr/local/share/man
    MANDIR=$(DESTDIR)$(PREFIX)/share/man
---

Patch to security/doas/patches/Makefile attached.

Cheers, MJ
--
Michael-John Turner * mj%mjturner.net@localhost * http://mjturner.net/
--- patches/patch-Makefile.orig	2020-10-22 10:30:09.000000000 +0100
+++ patches/patch-Makefile	2020-10-22 11:02:14.000000000 +0100
@@ -1,8 +1,9 @@
 $NetBSD: patch-Makefile,v 1.1 2020/10/21 17:34:09 kim Exp $
 
 Enable HAVE_LOGIN_CAP_H and reallocarray() on NetBSD.
+On pkgsrc systems, manual pages are not in share/man
 
---- Makefile
+--- Makefile.orig	2020-08-07 21:42:52.000000000 +0000
 +++ Makefile
 @@ -24,6 +24,11 @@ ifeq ($(UNAME_S),FreeBSD)
      CFLAGS+=-DHAVE_LOGIN_CAP_H
@@ -16,3 +17,12 @@
  ifeq ($(UNAME_S),SunOS)
      SAFE_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin
      GLOBAL_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin
+@@ -36,8 +41,6 @@ ifeq ($(UNAME_S),Darwin)
+     CPPFLAGS+=-Icompat
+     COMPAT+=bsd-closefrom.o
+     OBJECTS+=$(COMPAT:%.o=compat/%.o)
+-    # On MacOS the default man page path is /usr/local/share/man
+-    MANDIR=$(DESTDIR)$(PREFIX)/share/man
+ endif
+ 
+ all: $(OBJECTS) doas.1.final doas.conf.5.final


Home | Main Index | Thread Index | Old Index