Date: Sun, 11 Jan 2009 12:03:53 -0900 From: "beech@" <beech@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/130387: [PATCH] Mk/bsd.port.mk - Add macros for COPYTREE_WWW and INSTALL_WWW Message-ID: <1231707833.29264@stargate.alaskaparadise.com> Resent-Message-ID: <200901112120.n0BLK3g7018978@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 130387
>Category: ports
>Synopsis: [PATCH] Mk/bsd.port.mk - Add macros for COPYTREE_WWW and INSTALL_WWW
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 11 21:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: beech@
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
FreeBSD
>Environment:
System: FreeBSD 8.0-CURRENT #14: Thu Jan 8 11:50:36 AKST 2009
root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE
>Description:
Update bsd.port.mk to include COPYTREE_WWW and INSTALL_WWW macros to eliminate some Makefile clutter.
>How-To-Repeat:
>Fix:
--- bsd.port.mk.diff begins here ---
--- bsd.port.mk.orig 2009-01-11 11:56:47.000000000 -0900
+++ bsd.port.mk 2009-01-11 11:55:05.000000000 -0900
@@ -2243,6 +2243,7 @@
READLINK_CMD?= /usr/bin/readlink
+WWWMODE?= 755
# Determine whether or not we can use rootly owner/group functions.
.if !defined(UID)
UID!= ${ID} -u
@@ -2251,10 +2252,12 @@
_BINOWNGRP= -o ${BINOWN} -g ${BINGRP}
_SHROWNGRP= -o ${SHAREOWN} -g ${SHAREGRP}
_MANOWNGRP= -o ${MANOWN} -g ${MANGRP}
+_WWWOWNGRP= -o ${WWWOWN} -g ${WWWGRP}
.else
_BINOWNGRP=
_SHROWNGRP=
_MANOWNGRP=
+_WWWOWNGRP=
.endif
# A few aliases for *-install targets
@@ -2268,11 +2271,14 @@
${INSTALL} ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}
INSTALL_MAN= \
${INSTALL} ${COPY} ${_MANOWNGRP} -m ${MANMODE}
+INSTALL_WWW= \
+ ${INSTALL} ${COPY} ${_WWWOWNGRP} -m ${WWWMODE}
INSTALL_MACROS= BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
BSD_INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
BSD_INSTALL_DATA="${INSTALL_DATA}" \
BSD_INSTALL_MAN="${INSTALL_MAN}"
+ BSD_INSTALL_WWW="${INSTALL_WWW}"
MAKE_ENV+= ${INSTALL_MACROS}
SCRIPTS_ENV+= ${INSTALL_MACROS}
@@ -2288,6 +2294,11 @@
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
${FIND} -d $$0 $$2 -type f -exec chmod ${SHAREMODE} $$1/{} \;' --
+COPYTREE_WWW= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
+ 2>&1) && \
+ ${CHOWN} -R ${WWWOWN}:${WWWGRP} $$1 && \
+ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
+ ${FIND} -d $$0 $$2 -type f -exec chmod ${WWWMODE} $$1/{} \;' --
.else
COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
2>&1) && \
@@ -2297,6 +2308,10 @@
2>&1) && \
${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
${FIND} -d $$0 $$2 -type f -exec chmod ${SHAREMODE} $$1/{} \;' --
+COPYTREE_WWW= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
+ 2>&1) && \
+ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
+ ${FIND} -d $$0 $$2 -type f -exec chmod ${WWWMODE} $$1/{} \;' --
.endif
# The user can override the NO_PACKAGE by specifying this from
--- bsd.port.mk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1231707833.29264>