diff options
| -rw-r--r-- | Mk/bsd.port.mk | 19 | ||||
| -rw-r--r-- | security/krb5-111/Makefile | 8 | ||||
| -rw-r--r-- | security/krb5-112/Makefile | 8 | ||||
| -rw-r--r-- | security/krb5-appl/Makefile | 8 | ||||
| -rw-r--r-- | security/krb5/Makefile | 8 |
5 files changed, 8 insertions, 43 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index bbb5d2f9a9de..cc39e9d47adb 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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 diff --git a/security/krb5-111/Makefile b/security/krb5-111/Makefile index 2a50f2036971..9d02856ef90f 100644 --- a/security/krb5-111/Makefile +++ b/security/krb5-111/Makefile @@ -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 diff --git a/security/krb5-112/Makefile b/security/krb5-112/Makefile index 00f5f816c711..029e0bc12012 100644 --- a/security/krb5-112/Makefile +++ b/security/krb5-112/Makefile @@ -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 diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index ed06ab22f3f3..898ccd7c6edb 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -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} "------------------------------------------------------" diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 78c3cd7f5ee9..760618ee38ee 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -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 |