aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2018-09-20 09:26:10 +0000
committerBrad Davis <brd@FreeBSD.org>2018-09-20 09:26:10 +0000
commit6999b78550143f7c17eeea04cc87f08cfd72fae8 (patch)
tree53f3bdaa42c58ddf563d4ae0d644ac3a1e3f92e2
parent80994f8119b0ad74049cd6ebc79fa569e447d2b0 (diff)
downloadsrc-6999b78550143f7c17eeea04cc87f08cfd72fae8.tar.gz
src-6999b78550143f7c17eeea04cc87f08cfd72fae8.zip
Move opieaccess to lib/libopie/
This leverages CONFS to do the install Approved by: re (blanket, pkgbase), bapt (mentor) Differential Revision: https://reviews.freebsd.org/D17241
Notes
Notes: svn path=/head/; revision=338823
-rw-r--r--etc/Makefile4
-rw-r--r--lib/libopie/Makefile3
-rw-r--r--lib/libopie/opieaccess (renamed from etc/opieaccess)0
3 files changed, 5 insertions, 2 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 8c55699d5624..75a745f7b865 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -70,7 +70,7 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
- master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+ master.passwd nsmb.conf ${DESTDIR}/etc;
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
@@ -206,7 +206,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
etc-examples: ${META_DEPS}
cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${BIN1} ${BIN2} nsmb.conf opieaccess \
+ ${BIN1} ${BIN2} nsmb.conf \
${DESTDIR}${SHAREDIR}/examples/etc
.include <bsd.prog.mk>
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 4507d252ea9a..2dda575e94ef 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -2,6 +2,9 @@
#
# $FreeBSD$
#
+
+CONFS= opieaccess
+CONFSMODE= 600
PACKAGE=lib${LIB}
OPIE_DIST?= ${SRCTOP}/contrib/opie
DIST_DIR= ${OPIE_DIST}/${.CURDIR:T}
diff --git a/etc/opieaccess b/lib/libopie/opieaccess
index ed57ef13a33a..ed57ef13a33a 100644
--- a/etc/opieaccess
+++ b/lib/libopie/opieaccess