Wesley Shields wrote: > Part 2 (the bsd.port.mk piece) is the patch posted by Doug with Ade's > suggestions.
You missed the second patch I sent with the ${file%:*} changes. I've
attached a modified version of that patch which incorporates Ade's
change.
I plan to start adding the DISTFILE string to +CONTENTS files in
portmaster until it's supported in bsd.port.mk, so if anyone has a
comment on the format, please speak up now.
> The entire thing no longer requires a change to pkg_create in order to
> function.
Cool!
Thanks again for taking this on,
Doug
--
This .signature sanitized for your protection
Index: bsd.port.mk
===================================================================
RCS file: /usr/local/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.544
diff -u -r1.544 bsd.port.mk
--- bsd.port.mk 30 Sep 2006 19:25:45 -0000 1.544
+++ bsd.port.mk 5 Dec 2006 22:16:53 -0000
@@ -5395,11 +5395,20 @@
# files exist.
.if !target(generate-plist)
+.if defined(DIST_SUBDIR)
+PDS= ${DIST_SUBDIR}/
+.endif
generate-plist:
@${ECHO_MSG} "===> Generating temporary packing list"
@${MKDIR} `${DIRNAME} ${TMPPLIST}`
@if [ ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing pkg-descr for
${PKGNAME}."; exit 1; fi
@>${TMPPLIST}
+ @for file in ${DISTFILES} ${PATCHFILES}; do \
+ distsize=`${GREP} "^SIZE (${PDS}$${file%:*})" ${MD5_FILE} |
${CUT} -f4 -d' '`; \
+ distsha256=`${GREP} "^SHA256 (${PDS}$${file%:*})" ${MD5_FILE} |
${CUT} -f4 -d' '`; \
+ distmd5=`${GREP} "^MD5 (${PDS}$${file%:*})" ${MD5_FILE} |
${CUT} -f4 -d' '`; \
+ ${ECHO_CMD} "@comment
DISTFILE:${PDS}$${file%:*}:SIZE=$${distsize}:SHA256=$${distsha256}:MD5=$${distmd5}"
>> ${TMPPLIST}; \
+ done
@for file in ${PLIST_FILES}; do \
${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e
s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
done
signature.asc
Description: OpenPGP digital signature
