Date: Mon, 4 May 2015 13:21:17 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385403 - in head: Mk graphics/xfig lang/ruby20 lang/ruby21 lang/ruby22 mail/courier news/cleanfeed Message-ID: <201505041321.t44DLHNI007412@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Mon May 4 13:21:17 2015 New Revision: 385403 URL: https://svnweb.freebsd.org/changeset/ports/385403 Log: Remove _*OWNGRP, with staging it's not useful anymore With hat: portmgr Original submission: bapt Exp-run: self Modified: head/Mk/bsd.port.mk head/graphics/xfig/Makefile head/lang/ruby20/Makefile head/lang/ruby21/Makefile head/lang/ruby22/Makefile head/mail/courier/Makefile head/news/cleanfeed/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon May 4 13:03:27 2015 (r385402) +++ head/Mk/bsd.port.mk Mon May 4 13:21:17 2015 (r385403) @@ -2146,32 +2146,15 @@ MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS 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}" \ Modified: head/graphics/xfig/Makefile ============================================================================== --- head/graphics/xfig/Makefile Mon May 4 13:03:27 2015 (r385402) +++ head/graphics/xfig/Makefile Mon May 4 13:21:17 2015 (r385403) @@ -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 Modified: head/lang/ruby20/Makefile ============================================================================== --- head/lang/ruby20/Makefile Mon May 4 13:03:27 2015 (r385402) +++ head/lang/ruby20/Makefile Mon May 4 13:21:17 2015 (r385403) @@ -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}'" Modified: head/lang/ruby21/Makefile ============================================================================== --- head/lang/ruby21/Makefile Mon May 4 13:03:27 2015 (r385402) +++ head/lang/ruby21/Makefile Mon May 4 13:21:17 2015 (r385403) @@ -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}'" Modified: head/lang/ruby22/Makefile ============================================================================== --- head/lang/ruby22/Makefile Mon May 4 13:03:27 2015 (r385402) +++ head/lang/ruby22/Makefile Mon May 4 13:21:17 2015 (r385403) @@ -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}'" Modified: head/mail/courier/Makefile ============================================================================== --- head/mail/courier/Makefile Mon May 4 13:03:27 2015 (r385402) +++ head/mail/courier/Makefile Mon May 4 13:21:17 2015 (r385403) @@ -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 Modified: head/news/cleanfeed/Makefile ============================================================================== --- head/news/cleanfeed/Makefile Mon May 4 13:03:27 2015 (r385402) +++ head/news/cleanfeed/Makefile Mon May 4 13:21:17 2015 (r385403) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505041321.t44DLHNI007412>