pkgsrc-WIP-changes archive

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

wip/unit: sync with pkgsrc main tree



Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Sat Dec 4 13:32:03 2021 -0500
Changeset:	ed889401baa0550316649e5542f80f6319c05b54

Modified Files:
	unit/Makefile
	unit/Makefile.common
	unit/PLIST

Log Message:
wip/unit: sync with pkgsrc main tree

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ed889401baa0550316649e5542f80f6319c05b54

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 unit/Makefile        | 2 ++
 unit/Makefile.common | 2 +-
 unit/PLIST           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diffs:
diff --git a/unit/Makefile b/unit/Makefile
index 34eafcf651..46f2b05718 100644
--- a/unit/Makefile
+++ b/unit/Makefile
@@ -10,5 +10,7 @@ MAINTAINER=	osa%FreeBSD.org@localhost
 
 RCD_SCRIPTS=	unit
 
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Werror
+
 .include "../../wip/unit/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/unit/Makefile.common b/unit/Makefile.common
index 34f4ba0f13..86649a670b 100644
--- a/unit/Makefile.common
+++ b/unit/Makefile.common
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--control=unix:${UNIT_RUNDIR}/control.unit.sock
 CONFIGURE_ARGS+=	--tmp=${UNIT_TMPDIR}
 CONFIGURE_ARGS+=	--user=${UNIT_USER}
 CONFIGURE_ARGS+=	--group=${UNIT_GROUP}
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/share/man
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 
 CHECK_WRKREF_SKIP=	libexec/unit/modules/ruby.unit.so
 
diff --git a/unit/PLIST b/unit/PLIST
index 158c3029d3..1df68f1ae8 100644
--- a/unit/PLIST
+++ b/unit/PLIST
@@ -1,3 +1,3 @@
 @comment $NetBSD$
+man/man8/unitd.8
 sbin/unitd
-share/man/man8/unitd.8


Home | Main Index | Thread Index | Old Index