Date: Sun, 27 Oct 1996 01:40:07 -0800 (PST) From: "David E. O'Brien" <obrien@NUXI.cs.ucdavis.edu> To: FreeBSD-gnats-submit@freebsd.org Cc: obrien@Nuxi.com Subject: ports/1901: change to MKDIR in bsd.port.mk Message-ID: <199610270940.BAA26151@relay.nuxi.com> Resent-Message-ID: <199610270940.BAA16594@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 1901
>Category: ports
>Synopsis: change to MKDIR in bsd.port.mk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 27 01:40:01 PST 1996
>Last-Modified:
>Originator: David E. O'Brien
>Organization:
University of California, Davis
>Release: FreeBSD 2.1.5-RELEASE i386
>Environment:
based on bsd.port.mk from -current
>Description:
Currently MKDIR is defined as "/bin/mkdir" in
/usr/share/mk/bsd.port.mk. Everwhere in bsd.port.mk that MKDIR is
used it is followed by "-p". This is also true of most port's
Makefile's that use MKDIR. So it seems to make sense to change
the definition to "/bin/mkdir -p".
This would also prevent possible problems with ``make reinstall''.
>How-To-Repeat:
n/a
>Fix:
--- bsd.port.mk.orig Fri Oct 25 01:58:13 1996
+++ bsd.port.mk.p Sun Oct 27 01:08:17 1996
@@ -387,7 +387,7 @@
CP?= /bin/cp
SETENV?= /usr/bin/env
RM?= /bin/rm
-MKDIR?= /bin/mkdir
+MKDIR?= /bin/mkdir -p
GZCAT?= /usr/bin/gzcat
BASENAME?= /usr/bin/basename
SED?= /usr/bin/sed
@@ -595,7 +595,7 @@
.if !target(do-fetch)
do-fetch:
- @if [ ! -d ${DISTDIR} ]; then ${MKDIR} -p ${DISTDIR}; fi
+ @if [ ! -d ${DISTDIR} ]; then ${MKDIR} ${DISTDIR}; fi
@(cd ${DISTDIR}; \
for file in ${DISTFILES}; do \
if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
@@ -618,7 +618,7 @@
fi \
done)
.if defined(PATCHFILES)
- @if [ ! -d ${DISTDIR} ]; then ${MKDIR} -p ${DISTDIR}; fi
+ @if [ ! -d ${DISTDIR} ]; then ${MKDIR} ${DISTDIR}; fi
@(cd ${DISTDIR}; \
for file in ${PATCHFILES}; do \
if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
@@ -649,7 +649,7 @@
do-extract:
.if !defined(NO_WRKDIR)
@${RM} -rf ${WRKDIR}
- @${MKDIR} -p ${WRKDIR}
+ @${MKDIR} ${WRKDIR}
.endif
@for file in ${EXTRACT_ONLY}; do \
if !(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
@@ -768,7 +768,7 @@
${ECHO_MSG} "===> Building package for ${PKGNAME}"; \
if [ -d ${PACKAGES} ]; then \
if [ ! -d ${PKGREPOSITORY} ]; then \
- if ! ${MKDIR} -p ${PKGREPOSITORY}; then \
+ if ! ${MKDIR} ${PKGREPOSITORY}; then \
${ECHO_MSG} ">> Can't create directory ${PKGREPOSITORY}."; \
exit 1; \
fi; \
@@ -792,7 +792,7 @@
@${MAKE} ${.MAKEFLAGS} delete-package-links
@for cat in ${CATEGORIES}; do \
if [ ! -d ${PACKAGES}/$$cat ]; then \
- if ! ${MKDIR} -p ${PACKAGES}/$$cat; then \
+ if ! ${MKDIR} ${PACKAGES}/$$cat; then \
${ECHO_MSG} ">> Can't create directory ${PACKAGES}/$$cat."; \
exit 1; \
fi; \
@@ -993,7 +993,7 @@
.if !target(fetch-list)
fetch-list:
- @if [ ! -d ${DISTDIR} ]; then ${MKDIR} -p ${DISTDIR}; fi
+ @if [ ! -d ${DISTDIR} ]; then ${MKDIR} ${DISTDIR}; fi
@(cd ${DISTDIR}; \
for file in ${DISTFILES}; do \
if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
@@ -1022,7 +1022,7 @@
.if !target(makesum)
makesum: fetch
- @if [ ! -d ${FILESDIR} ]; then ${MKDIR} -p ${FILESDIR}; fi
+ @if [ ! -d ${FILESDIR} ]; then ${MKDIR} ${FILESDIR}; fi
@if [ -f ${MD5_FILE} ]; then ${RM} -f ${MD5_FILE}; fi
@(cd ${DISTDIR}; \
for file in ${DISTFILES} ${PATCHFILES}; do \
@@ -1307,13 +1307,13 @@
.if !target(fake-pkg)
fake-pkg:
@if [ ! -f ${PKGDIR}/PLIST -o ! -f ${PKGDIR}/COMMENT -o ! -f ${PKGDIR}/DESCR ]; then ${ECHO} "** Missing package files for ${PKGNAME} - installation not recorded."; exit 1; fi
- @if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} -p ${PKG_DBDIR}; fi
+ @if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
.if defined(FORCE_PKG_REGISTER)
@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
.endif
@if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \
- ${MKDIR} -p ${PKG_DBDIR}/${PKGNAME}; \
+ ${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
${CP} ${PKGDIR}/DESCR ${PKG_DBDIR}/${PKGNAME}/+DESC; \
${CP} ${PKGDIR}/COMMENT ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199610270940.BAA26151>