Check-in [408c12ee83]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:use compact test syntax wrap long lines return by default returns 0 ECHO_CMD defined as sh builtin and always return 0, therefore change && to ;

Submitted by: Alex Kozlov (ak@)

Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:408c12ee830ae0ca73288a859e50be6d30638595
User & Date: bapt 2012-06-18 05:43:43
Context
2012-06-19
04:24
Fix error when no pkg-{install,message} exists check-in: 511d3ad7a2 user: bdrewery tags: trunk
2012-06-18
05:43
use compact test syntax wrap long lines return by default returns 0 ECHO_CMD defined as sh builtin and always return 0, therefore change && to ;

Submitted by: Alex Kozlov (ak@) check-in: 408c12ee83 user: bapt tags: trunk

2012-06-16
15:22
Sync with latest version check-in: ee2ba26bcd user: bapt tags: trunk
Changes

Changes to ports/Mk/bsd.stage.mk.

    20     20   
    21     21   .if !target(sync-from-stage)
    22     22   sync-from-stage: stage
    23     23   .if defined(WITH_PKGNG)
    24     24   	@${DO_NADA}
    25     25   .else
    26     26   	@${ECHO_MSG} "===> Syncing from stagedir"
    27         -	@${SH} ${PORTSDIR}/Tools/scripts/sync_from_stage.sh -f ${STAGEDIR} -p ${TMPPLIST} -P ${PREFIX} -w ${WRKDIR}
    28         -
    29         -	@if [ -f ${PKGINSTALL} ]; then \
    30         -		${SH} ${PKGINSTALL} POST-INSTALL; \
    31         -	fi
    32         -	@[ -f ${PKGMESSAGE} ] && ${CAT} ${PKGMESSAGE} || return 0
           27  +	@${SH} ${PORTSDIR}/Tools/scripts/sync_from_stage.sh -f ${STAGEDIR} \
           28  +		-p ${TMPPLIST} -P ${PREFIX} -w ${WRKDIR}
           29  +	@[ -f ${PKGINSTALL} ] && ${SH} ${PKGINSTALL} POST-INSTALL
           30  +	@[ -f ${PKGMESSAGE} ] && ${CAT} ${PKGMESSAGE} || return
    33     31   .endif
    34     32   .endif
    35     33   
    36     34   .if !target(genplist)
    37     35   genplist: stage
    38         -	@(${ECHO_CMD} "#mtree" && ${CAT} ${MTREE_FILE}) | ${TAR} tf - | \
    39         -		awk '{ sub(/^\.$$/, "", $$1); if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' \
           36  +	@(${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}) | ${TAR} tf - | \
           37  +		awk '{ sub(/^\.$$/, "", $$1); \
           38  +		if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' \
    40     39   		> ${WRKDIR}/.mtree
    41     40   	@a=${PREFIX}; \
    42     41   		while :; do \
    43     42   			a=$${a%/*} ; \
    44     43   			[ -z "$${a}" ] && break ; \
    45     44   			${ECHO_CMD} $${a} >> ${WRKDIR}/.mtree ; \
    46     45   		done
................................................................................
    48     47   		-e "s,${DOCSDIR},%%PORTDOCS%%%%DOCSDIR%%,g" \
    49     48   		-e "s,${EXAMPLESDIR},%%PORTEXAMPLES%%%%EXAMPLESDIR%%,g" \
    50     49   		-e "s,${DATADIR},%%DATADIR%%,g" \
    51     50   		-e "s,${PREFIX}/,,g" | sort
    52     51   	@${FIND} ${STAGEDIR} -type d | sed -e "s,${STAGEDIR},,g" \
    53     52   		| while read line; do \
    54     53   		${GREP} -qw "^$${line}$$" ${WRKDIR}/.mtree || { \
    55         -			if [ -n "$${line}" ]; then \
    56         -				${ECHO_CMD} "@dirrm $${line}"; \
    57         -			fi ; \
           54  +			[ -n "$${line}" ] && ${ECHO_CMD} "@dirrm $${line}"; \
    58     55   		}; \
    59     56   		done | ${SORT} -r | ${SED} \
    60     57   		-e "s,\(.*\)${DOCSDIR},%%PORTDOCS%%\1%%DOCSDIR%%,g" \
    61     58   		-e "s,\(.*\)${EXAMPLESDIR},%%PORTEXAMPLES%%\1%%EXAMPLESDIR%%,g" \
    62     59   		-e "s,${DATADIR},%%DATADIR%%,g" \
    63     60   		-e "s,${PREFIX},,g"
    64     61   .endif