diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-04-29 16:31:22 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-04-29 16:31:22 +0000 |
| commit | 53a69962105ef6603c2a69acd09abc8eec705d47 (patch) | |
| tree | 9a5fcc8c17fcbdacf78212fb26ffc12cfb2d997f /x11-toolkits | |
| parent | 8f71c09ea73b27f84fec54623c41a11213cecc78 (diff) | |
| download | ports-53a69962105ef6603c2a69acd09abc8eec705d47.tar.gz ports-53a69962105ef6603c2a69acd09abc8eec705d47.zip | |
Assign PORTREVISION using `?=' instead of `=' so that slave ports can
override it.
PR: ports/34779
Submitted by: SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>
(MAINTAINER of ja-{qt23,kde*2} ports)
Replace `cd dir && cmd' with `cd dir ; cmd' while I'm here.
Notes
Notes:
svn path=/head/; revision=58318
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/qt23/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
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 |