summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/bsd.port.mk31
-rw-r--r--graphics/xfig/Makefile6
-rw-r--r--lang/ruby20/Makefile2
-rw-r--r--lang/ruby21/Makefile2
-rw-r--r--lang/ruby22/Makefile2
-rw-r--r--mail/courier/Makefile2
-rw-r--r--news/cleanfeed/Makefile2
7 files changed, 15 insertions, 32 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 4b3456b3a691..c3a05fc695df 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2146,32 +2146,15 @@ MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p
READLINK_CMD?= /usr/bin/readlink
-# Determine whether or not we can use rootly owner/group functions.
-.if ${UID} == 0
-_BINOWNGRP= -o ${BINOWN} -g ${BINGRP}
-_SHROWNGRP= -o ${SHAREOWN} -g ${SHAREGRP}
-_MANOWNGRP= -o ${MANOWN} -g ${MANGRP}
-.else
-_BINOWNGRP=
-_SHROWNGRP=
-_MANOWNGRP=
-.endif
-
_SHAREMODE?= 0644
# A few aliases for *-install targets
-INSTALL_PROGRAM= \
- ${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m ${BINMODE}
-INSTALL_KLD= \
- ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE}
-INSTALL_LIB= \
- ${INSTALL} ${COPY} ${STRIP} ${_SHROWNGRP} -m ${SHAREMODE}
-INSTALL_SCRIPT= \
- ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE}
-INSTALL_DATA= \
- ${INSTALL} ${COPY} ${_SHROWNGRP} -m ${_SHAREMODE}
-INSTALL_MAN= \
- ${INSTALL} ${COPY} ${_MANOWNGRP} -m ${MANMODE}
+INSTALL_PROGRAM= ${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}
+INSTALL_KLD= ${INSTALL} ${COPY} -m ${BINMODE}
+INSTALL_LIB= ${INSTALL} ${COPY} ${STRIP} -m ${SHAREMODE}
+INSTALL_SCRIPT= ${INSTALL} ${COPY} -m ${BINMODE}
+INSTALL_DATA= ${INSTALL} ${COPY} -m ${_SHAREMODE}
+INSTALL_MAN= ${INSTALL} ${COPY} -m ${MANMODE}
INSTALL_MACROS= BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
BSD_INSTALL_LIB="${INSTALL_LIB}" \
@@ -3403,7 +3386,7 @@ do-configure:
if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
- INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
+ INSTALL="/usr/bin/install -c" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_LIB="${INSTALL_LIB}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 9979f20cf51e..08f87368c44e 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -28,9 +28,9 @@ INSTALL_TARGET= install install.libs
MAKE_ENV+= DOCSDIR=${DOCSDIR} CHMOD=${CHMOD} TAR=${TAR}
MAKE_ARGS+= INSTALLFLAGS="${COPY}" \
- INSTPGMFLAGS="${STRIP} ${_BINOWNGRP} -m ${BINMODE}" \
- INSTDATFLAGS="${_SHROWNGRP} -m ${SHAREMODE}" \
- INSTMANFLAGS="${_MANOWNGRP} -m ${MANMODE}"
+ INSTPGMFLAGS="${STRIP} -m ${BINMODE}" \
+ INSTDATFLAGS="-m ${SHAREMODE}" \
+ INSTMANFLAGS="-m ${MANMODE}"
OPTIONS_DEFINE= GHOSTSCRIPT I18N DOCS
OPTIONS_DEFAULT= GHOSTSCRIPT I18N
diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile
index dedf13798f4b..804a60cfb9cd 100644
--- a/lang/ruby20/Makefile
+++ b/lang/ruby20/Makefile
@@ -178,7 +178,7 @@ post-build:
# privilegies
#
@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
- @${RB_SET_CONF_VAR} "INSTALL" "ENV['RB_USER_INSTALL'] ? '/usr/bin/install -c' : '/usr/bin/install -c ${_BINOWNGRP}'"
+ @${RB_SET_CONF_VAR} "INSTALL" "'/usr/bin/install -c'"
@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index d045b48b0b9b..11ce9d211154 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -173,7 +173,7 @@ post-build:
# privilegies
#
@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
- @${RB_SET_CONF_VAR} "INSTALL" "ENV['RB_USER_INSTALL'] ? '/usr/bin/install -c' : '/usr/bin/install -c ${_BINOWNGRP}'"
+ @${RB_SET_CONF_VAR} "INSTALL" "'/usr/bin/install -c'"
@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index f8abcd3e0731..fe7c841f267c 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -173,7 +173,7 @@ post-build:
# privilegies
#
@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
- @${RB_SET_CONF_VAR} "INSTALL" "ENV['RB_USER_INSTALL'] ? '/usr/bin/install -c' : '/usr/bin/install -c ${_BINOWNGRP}'"
+ @${RB_SET_CONF_VAR} "INSTALL" "'/usr/bin/install -c'"
@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 58a421887566..121df194786d 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -320,7 +320,7 @@ post-install:
.endfor
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${INSTALL} ${_DOCOWNGRP} -d ${STAGEDIR}${DOCSDIR}/html
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/html
.for f in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index 338bcbb34fc5..ab2566928091 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -25,7 +25,7 @@ post-patch:
@${REINPLACE_CMD} -e "/debug_batch_directory/s:'.*':'/var/log/cleanfeed':" ${WRKSRC}/etc/cleanfeed.local
do-install:
- @${INSTALL} ${_SHROWNGRP} -d ${STAGEDIR}${PREFIX}/news/cleanfeed/etc
+ @${MKDIR} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc
.for f in bad_adult_paths bad_body bad_cancel_paths bad_from bad_groups \
bad_hosts bad_paths bad_subject bad_url
@${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 14:04:49 +0000