From owner-cvs-ports@FreeBSD.ORG Wed Jun 9 04:11:31 2010 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EF68106567B; Wed, 9 Jun 2010 04:11:31 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from exhub015-1.exch015.msoutlookonline.net (exhub015-1.exch015.msoutlookonline.net [207.5.72.93]) by mx1.freebsd.org (Postfix) with ESMTP id 0B91A8FC1C; Wed, 9 Jun 2010 04:11:30 +0000 (UTC) Received: from [192.168.1.2] (71.246.240.70) by smtpx15.msoutlookonline.net (207.5.72.103) with Microsoft SMTP Server (TLS) id 8.2.234.1; Tue, 8 Jun 2010 21:11:30 -0700 Message-ID: <4C0F146C.3060906@p6m7g8.com> Date: Wed, 9 Jun 2010 00:11:24 -0400 From: "Philip M. Gollucci" Organization: P6M7G8 Inc. User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Greg Lewis References: <201006082017.o58KHb1o039986@repoman.freebsd.org> <4C0EB5E8.5040009@p6m7g8.com> <20100609004757.7a61d6f6@it.buh.tecnik93.com> <20100609035149.GA94751@misty.eyesbeyond.com> In-Reply-To: <20100609035149.GA94751@misty.eyesbeyond.com> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig4AD3D89AD0ECCA4E5D9143EE" Cc: Rob Farmer , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, glewis@FreeBSD.org, Ion-Mihai Tetcu Subject: Re: cvs commit: ports/java/jdk16 Makefile X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 04:11:31 -0000 --------------enig4AD3D89AD0ECCA4E5D9143EE Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 6/8/2010 11:51 PM, Greg Lewis wrote: > The build uses the following logic to detect the presence of sigignore:= >=20 > ifeq ($(OS_VENDOR),FreeBSD) > OS_RELDATE :=3D $(shell sysctl kern.osreldate | cut -d' ' -f2) > HAS_SIGIGNORE :=3D $(shell if [ $(OS_RELDATE) -ge 800502 -a $(OS_RELDAT= E) -lt 900000 -o $(OS_RELDATE) -ge 900003 ]; then echo "1"; fi) > ifeq ($(HAS_SIGIGNORE),1) > override HAVE_SIGIGNORE =3D true > endif > endif >=20 Why not do something like what devel/apr1 does: patch the file to be %%OSVERSION%% here, then in post-patch replace that token with the value. OSVERSION is overloaded correctly on pointyhat and tb(hence QAT) whereas sysctl is not. post-patch: ${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \ ${APR_WRKDIR}/build/apr_hints.m4 --=20 ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 VP Apache Infrastructure; Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Sr. System Admin, Ridecharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. --------------enig4AD3D89AD0ECCA4E5D9143EE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iEYEARECAAYFAkwPFG4ACgkQdbiP+9ubjBybhwCfXd7b4JhO2H82oWLjN+COIRp/ ZNsAnjwg22U64SPgL3nna+zFEIHuNiKn =hNe8 -----END PGP SIGNATURE----- --------------enig4AD3D89AD0ECCA4E5D9143EE--