summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-04-20 01:06:12 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-04-20 01:06:12 +0000
commit39e8b5baff5d47f38941c574361c65466231deb1 (patch)
treeeef0600f1978de7cbac0930134aa43f66504902d /Mk
parentUpdate to 2.0.1 (diff)
(1) Switch USE_QT2 to use qt21.
Submitted by: imura (2) Don't complain about distfiles not listed in files/md5 if we are doing "make makesum". Reported by: mharo, cpiazza Reviewed by: mharo
Notes
Notes: svn path=/head/; revision=27767
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 4499d7b1cd81..ead6a8c82ebc 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -686,7 +686,7 @@ USE_NEWGCC= yes
.endif
.if defined(USE_QT2)
-LIB_DEPENDS+= qt2.2:${PORTSDIR}/x11-toolkits/qt20
+LIB_DEPENDS+= qt2.3:${PORTSDIR}/x11-toolkits/qt21
USE_NEWGCC= yes
.endif
@@ -1566,7 +1566,7 @@ do-fetch:
${ECHO_MSG} ">> Please correct this problem and try again."; \
exit 1; \
fi ; \
- if [ -f ${MD5_FILE} ]; then \
+ if [ -f ${MD5_FILE} -a "x${FORCE_FETCH}" = "x" ]; then \
if ! ${GREP} -q "^MD5 (.*$$file)" ${MD5_FILE}; then \
${ECHO_MSG} ">> $$file is not in ${MD5_FILE}."; \
${ECHO_MSG} ">> Either ${MD5_FILE} is out of date, or"; \
@@ -2206,7 +2206,8 @@ fetch-list:
# Checksumming utilities
.if !target(makesum)
-makesum: fetch
+makesum:
+ @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch FORCE_FETCH=yes
@${MKDIR} ${FILESDIR}
@if [ -f ${MD5_FILE} ]; then ${RM} -f ${MD5_FILE}; fi
@(cd ${DISTDIR}; \