Date: Tue, 19 Feb 2002 09:55:36 +0200 From: Peter Pentchev <roam@ringlet.net> To: Kevin Lo <kevlo@FreeBSD.org> 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> In-Reply-To: <200202190215.g1J2FhH00666@freefall.freebsd.org>; from kevlo@FreeBSD.org on Mon, Feb 18, 2002 at 06:15:43PM -0800 References: <200202190215.g1J2FhH00666@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Mon, Feb 18, 2002 at 06:15:43PM -0800, Kevin Lo wrote:
> kevlo 2002/02/18 18:15:43 PST
>
> Modified files:
> x11-toolkits/qt23 Makefile
> Log:
> Add NO_QT_OBJPRELINK=yes, let -CURRENT installs smoothly.
>
> Approved by: will
Both this and the subsequent OSVERSION >= 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} >= 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
--
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 wouldn't be false.
Index: ports/x11-toolkits/qt23/Makefile
===================================================================
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= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK)
-BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink
-.endif
-
-.if ${OSVERSION} >= 500029
-NO_QT_OBJPRELINK= yes
-.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MESA= yes
@@ -68,6 +61,13 @@
.endif
.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500029
+NO_QT_OBJPRELINK= yes
+.endif
+.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK)
+BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink
+.endif
.if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION)
CFLAGS+= -O0
[-- Attachment #2 --]
-----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020219095536.A13953>