diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2007-04-26 06:44:51 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2007-04-26 06:44:51 +0000 |
| commit | 29b7e35c2e836846724ae6de279b320f61162d3d (patch) | |
| tree | 37c49c33f596d1b5eb34a01377e1d607d9f17922 /ports-mgmt/portmk | |
| parent | Upgrade to 1.4. (diff) | |
Bring this up to master r1.565.
Notes
Notes:
svn path=/head/; revision=190899
Diffstat (limited to 'ports-mgmt/portmk')
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index a52264c87709..e33b173a208f 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -3469,7 +3469,7 @@ check-vulnerable: # set alg to any of SIZE, MD5, SHA256 (or any other checksum algorithm): DISTINFO_DATA?= if [ \( -n "${DISABLE_SIZE}" -a -n "${NO_CHECKSUM}" \) -o ! -f "${MD5_FILE}" ]; then exit; fi; \ - DIR=${DIST_SUBDIR}; ${AWK} -v alg=$$alg -v file=$${DIR:+$$DIR/}$${file\#\#*/} \ + DIR=${DIST_SUBDIR}; ${AWK} -v alg=$$alg -v file=$${DIR:+$$DIR/}$${file} \ '$$1 == alg && $$2 == "(" file ")" {print $$4}' ${MD5_FILE} # Fetch @@ -4753,13 +4753,14 @@ checksum: fetch check-checksum-algorithms cd ${DISTDIR}; OK="";\ for file in ${_CKSUMFILES}; do \ ignored="true"; \ + _file=$${file#${DIST_SUBDIR}/*}; \ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ ignore="false"; \ eval alg_executable=\$$$$alg; \ \ if [ $$alg_executable != "NO" ]; then \ MKSUM=`$$alg_executable < $$file`; \ - CKSUM=`${DISTINFO_DATA}`; \ + CKSUM=`file=$$_file; ${DISTINFO_DATA}`; \ else \ ignore="true"; \ fi; \ @@ -4804,6 +4805,7 @@ checksum: fetch check-checksum-algorithms done; \ \ for file in ${_IGNOREFILES}; do \ + _file=$${file#${DIST_SUBDIR}/*}; \ ignored="true"; \ alreadymatched="false"; \ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ @@ -4811,7 +4813,7 @@ checksum: fetch check-checksum-algorithms eval alg_executable=\$$$$alg; \ \ if [ $$alg_executable != "NO" ]; then \ - CKSUM=`${DISTINFO_DATA}`; \ + CKSUM=`file=$$_file; ${DISTINFO_DATA}`; \ else \ ignore="true"; \ fi; \ |