Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 925c0aa
prevent more execution, un canonicalise last -f to avoid failure
Baptiste Daroussin committed 14 years ago
commit 925c0aa7a9ee734b71ead3dc056a307d056dca43
parent fdf81d4
1 file changed +11 -9
modified ports/bsd.pkgng.mk
@@ -56,14 +56,14 @@ ${i:S/-//:U}= ${WRKDIR}/${SUB_FILES:M${i}*}
.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}
- 
	@${ECHO_CMD} "comment: ${COMMENT}" >> ${MANIFESTF}
- 
	@${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF}
- 
	@${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF}
+ 
	@${ECHO_MSG} "===>   Regitering installation for ${PKGNAME}"; \
+ 
	${MKDIR} ${METADIR} ; \
+ 
	${ECHO_CMD} "name: ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}" > ${MANIFESTF} ; \
+ 
	${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF} ; \
+ 
	${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF} ; \
+ 
	${ECHO_CMD} "comment: ${COMMENT}" >> ${MANIFESTF} ; \
+ 
	${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF} ; \
+ 
	${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF}

.if defined(WWW)

	@${ECHO_CMD} "www: ${WWW}" >> ${MANIFESTF}

.endif
@@ -86,7 +86,9 @@ fake-pkg:
	[ -f ${PKGPREUPGRADE} ] && ${CP} ${PKGPREUPGRADE} ${METADIR}/+PRE_UPGRADE; \

	[ -f ${PKGPOSTUPGRADE} ] && ${CP} ${PKGPOSTUPGRADE} ${METADIR}/+POST_UPGRADE; \

	${CP} ${DESCR} ${METADIR}/+DESC; \
- 
	[ -f ${PKGMESSAGE} ] && ${CP} ${PKGMESSAGE} ${METADIR}/+DISPLAY; \
+ 
	if [ -f ${PKGMESSAGE} ]; then \
+ 
	       ${CP} ${PKGMESSAGE} ${METADIR}/+DISPLAY; \
+ 
       fi

.if !defined(NO_MTREE)

	@${CP} ${MTREE_FILE} ${METADIR}/+MTREE_DIRS

.endif