From owner-svn-ports-all@FreeBSD.ORG Tue Nov 27 19:27:07 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 887355DF; Tue, 27 Nov 2012 19:27:07 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from cpanel09.rubas.ch (cpanel09.rubas.ch [195.182.222.79]) by mx1.freebsd.org (Postfix) with ESMTP id 343198FC18; Tue, 27 Nov 2012 19:27:07 +0000 (UTC) Received: from 98-41.199-178.cust.bluewin.ch ([178.199.41.98]:50818 helo=gahrfit.gahr.ch) by cpanel09.rubas.ch with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80) (envelope-from ) id 1TdQoC-0019ym-En; Tue, 27 Nov 2012 20:27:05 +0100 Date: Tue, 27 Nov 2012 20:27:01 +0100 From: Pietro Cerutti To: Bryan Drewery Subject: Re: svn commit: r307836 - head/Mk Message-ID: <20121127192701.GA59828@gahrfit.gahr.ch> References: <201211271132.qARBW6VU054528@svn.freebsd.org> <50B51273.7050200@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ikeVEW9yuYc//A+q" Content-Disposition: inline In-Reply-To: <50B51273.7050200@FreeBSD.org> X-PGP-Key: 0x9571F78E X-PGP-Fingerprint: 1203 92B5 3919 AF84 9B97 28D6 C0C2 6A98 9571 F78E User-Agent: Mutt/1.5.21 (2010-09-15) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel09.rubas.ch X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - FreeBSD.org Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: gahr@FreeBSD.org List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 19:27:07 -0000 --ikeVEW9yuYc//A+q Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2012-Nov-27, 13:20, Bryan Drewery wrote: > On 11/27/2012 5:32 AM, Pietro Cerutti wrote: > > Author: gahr > > Date: Tue Nov 27 11:32:06 2012 > > New Revision: 307836 > > URL: http://svnweb.freebsd.org/changeset/ports/307836 > >=20 > > Log: > > - Add support for cloud.github.com when using USE_GITHUB > > =20 > > Feature safe: yes > > Approved by: bapt (portmgr@) >=20 >=20 > Unless I am using this wrong, it doesn't set proper WRKSRC. >=20 > - (~/freebsd/ports/ftp/yafc) $ svn diff > -MASTER_SITES=3D http://cloud.github.com/downloads/sebastinas/yafc/ > +MASTER_SITES=3D GHC > +USE_GITHUB=3D yes > +GH_ACCOUNT=3D sebastinas > $ make PORTSDIR=3D~/freebsd/ports DISTDIR=3D/tmp/distfiles -V MASTER_SITES > http://cloud.github.com/downloads/sebastinas/yafc/ > $ make PORTSDIR=3D~/freebsd/ports DISTDIR=3D/tmp/distfiles -V WRKSRC > /usr/home/bryan/freebsd/ports/ftp/yafc/work/sebastinas-yafc- here you miss GH_COMMIT, from bsd.sites.mk: # # GH_COMMIT - first 7 digits of the commit that generated GH_TAGNAME # (man git-describe(1)) # default: not set, mandatory > $ make PORTSDIR=3D~/freebsd/ports DISTDIR=3D/tmp/distfiles extract > $ ls work/ > ./ ../ > .extract_done.yafc._usr_local yafc-1.2.3/ Unfortunately, some come as above, some as you see it here.. I suggest that you set WRKSRC according to your needs.. > >=20 > > Modified: > > head/Mk/bsd.sites.mk > >=20 > > Modified: head/Mk/bsd.sites.mk > > =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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/Mk/bsd.sites.mk Tue Nov 27 11:12:36 2012 (r307835) > > +++ head/Mk/bsd.sites.mk Tue Nov 27 11:32:06 2012 (r307836) > > @@ -517,9 +517,10 @@ MASTER_SITE_GENTOO+=3D \ > > # default: not set, mandatory > > # =20 > > .if defined(USE_GITHUB) > > -MASTER_SITE_GITHUB+=3D https://nodeload.github.com/%SUBDIR% > > -.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} > > -MASTER_SITES+=3D GH > > +MASTER_SITE_GITHUB+=3D https://nodeload.github.com/%SUBDIR% > > +MASTER_SITE_GITHUB_CLOUD+=3D http://cloud.github.com/downloads/%SUBDIR% > > +.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:= MGHC} > > +MASTER_SITES+=3D GH GHC > > .endif > > GH_PROJECT?=3D ${PORTNAME} > > GH_TAGNAME?=3D ${DISTVERSION} > > @@ -1427,6 +1428,7 @@ MASTER_SITE_KERNEL_ORG+=3D \ > > =20 > > MASTER_SITES_ABBREVS=3D CPAN:PERL_CPAN \ > > GH:GITHUB \ > > + GHC:GITHUB_CLOUD \ > > NL:NETLIB \ > > SF:SOURCEFORGE \ > > SFJP:SOURCEFORGE_JP \ > > @@ -1441,6 +1443,7 @@ MASTER_SITES_SUBDIRS=3D \ > > DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \ > > GCC:releases/${DISTNAME} \ > > GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dumm= y=3D/ \ > > + GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \ > > GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ > > GNU:${PORTNAME} \ > > HORDE:${PORTNAME} \ > >=20 >=20 >=20 > --=20 > Regards, > Bryan Drewery > bdrewery@freenode/EFNet >=20 --=20 Pietro Cerutti The FreeBSD Project gahr@FreeBSD.org PGP Public Key: http://gahr.ch/pgp --ikeVEW9yuYc//A+q Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlC1FAQACgkQwMJqmJVx947ETwCfYWqX163axNBKLA0DTef9sY6+ Hz0AoNY3ESNSRgPFq90xbzjxyG5Yl+8D =FXsr -----END PGP SIGNATURE----- --ikeVEW9yuYc//A+q--