Check-in [d8703daead]

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

Overview
Comment:STAGE_ARGS only needed in make of fake-pkg
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d8703daeade2229246461ba19b53c670356a244a
User & Date: bapt 2012-06-07 13:02:04
Context
2012-06-07
13:53
Fully working make package with pkgng check-in: 1fda220a36 user: bapt tags: trunk
13:02
STAGE_ARGS only needed in make of fake-pkg check-in: d8703daead user: bapt tags: trunk
12:19
Correct ordering of directories, and manage DOCSDIR EXAMPLESDIR and DATADIR check-in: bd4ba8d610 user: bapt tags: trunk
Changes

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

23
24
25
26
27
28
29

30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
...
221
222
223
224
225
226
227

228
229
230
231
232
233
234
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} 
	@${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF} 
	@${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF} 
................................................................................
		exit 1; \
	fi
.endif # defined(DEFER_CONFLICTS_CHECK)
.endif
.endif

.if !target(do-package)

do-package: ${TMPPLIST}
	@if [ -d ${PACKAGES} ]; then \
		if [ ! -d ${PKGREPOSITORY} ]; then \
			if ! ${MKDIR} ${PKGREPOSITORY}; then \
				${ECHO_MSG} "=> Can't create directory ${PKGREPOSITORY}."; \
				exit 1; \
			fi; \







>








<







 







>







23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

39
40
41
42
43
44
45
...
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
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)
.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


fake-pkg:
.if !defined(NO_PKG_REGISTER)
	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
	@${MKDIR} ${METADIR}
	@${ECHO_CMD} "name: ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}" > ${MANIFESTF} 
	@${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF} 
	@${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF} 
................................................................................
		exit 1; \
	fi
.endif # defined(DEFER_CONFLICTS_CHECK)
.endif
.endif

.if !target(do-package)

do-package: ${TMPPLIST}
	@if [ -d ${PACKAGES} ]; then \
		if [ ! -d ${PKGREPOSITORY} ]; then \
			if ! ${MKDIR} ${PKGREPOSITORY}; then \
				${ECHO_MSG} "=> Can't create directory ${PKGREPOSITORY}."; \
				exit 1; \
			fi; \