Date: Thu, 30 May 2002 13:59:07 +1000 (EST) From: april <april@oublinet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: misc/38724: [patch] various .mk files use deprecated test option Message-ID: <200205300359.g4U3x7Kk000465@oublinet.net>
next in thread | raw e-mail | index | archive | help
>Number: 38724
>Category: misc
>Synopsis: [patch] various .mk files use deprecated test option
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 29 21:10:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: april
>Release: FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD december 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Sun May 5 07:25:00 EST 2002 root@december:/usr/obj/usr/src/sys/DECEMBER i386
>Description:
ports/Mk/bsd.port.mk and src/share/mk/bsd.obj.mk use the deprecated test
option '-h'. there's probably little harm leaving things as they are,
since it's unlikely this will be removed anytime soon, but test(1) does
strongly discourage its use.
>How-To-Repeat:
grep "\-h" /usr/ports/Mk/bsd.port.mk /usr/share/mk/bsd.obj.mk
>Fix:
these diff's use -L instead of -h. (against HEAD, but applies to RELENG_4)
Index: bsd.obj.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.obj.mk,v
retrieving revision 1.43
diff -u -r1.43 bsd.obj.mk
--- bsd.obj.mk 2002/04/24 13:29:34 1.43
+++ bsd.obj.mk 2002/05/30 03:52:52
@@ -112,7 +112,7 @@
.else
@cd ${.CURDIR} && ${MAKE} clean cleandepend
.endif
- @if [ -h ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
+ @if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
.if !target(clean)
clean:
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.411
diff -u -r1.411 bsd.port.mk
--- bsd.port.mk 2002/04/27 11:22:59 1.411
+++ bsd.port.mk 2002/05/30 03:55:55
@@ -2056,7 +2056,7 @@
file=`echo $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
select=`echo $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
- if [ -h $$file -o -h `${BASENAME} $$file` ]; then \
+ if [ -L $$file -o -L `${BASENAME} $$file` ]; then \
${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \
${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \
${ECHO_MSG} ">> Please correct this problem and try again."; \
@@ -2109,7 +2109,7 @@
file=`echo $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
select=`echo $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
- if [ -h $$file -o -h `${BASENAME} $$file` ]; then \
+ if [ -L $$file -o -L `${BASENAME} $$file` ]; then \
${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \
${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \
${ECHO_MSG} ">> Please correct this problem and try again."; \
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205300359.g4U3x7Kk000465>