[Midnightbsd-cvs] mports [19063] trunk: rename HASH_FILE -> DISTINFO_FILE as it is more specific.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 23 11:22:39 EDT 2015
Revision: 19063
http://svnweb.midnightbsd.org/mports/?rev=19063
Author: laffer1
Date: 2015-05-23 11:22:38 -0400 (Sat, 23 May 2015)
Log Message:
-----------
rename HASH_FILE -> DISTINFO_FILE as it is more specific. We went to HASH_FILE when we dropped MD5
Modified Paths:
--------------
trunk/Mk/bsd.mport.mk
trunk/Mk/extensions/linux_rpm.mk
trunk/security/cyrus-sasl2-saslauthd/Makefile
Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk 2015-05-23 15:17:52 UTC (rev 19062)
+++ trunk/Mk/bsd.mport.mk 2015-05-23 15:22:38 UTC (rev 19063)
@@ -851,7 +851,7 @@
CHECKSUM_ALGORITHMS?= sha256
-HASH_FILE?= ${MASTERDIR}/distinfo
+DISTINFO_FILE?= ${MASTERDIR}/distinfo
MAKE_FLAGS?= -f
MAKEFILE?= Makefile
@@ -2023,10 +2023,10 @@
${ECHO_MSG} "=> Please correct this problem and try again."; \
exit 1; \
fi ; \
- if [ -f ${HASH_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \
- if ! ${GREP} -q "^SHA256 ($$pattern)" ${HASH_FILE}; then \
- ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${HASH_FILE}."; \
- ${ECHO_MSG} "=> Either ${HASH_FILE} is out of date, or"; \
+ if [ -f ${DISTINFO_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \
+ if ! ${GREP} -q "^SHA256 ($$pattern)" ${DISTINFO_FILE}; then \
+ ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${DISTINFO_FILE}."; \
+ ${ECHO_MSG} "=> Either ${DISTINFO_FILE} is out of date, or"; \
${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \
exit 1; \
fi; \
@@ -2052,7 +2052,7 @@
for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
${ECHO_MSG} "=> Attempting to fetch from $${site}."; \
DIR=${DIST_SUBDIR}; \
- CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${HASH_FILE} | ${AWK} '{print $$4}'`; \
+ CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \
case $${file} in \
*/*) ${MKDIR} $${file%/*}; \
args="-o $${file} $${site}$${file}";; \
@@ -2106,7 +2106,7 @@
${ECHO_MSG} "=> Attempting to fetch from $${site}."; \
DIR=${DIST_SUBDIR}; \
pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \
- CKSIZE=`${GREP} "^SIZE ($$pattern)" ${HASH_FILE} | ${AWK} '{print $$4}'`; \
+ CKSIZE=`${GREP} "^SIZE ($$pattern)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \
case $${file} in \
*/*) ${MKDIR} $${file%/*}; \
args="-o $${file} $${site}$${file}";; \
@@ -2950,7 +2950,7 @@
fi; \
fi; \
DIR=${DIST_SUBDIR}; \
- CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${HASH_FILE} | ${AWK} '{print $$4}'`; \
+ CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \
case $${file} in \
*/*) args="-o $${file} $${site}$${file}";; \
*) args=$${site}$${file};; \
@@ -2982,7 +2982,7 @@
fi ; \
for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
DIR=${DIST_SUBDIR}; \
- CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${HASH_FILE} | ${AWK} '{print $$4}'`; \
+ CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \
case $${file} in \
*/*) args="-o $${file} $${site}$${file}";; \
*) args=$${site}$${file};; \
@@ -3020,7 +3020,7 @@
makesum: check-checksum-algorithms
@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch NO_CHECKSUM=yes \
DISABLE_SIZE=yes
- @if [ -f ${HASH_FILE} ]; then ${CAT} /dev/null > ${HASH_FILE}; fi
+ @if [ -f ${DISTINFO_FILE} ]; then ${CAT} /dev/null > ${DISTINFO_FILE}; fi
@( \
cd ${DISTDIR}; \
\
@@ -3031,17 +3031,17 @@
eval alg_executable=\$$$$alg; \
\
if [ $$alg_executable != "NO" ]; then \
- $$alg_executable $$file >> ${HASH_FILE}; \
+ $$alg_executable $$file >> ${DISTINFO_FILE}; \
fi; \
done; \
if [ -z "${NO_SIZE}" ]; then \
- ${ECHO_CMD} "SIZE ($$file) = "`${LS} -ALln $$file | ${AWK} '{print $$5}'` >> ${HASH_FILE}; \
+ ${ECHO_CMD} "SIZE ($$file) = "`${LS} -ALln $$file | ${AWK} '{print $$5}'` >> ${DISTINFO_FILE}; \
fi; \
done \
)
@for file in ${_IGNOREFILES}; do \
for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
- ${ECHO_CMD} "$$alg ($$file) = IGNORE" >> ${HASH_FILE}; \
+ ${ECHO_CMD} "$$alg ($$file) = IGNORE" >> ${DISTINFO_FILE}; \
done; \
done
.endif
@@ -3052,7 +3052,7 @@
\
${checksum_init} \
\
- if [ -f ${HASH_FILE} ]; then \
+ if [ -f ${DISTINFO_FILE} ]; then \
( cd ${DISTDIR}; OK=""; \
for file in ${_CKSUMFILES}; do \
pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \
@@ -3064,7 +3064,7 @@
\
if [ $$alg_executable != "NO" ]; then \
MKSUM=`$$alg_executable < $$file`; \
- CKSUM=`${GREP} "^$$alg ($$pattern)" ${HASH_FILE} | ${AWK} '{print $$4}'`; \
+ CKSUM=`${GREP} "^$$alg ($$pattern)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \
else \
ignore="true"; \
fi; \
@@ -3118,7 +3118,7 @@
eval alg_executable=\$$$$alg; \
\
if [ $$alg_executable != "NO" ]; then \
- CKSUM=`${GREP} "^$$alg ($$pattern)" ${HASH_FILE} | ${AWK} '{print $$4}'`; \
+ CKSUM=`${GREP} "^$$alg ($$pattern)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \
else \
ignore="true"; \
fi; \
@@ -3158,7 +3158,7 @@
\
if [ "$$OK" != "true" -a ${FETCH_REGET} -eq 0 ]; then \
${ECHO_MSG} "===> Giving up on fetching files: $$refetchlist"; \
- ${ECHO_MSG} "Make sure the Makefile and distinfo file (${HASH_FILE})"; \
+ ${ECHO_MSG} "Make sure the Makefile and distinfo file (${DISTINFO_FILE})"; \
${ECHO_MSG} "are up to date. If you are absolutely sure you want to override this"; \
${ECHO_MSG} "check, type \"make NO_CHECKSUM=yes [other args]\"."; \
exit 1; \
@@ -3168,7 +3168,7 @@
fi \
); \
elif [ -n "${_CKSUMFILES:M*}" ]; then \
- ${ECHO_MSG} "=> No checksum file (${HASH_FILE})."; \
+ ${ECHO_MSG} "=> No checksum file (${DISTINFO_FILE})."; \
fi
.endif
Modified: trunk/Mk/extensions/linux_rpm.mk
===================================================================
--- trunk/Mk/extensions/linux_rpm.mk 2015-05-23 15:17:52 UTC (rev 19062)
+++ trunk/Mk/extensions/linux_rpm.mk 2015-05-23 15:22:38 UTC (rev 19063)
@@ -150,7 +150,7 @@
EXTRACT_BEFORE_ARGS?= -xf
EXTRACT_AFTER_ARGS?=
-HASH_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
+DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
BRANDELF_DIRS?=
BRANDELF_FILES?=
Modified: trunk/security/cyrus-sasl2-saslauthd/Makefile
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/Makefile 2015-05-23 15:17:52 UTC (rev 19062)
+++ trunk/security/cyrus-sasl2-saslauthd/Makefile 2015-05-23 15:22:38 UTC (rev 19063)
@@ -18,7 +18,7 @@
LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2
-HASH_FILE= ${CYRUS_SASL2_DIR}/distinfo
+DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo
PATCHDIR= ${CYRUS_SASL2_DIR}/files
INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/saslauthd
DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2
More information about the Midnightbsd-cvs
mailing list