From owner-freebsd-ports Wed Mar 5 19:19: 4 2003 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A895937B401 for ; Wed, 5 Mar 2003 19:19:02 -0800 (PST) Received: from wantadilla.lemis.com (wantadilla.lemis.com [192.109.197.80]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2270543F85 for ; Wed, 5 Mar 2003 19:18:59 -0800 (PST) (envelope-from grog@lemis.com) Received: by wantadilla.lemis.com (Postfix, from userid 1004) id 064B251A51; Thu, 6 Mar 2003 13:49:42 +1030 (CST) Date: Thu, 6 Mar 2003 13:49:41 +1030 From: Greg 'groggy' Lehey To: Adam Cc: freebsd-ports@freebsd.org Subject: Re: Openoffice port Makefile is incorrect Message-ID: <20030306031941.GR43987@wantadilla.lemis.com> References: <1046915609.460.26.camel@jake> <20030306021053.GO43987@wantadilla.lemis.com> <1046919704.460.28.camel@jake> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+S4DbcR7QPeSsP0V" Content-Disposition: inline In-Reply-To: <1046919704.460.28.camel@jake> User-Agent: Mutt/1.4i Organization: The FreeBSD Project Phone: +61-8-8388-8286 Fax: +61-8-8388-8725 Mobile: +61-418-838-708 WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 9A1B 8202 BCCE B846 F92F 09AC 22E6 F290 507A 4223 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --+S4DbcR7QPeSsP0V Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wednesday, 5 March 2003 at 22:01:44 -0500, Adam wrote: > On Wed, 2003-03-05 at 21:10, Greg 'groggy' Lehey wrote: >> Do you have conflicts? > 'pkgdb -F' shows no conflicts at all .. I meant cvs update conflicts. They normally show as rows of >>>>>>> and <<<<<<<<. >> What's at lines 410 to 415? > if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) > @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla > .endif > @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla > @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla Ah, look at that missing . before the if. Ade Lovett has since committed a fix. Try re-cvsupping, or just add the . in front of the if. Greg -- See complete headers for address and phone numbers --+S4DbcR7QPeSsP0V Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.0 (FreeBSD) iD8DBQE+Zr5NIubykFB6QiMRAg8KAJwMZ0KVWqS1ANinN3uQaQa1TBxpGQCfQE0o VeBepP58zkK2hbIVmi67sYU= =owJx -----END PGP SIGNATURE----- --+S4DbcR7QPeSsP0V-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message