Date: Sat, 30 Mar 2002 18:39:04 +0900 From: "Akinori MUSHA" <knu@iDaemons.org> To: kde@FreeBSD.org Cc: "David W. Chapman Jr." <dwcjr@inethouston.net>, ports@freebsd.org Subject: Re: portupgrade Message-ID: <86it7e8kef.wl@archon.local.idaemons.org> In-Reply-To: <20020329040401.GA37277@leviathan.inethouston.net> References: <20020329040401.GA37277@leviathan.inethouston.net>
next in thread | previous in thread | raw e-mail | index | archive | help
At Thu, 28 Mar 2002 22:04:01 -0600,
David W. Chapman Jr. <dwcjr@inethouston.net> wrote:
> On -current I get errors like this while running portupgrade on kde
> ports
>
> auto-bin/aclocal
> cd /usr/ports/x11/kdelibs2/work/kdelibs-2.2.2 && env
> PATH=/usr/ports/x11/kdelibs
> 2/work/kdelibs-2.2.2/auto-bin:$PATH gmake -f Makefile.cvs
> gmake: Makefile.cvs: No such file or directory
> gmake: *** No rule to make target `Makefile.cvs'. Stop.
> *** Error code 2
`cd dir && foo' is not a proper use of `&&' in Makefile. It should be
`cd dir ; foo'.
When make(1) is invoked with -jN, `cd dir' and `foo' may or may not be
run by different shell instances if you use `&&' to connect them. If
you use `;' instead, then it is guaranteed that the whole command line
is passed to shell in one invocation, and if `cd dir' fails, it stops
before invoking `foo' anyway. (make(1) invokes shell in error check
mode; e.g. it sets `set -e' for sh(1))
So, KDE team, please review and apply the following patch if it's
okay. I'll check up other ports.
Regards,
--
/
/__ __ Akinori.org / MUSHA.org
/ ) ) ) ) / FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp
"Somewhere out of a memory.. of lighted streets on quiet nights.."
Index: audio/kdemultimedia2/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/kdemultimedia2/Makefile,v
retrieving revision 1.67
diff -u -r1.67 Makefile
--- audio/kdemultimedia2/Makefile 16 Jan 2002 17:44:46 -0000 1.67
+++ audio/kdemultimedia2/Makefile 30 Mar 2002 08:50:09 -0000
@@ -50,7 +50,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
post-install:
Index: deskutils/kdepim/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/kdepim/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- deskutils/kdepim/Makefile 4 Mar 2002 20:02:36 -0000 1.16
+++ deskutils/kdepim/Makefile 30 Mar 2002 08:50:09 -0000
@@ -47,7 +47,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \
xargs ${PERL} -pi -e \
Index: devel/kdesdk/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/kdesdk/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/kdesdk/Makefile 11 Jan 2002 06:17:02 -0000 1.14
+++ devel/kdesdk/Makefile 30 Mar 2002 08:50:09 -0000
@@ -38,7 +38,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
.include <bsd.port.mk>
Index: devel/kdevelop/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/kdevelop/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- devel/kdevelop/Makefile 15 Mar 2002 19:43:54 -0000 1.41
+++ devel/kdevelop/Makefile 30 Mar 2002 08:50:09 -0000
@@ -56,7 +56,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
pre-build:
Index: games/kdegames2/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/kdegames2/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- games/kdegames2/Makefile 11 Jan 2002 06:17:02 -0000 1.62
+++ games/kdegames2/Makefile 30 Mar 2002 08:50:09 -0000
@@ -32,7 +32,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
.include <bsd.port.mk>
Index: graphics/kdegraphics2/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/kdegraphics2/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- graphics/kdegraphics2/Makefile 11 Jan 2002 06:17:02 -0000 1.59
+++ graphics/kdegraphics2/Makefile 30 Mar 2002 08:50:09 -0000
@@ -59,7 +59,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in
${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in
Index: misc/kde2-i18n/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/kde2-i18n/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- misc/kde2-i18n/Makefile 15 Mar 2002 19:44:11 -0000 1.12
+++ misc/kde2-i18n/Makefile 30 Mar 2002 08:50:09 -0000
@@ -37,7 +37,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/Configure
Index: misc/kdeaddons/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/kdeaddons/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- misc/kdeaddons/Makefile 11 Jan 2002 06:17:02 -0000 1.13
+++ misc/kdeaddons/Makefile 30 Mar 2002 08:50:09 -0000
@@ -39,7 +39,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
"s@sdl-config@${LOCALBASE}/bin/sdl11-config@g"
Index: misc/kdeutils2/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/kdeutils2/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- misc/kdeutils2/Makefile 11 Jan 2002 06:17:03 -0000 1.63
+++ misc/kdeutils2/Makefile 30 Mar 2002 08:50:10 -0000
@@ -34,7 +34,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
.include <bsd.port.mk>
Index: net/kdenetwork2/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/kdenetwork2/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- net/kdenetwork2/Makefile 11 Jan 2002 06:17:03 -0000 1.73
+++ net/kdenetwork2/Makefile 30 Mar 2002 08:50:10 -0000
@@ -37,7 +37,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in
${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
Index: sysutils/kdeadmin/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/kdeadmin/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- sysutils/kdeadmin/Makefile 11 Jan 2002 06:17:03 -0000 1.13
+++ sysutils/kdeadmin/Makefile 30 Mar 2002 08:50:10 -0000
@@ -33,7 +33,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure
find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \
Index: x11-clocks/kdetoys2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-clocks/kdetoys2/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- x11-clocks/kdetoys2/Makefile 11 Jan 2002 06:17:03 -0000 1.32
+++ x11-clocks/kdetoys2/Makefile 30 Mar 2002 08:50:10 -0000
@@ -34,7 +34,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
.include <bsd.port.mk>
Index: x11-wm/kdeartwork/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/kdeartwork/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- x11-wm/kdeartwork/Makefile 11 Jan 2002 06:17:04 -0000 1.9
+++ x11-wm/kdeartwork/Makefile 30 Mar 2002 08:50:10 -0000
@@ -33,7 +33,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
.include <bsd.port.mk>
Index: x11/kdebase2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/kdebase2/Makefile,v
retrieving revision 1.92
diff -u -r1.92 Makefile
--- x11/kdebase2/Makefile 15 Mar 2002 19:44:24 -0000 1.92
+++ x11/kdebase2/Makefile 30 Mar 2002 08:50:10 -0000
@@ -72,7 +72,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
${PERL} -pi -e "s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/libkonq/Makefile.in
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
Index: x11/kdelibs2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/kdelibs2/Makefile,v
retrieving revision 1.97
diff -u -r1.97 Makefile
--- x11/kdelibs2/Makefile 21 Jan 2002 04:26:32 -0000 1.97
+++ x11/kdelibs2/Makefile 30 Mar 2002 08:50:10 -0000
@@ -76,7 +76,7 @@
.for AM in automake aclocal
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
.endfor
- cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+ cd ${WRKSRC} ; env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
${PERL} -pi -e "s@-O2@-O0@g; s@\"-lfam@\"-L${LOCALBASE}/lib -lfam@g" ${WRKSRC}/configure
${PERL} -pi -e "s@kspell api@@g" ${WRKSRC}/doc/Makefile.in
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86it7e8kef.wl>