Check-in [03e5129017]

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

Overview
Comment:Fix 'Unassociated shell command' in 'make fake-pkg'
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 03e5129017118dc3bf1d7d2a701c999a8779725e
User & Date: bdrewery 2012-06-07 03:04:41
Context
2012-06-07
04:19
Stop syncing on error check-in: ef4ba09650 user: bdrewery tags: trunk
03:04
Fix 'Unassociated shell command' in 'make fake-pkg' check-in: 03e5129017 user: bdrewery tags: trunk
02:51
Fix staging of licenses check-in: a99484943c user: bdrewery tags: trunk
Changes

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

22
23
24
25
26
27
28








29
30
31
32
33
34
35
...
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130

ACTUAL-PACKAGE-DEPENDS?= \
	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
		${PKG_QUERY} "  %n: {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
		${PKG_QUERY} "  %dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
	fi










.if !target(fake-pkg)
fake-pkg:
.if !defined(NO_PKG_REGISTER)
	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
	@${MKDIR} ${METADIR}
	@${ECHO_CMD} "name: ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}" > ${MANIFESTF} 
................................................................................
	[ -f ${PKGPREUPGRADE} ] && ${CP} ${PKGPREUPGRADE} ${METADIR}/+PRE_UPGRADE; \
	[ -f ${PKGPOSTUPGRADE} ] && ${CP} ${PKGPOSTUPGRADE} ${METADIR}/+POST_UPGRADE; \
	${CP} ${DESCR} ${METADIR}/+DESC; \
	[ -f ${PKGMESSAGE} ] && ${CP} ${PKGMESSAGE} ${METADIR}/+DISPLAY || return 0
.if !defined(NO_MTREE)
	@[ -f ${MTREE_FILE} ] && ${CP} ${MTREE_FILE} ${METADIR}/+MTREE_DIRS || return 0
.endif
.if ${USE_STAGE:L} == yes
STAGE_ARGS=	-i ${STAGEDIR}
.else
# -l was legacy meaning to not execute the scripts neither show message needed
#  only when not in stage mode
STAGE_ARGS=	-l
.endif
.if defined(INSTALLS_DEPENDS)
	@${PKG_CMD} -d -m ${METADIR} -f ${TMPPLIST} ${STAGE_ARGS}
.else
	@${PKG_CMD} -m ${METADIR} -f ${TMPPLIST} ${STAGE_ARGS}
.endif
.else
	@${DO_NADA}







>
>
>
>
>
>
>
>







 







<
<
<
<
<
<
<







22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
...
118
119
120
121
122
123
124







125
126
127
128
129
130
131

ACTUAL-PACKAGE-DEPENDS?= \
	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
		${PKG_QUERY} "  %n: {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
		${PKG_QUERY} "  %dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
	fi


.if ${USE_STAGE:L} == yes
STAGE_ARGS=	-i ${STAGEDIR}
.else
# -l was legacy meaning to not execute the scripts neither show message needed
#  only when not in stage mode
STAGE_ARGS=	-l
.endif

.if !target(fake-pkg)
fake-pkg:
.if !defined(NO_PKG_REGISTER)
	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
	@${MKDIR} ${METADIR}
	@${ECHO_CMD} "name: ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}" > ${MANIFESTF} 
................................................................................
	[ -f ${PKGPREUPGRADE} ] && ${CP} ${PKGPREUPGRADE} ${METADIR}/+PRE_UPGRADE; \
	[ -f ${PKGPOSTUPGRADE} ] && ${CP} ${PKGPOSTUPGRADE} ${METADIR}/+POST_UPGRADE; \
	${CP} ${DESCR} ${METADIR}/+DESC; \
	[ -f ${PKGMESSAGE} ] && ${CP} ${PKGMESSAGE} ${METADIR}/+DISPLAY || return 0
.if !defined(NO_MTREE)
	@[ -f ${MTREE_FILE} ] && ${CP} ${MTREE_FILE} ${METADIR}/+MTREE_DIRS || return 0
.endif







.if defined(INSTALLS_DEPENDS)
	@${PKG_CMD} -d -m ${METADIR} -f ${TMPPLIST} ${STAGE_ARGS}
.else
	@${PKG_CMD} -m ${METADIR} -f ${TMPPLIST} ${STAGE_ARGS}
.endif
.else
	@${DO_NADA}