diff options
| -rw-r--r-- | devel/kdevelop/Makefile | 4 | ||||
| -rw-r--r-- | net/kdenetwork2/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/qt23/Makefile | 10 | ||||
| -rw-r--r-- | x11/kdebase2/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs2/Makefile | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 9caea97ef50c..26085e020744 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdevelop PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION?= 1 CATEGORIES?= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/2.2.2/src @@ -62,7 +62,7 @@ pre-configure: .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: diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index 1e2163b2dd07..08e7a8d0e557 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdenetwork PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION?= 1 CATEGORIES?= net news kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -43,7 +43,7 @@ pre-configure: .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 diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index 3f2e378c6d13..bfa9302d1a0a 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -7,7 +7,7 @@ PORTNAME?= qt PORTVERSION?= 2.3.1 -PORTREVISION= 2 +PORTREVISION?= 2 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.chg.ru/pub/X11/qt/source/ @@ -92,7 +92,7 @@ post-patch: .if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK) .if !exists(${WRKDIR}/.${PKGNAME}.objprelink_patched) @echo "Doing special objprelink patching..." - cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/objprelink.patch + cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/objprelink.patch ${TOUCH} ${WRKDIR}/.${PKGNAME}.objprelink_patched .else @echo "Already did the objprelink patching, skipping..." @@ -116,19 +116,19 @@ pre-configure: qt-pre-configure .endif post-configure: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) + @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks) # Add hack to bring in support for GL. The last line is necessary to ensure that # one can rebuild with the same tree and get the same results. do-build: (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .if !defined(WANT_STATIC) - (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) + (cd ${WRKSRC}/src ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) ${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4 ${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \ s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= ${PTHREAD_LIBS} -lGL -lGLU -lXmu@g ; \ s@soname,lib[\\$$]\(TARGET\)\.so\.[\\$$]\(VER_MAJ\)@soname,libqtgl.so.4@g" ${WRKSRC}/src/Makefile - (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) + (cd ${WRKSRC}/src ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) ${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4 ${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4 ${CP} ${WRKSRC}/src/Makefile.orig ${WRKSRC}/src/Makefile diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 3c5876f985f2..51d837f576fe 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 4 +PORTREVISION?= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -76,7 +76,7 @@ pre-configure: .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 diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 1a1de25b5580..0d1a12d5accb 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdelibs PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION?= 3 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -80,7 +80,7 @@ pre-configure: .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 |