cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove support for EXTRACT_PRESERVE_OWNERSHIP

Browse Source 
- Update a few comments related to extract

Differential Revision:	https://reviews.freebsd.org/D1189
With hat:	portmgr
This commit is contained in:
Antoine Brodin 2014-12-14 11:44:24 +00:00
parent fa77662c1d
commit 9cb1f86730
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=374698
5 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Mk/bsd.port.mk
View File

@ -768,19 +768,14 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
#
# For extract:
#
# EXTRACT_CMD - Command for extracting archive: "bzip2" if USE_BZIP2
# is set, "gzip" otherwise.
# EXTRACT_CMD - Command for extracting archive
# Default: ${TAR}
# EXTRACT_BEFORE_ARGS
# - Arguments to ${EXTRACT_CMD} before filename.
# Default: "-dc"
# Default: "-xf"
# EXTRACT_AFTER_ARGS
# - Arguments to ${EXTRACT_CMD} following filename.
# default: "| tar -xf -"
# EXTRACT_PRESERVE_OWNERSHIP
# - Normally, when run as "root", the extract stage will
# change the owner and group of all files under ${WRKDIR}
# to 0:0. Set this variable if you want to turn off this
# feature.
# Default: "--no-same-owner --no-same-permissions"
# For patch:
#
# EXTRA_PATCHES - Define this variable if you have patches not in
@ -2155,11 +2150,7 @@ TAR?= /usr/bin/tar
# EXTRACT_SUFX is defined in .pre.mk section
EXTRACT_CMD?= ${TAR}
EXTRACT_BEFORE_ARGS?= -xf
.if defined(EXTRACT_PRESERVE_OWNERSHIP)
EXTRACT_AFTER_ARGS?=
.else
EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions
.endif
# Figure out where the local mtree file is
.if !defined(MTREE_FILE) && !defined(NO_MTREE)
@ -3319,13 +3310,11 @@ do-extract:
exit 1; \
fi; \
done
.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
@if [ ${UID} = 0 ]; then \
${CHMOD} -R ug-s ${WRKDIR}; \
${CHOWN} -R 0:0 ${WRKDIR}; \
fi
.endif
.endif
# Patch

8
security/krb5-111/Makefile
View File

@ -81,14 +81,8 @@ PDF_DOC_DIR= ${WRKDIR}/krb5-${PORTVERSION}/doc/pdf
CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include"
post-extract:
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions
@${RM} ${WRKDIR}/krb5-${PORTVERSION}.tar.gz ${WRKDIR}/krb5-${PORTVERSION}.tar.gz.asc
.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
@if [ `id -u` = 0 ]; then \
${CHMOD} -R ug-s,go-w ${WRKDIR}/krb5-${PORTVERSION}; \
${CHOWN} -R 0:0 ${WRKDIR}/krb5-${PORTVERSION}; \
fi
.endif
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5

8
security/krb5-112/Makefile
View File

@ -87,14 +87,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include"
post-extract:
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions
@${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
@if [ `id -u` = 0 ]; then \
${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
fi
.endif
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5

8
security/krb5-appl/Makefile
View File

@ -124,14 +124,8 @@ HTML_DOCS= ftp.html kdestroy.html kinit.html klist.html \
CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
post-extract:
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions
@${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
@if [ `id -u` = 0 ]; then \
${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
fi
.endif
post-install:
@${ECHO} "------------------------------------------------------"

8
security/krb5/Makefile
View File

@ -85,14 +85,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include"
post-extract:
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions
@${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
@if [ `id -u` = 0 ]; then \
${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
fi
.endif
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5