From owner-cvs-all Mon Feb 18 23:55:31 2002 Delivered-To: cvs-all@freebsd.org Received: from straylight.ringlet.net (discworld.nanolink.com [217.75.135.248]) by hub.freebsd.org (Postfix) with SMTP id BCCF637B400 for ; Mon, 18 Feb 2002 23:55:08 -0800 (PST) Received: (qmail 14766 invoked by uid 1000); 19 Feb 2002 07:55:36 -0000 Date: Tue, 19 Feb 2002 09:55:36 +0200 From: Peter Pentchev To: Kevin Lo Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: ports/x11-toolkits/qt23 Makefile Message-ID: <20020219095536.A13953@straylight.oblivion.bg> Mail-Followup-To: Kevin Lo , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200202190215.g1J2FhH00666@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="W/nzBZO5zC0uMSeA" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200202190215.g1J2FhH00666@freefall.freebsd.org>; from kevlo@FreeBSD.org on Mon, Feb 18, 2002 at 06:15:43PM -0800 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 18, 2002 at 06:15:43PM -0800, Kevin Lo wrote: > kevlo 2002/02/18 18:15:43 PST >=20 > Modified files: > x11-toolkits/qt23 Makefile=20 > Log: > Add NO_QT_OBJPRELINK=3Dyes, let -CURRENT installs smoothly. > =20 > Approved by: will Both this and the subsequent OSVERSION >=3D 500029 fix seem to use OSVERSION before it is defined, on both my 4.5-STABLE and 5.0-CURRENT boxes: [roam@straylight:v2 ~/fbsd/r/ports/x11-toolkits/qt23]$ make -V PKGNAME "Makefile", line 26: Malformed conditional (${OSVERSION} >=3D 500029) "Makefile", line 26: Need an operator "Makefile", line 28: if-less endif "Makefile", line 28: Need an operator make: fatal errors encountered -- cannot continue [roam@straylight:v2 ~/fbsd/r/ports/x11-toolkits/qt23]$ The attached patch fixes this, at least for me. I am not quite sure if introducing additional build dependencies after including bsd.port.pre.mk is quite correct, but it seems to work :) G'luck, Peter --=20 Peter Pentchev roam@ringlet.net roam@FreeBSD.org PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 If the meanings of 'true' and 'false' were switched, then this sentence wou= ldn't be false. Index: ports/x11-toolkits/qt23/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/x11-toolkits/qt23/Makefile,v retrieving revision 1.98 diff -u -r1.98 Makefile --- ports/x11-toolkits/qt23/Makefile 19 Feb 2002 03:27:50 -0000 1.98 +++ ports/x11-toolkits/qt23/Makefile 19 Feb 2002 07:51:57 -0000 @@ -19,13 +19,6 @@ LIB_DEPENDS=3D mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -.if ${MACHINE_ARCH} =3D=3D "i386" && !defined(NO_QT_OBJPRELINK) -BUILD_DEPENDS=3D objprelink:${PORTSDIR}/devel/objprelink -.endif - -.if ${OSVERSION} >=3D 500029 -NO_QT_OBJPRELINK=3D yes -.endif =20 WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_MESA=3D yes @@ -68,6 +61,13 @@ .endif =20 .include + +.if ${OSVERSION} >=3D 500029 +NO_QT_OBJPRELINK=3D yes +.endif +.if ${MACHINE_ARCH} =3D=3D "i386" && !defined(NO_QT_OBJPRELINK) +BUILD_DEPENDS=3D objprelink:${PORTSDIR}/devel/objprelink +.endif =20 .if ${MACHINE_ARCH} =3D=3D "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION) CFLAGS+=3D -O0 --W/nzBZO5zC0uMSeA Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iEYEARECAAYFAjxyBPgACgkQ7Ri2jRYZRVMAVQCaA8vEI2qaVNhV0Rm8sovB7cO5 ktIAoJz8rAA5X2m4U5T/x/YauY/n9fwE =kIdR -----END PGP SIGNATURE----- --W/nzBZO5zC0uMSeA-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message