Date: Tue, 13 Feb 1996 03:50:33 -0800 From: "Jordan K. Hubbard" <jkh@time.cdrom.com> To: asami@cs.berkeley.edu (Satoshi Asami) Cc: ports@freebsd.org Subject: Re: A tiny tale, told too often. Message-ID: <15521.824212233@time.cdrom.com> In-Reply-To: Your message of "Tue, 13 Feb 1996 03:16:03 PST." <199602131116.DAA02928@silvia.HIP.Berkeley.EDU>
next in thread | previous in thread | raw e-mail | index | archive | help
> I don't know, you didn't tell me where the "obvious place" is. :>
Don't worry, you found the two spots exactly - told you they were obvious! :-)
> Anyway, the following seems to work for me....
ARGH! Why the %#W$^@%!! doesn't this work for me?!
My version was a little different:
--- /usr/src/share/mk/bsd.port.mk Fri Oct 6 00:20:35 1995
+++ /usr/share/mk/bsd.port.mk Tue Feb 13 03:45:15 1996
@@ -472,6 +472,11 @@
@(cd ${DISTDIR}; \
for file in ${DISTFILES}; do \
if [ ! -f $$file -a ! -f `/usr/bin/basename $$file` ]; then \
+ if [ -h $$file -o -h `/usr/bin/basename $$file` ]; then \
+ ${ECHO_MSG} ">> $$file is a broken symlink in ${DISTDIR}"; \
+ ${ECHO_MSG} ">> Perhaps a filesystem (your CD?) isn't mounted."; \
+ exit 1; \
+ fi ; \
${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
for site in ${MASTER_SITES}; do \
${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
@@ -490,6 +495,11 @@
@(cd ${PATCHDIST}; \
for file in ${PATCHFILES}; do \
if [ ! -f $$file -a ! -f `/usr/bin/basename $$file` ]; then \
+ if [ -h $$file -o -h `/usr/bin/basename $$file` ]; then \
+ ${ECHO_MSG} ">> $$file is a broken symlink in ${PATCHDIST}"; \
+ ${ECHO_MSG} ">> Perhaps a filesystem (your CD?) isn't mounted."; \
+ exit 1; \
+ fi ; \
${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
for site in ${PATCH_SITES}; do \
${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
But either way fails to work for me, as does your patch! Here's the
symptoms, using your version (just so we're comparing apples and apples):
root@time-> show 251 | patch -d /usr/share/mk
Hmm... Looks like a unified diff to me...
Patching file bsd.port.mk using Plan A...
Hunk #1 succeeded at 472 (offset -16 lines).
Hunk #2 succeeded at 496 (offset -16 lines).
done
root@time-> pwd
/usr/ports/lang/tcl
root@time-> make
>> tcl7.3.tar.Z doesn't seem to exist on this system.
>> Attempting to fetch from ftp://ftp.smli.com/pub/tcl/.
^C
root@time-> ls -l /usr/ports/distfiles/tcl7.3.tar.Z
lrwxrwxr-x 1 root wheel 35 Feb 10 19:54 /usr/ports/distfiles/tcl7.3.tar.Z -> /cdrom/ports/distfiles/tcl7.3.tar.Z
?!?!?!?!! Waaaah!!!
Jordan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?15521.824212233>