From owner-freebsd-ports@FreeBSD.ORG Thu Sep 29 09:19:00 2011 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4000106564A for ; Thu, 29 Sep 2011 09:19:00 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from mx0.hoeg.nl (mx0.hoeg.nl [IPv6:2a01:4f8:101:5343::aa]) by mx1.freebsd.org (Postfix) with ESMTP id 9A34B8FC0A for ; Thu, 29 Sep 2011 09:19:00 +0000 (UTC) Received: by mx0.hoeg.nl (Postfix, from userid 1000) id F38212A28CE6; Thu, 29 Sep 2011 11:18:59 +0200 (CEST) Date: Thu, 29 Sep 2011 11:18:59 +0200 From: Ed Schouten To: Matthew Seaman Message-ID: <20110929091859.GQ91943@hoeg.nl> References: <20110929084725.GN91943@hoeg.nl> <4E8433F5.30005@infracaninophile.co.uk> <20110929090743.GP91943@hoeg.nl> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9lPOKfY2vCV97ybw" Content-Disposition: inline In-Reply-To: <20110929090743.GP91943@hoeg.nl> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: ports@freebsd.org Subject: Re: Instafix for FreeBSD ports brokenness on 10.0? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Sep 2011 09:19:00 -0000 --9lPOKfY2vCV97ybw Content-Type: multipart/mixed; boundary="/YnR2r17TIEndSCI" Content-Disposition: inline --/YnR2r17TIEndSCI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Ed Schouten , 20110929 11:07: > I meant simply adding this line to bsd.port.mk, to be executed after > pre-configure and before configure. More specifically, see the attached patch. --=20 Ed Schouten WWW: http://80386.nl/ --/YnR2r17TIEndSCI Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="fix-freebsd10.diff" Content-Transfer-Encoding: quoted-printable --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -3667,6 +3667,16 @@ @${DO_NADA} .endif =20 +# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. +run-autotools-fixup: +.if ${OSVERSION} >=3D 1000000 + @find ${WRKSRC} -type f \( -name config.libpath -o \ + -name config.rpath -o -name configure -o -name libtool.m4 \) \ + -exec sed -i '' 's/freebsd1\*)/SHOULDNOTMATCHANYTHING)/' {} + +.else + @${DO_NADA} +.endif + # Configure =20 .if !target(do-configure) @@ -4266,7 +4276,7 @@ _CONFIGURE_DEP=3D patch _CONFIGURE_SEQ=3D build-depends lib-depends configure-message \ configure-autotools pre-configure pre-configure-script \ - run-autotools do-configure post-configure post-configure-script + run-autotools run-autotools-fixup do-configure post-configure post-con= figure-script _BUILD_DEP=3D configure _BUILD_SEQ=3D build-message pre-build pre-build-script do-build \ post-build post-build-script --/YnR2r17TIEndSCI-- --9lPOKfY2vCV97ybw Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iQIcBAEBAgAGBQJOhDgDAAoJEG5e2P40kaK7Qo8P+QHb9jzekqp5f7mWPuFybxzz 3dK75R/pebKQgIW4L1DdbiZOcqIF+RPhSjHW/hVs5zcTLblQjms1IoRXHG8+9VZu UNXgd3j4u0m5EOW2EMFvYYxsCV2G9HE4E/HlHHqAoxO2D5spBOVl+ezXv5oMIKGz ohKL7XZqTEmOJMvscH+KzI7AjOQHeJJ8110ogfTudYQ0i8qEdLe2EF0qg1yw2++k HBYzBq8n8rXd7S1fLbYTqY5jOAN3BS80jUjs31bhvFs5eYbecVkoyhDTDW4ICeUU 0atDoW/AgbT9vlJHtg8aw/0f0vcH0UUd5Kv7pHm9N4X40pleRPALTAZoHRtoOVVc ylKw5V0TlmG4417eNc+l0uF/EESDWp0Wy7BlWbxImxrG+Ov7FxSsBzIfj5VhiK0U t/bW/97tDkTRV2Af5txvUnWBk86T1ODaEGopqvja/JKDqvT3yhszNrCDhVBcDPJ0 2PsoQqy7hCCb+5BtRu6C4wtX0CQpLJiSAfZ1qnCDxI0Q4QBosv6VWNn2EQ9jhcNT n7e3y07XaiFkFf7dl+YoA5uwtyUFbCrMm4Wn6/1t7kTPpjxLauPVY+lWD1Xxg/14 rxUA0Nbx5qif/FIsrY/BY03zbwjJNsQ6jpOvoo4pqeG7FmP9oiz9TwDfIRkzwCYb wP8+CgRN9WFppy53ueVg =RWrg -----END PGP SIGNATURE----- --9lPOKfY2vCV97ybw--