Date: Tue, 27 Nov 2012 13:32:17 -0600 From: Bryan Drewery <bdrewery@freebsd.org> To: gahr@freebsd.org Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r307836 - head/Mk Message-ID: <50B51541.5010804@FreeBSD.org> In-Reply-To: <20121127192701.GA59828@gahrfit.gahr.ch> References: <201211271132.qARBW6VU054528@svn.freebsd.org> <50B51273.7050200@FreeBSD.org> <20121127192701.GA59828@gahrfit.gahr.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig39DDCDD6DF48AE0907D15496 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 11/27/2012 1:27 PM, Pietro Cerutti wrote: > 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 >>> >>> Log: >>> - Add support for cloud.github.com when using USE_GITHUB >>> =20 >>> Feature safe: yes >>> Approved by: bapt (portmgr@) >> >> >> Unless I am using this wrong, it doesn't set proper WRKSRC. >> >> - (~/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_S= ITES >> 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- >=20 > here you miss GH_COMMIT, from bsd.sites.mk: >=20 > # > # GH_COMMIT - first 7 digits of the commit that generated GH_TAGNAM= E > # (man git-describe(1)) > # default: not set, mandatory I should have been more clear. I don't want to use GH_COMMIT. Why else have cloud? It doesn't require the COMMIT. Also, as I showed, the extracted directory did not have a commit in it, it was just PORTNAME-DISTVERSION. I worked around it by defining WRKSRC. >=20 >> $ make PORTSDIR=3D~/freebsd/ports DISTDIR=3D/tmp/distfiles extract >> $ ls work/ >> ./ ../ >> .extract_done.yafc._usr_local yafc-1.2.3/ >=20 > 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 >>> >>> 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/%SUBD= IR% >>> +.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITE= S: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}?du= mmy=3D/ \ >>> + GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \ >>> GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/= } \ >>> GNU:${PORTNAME} \ >>> HORDE:${PORTNAME} \ >>> >> >> >> --=20 >> Regards, >> Bryan Drewery >> bdrewery@freenode/EFNet >> >=20 >=20 >=20 --=20 Regards, Bryan Drewery bdrewery@freenode/EFNet --------------enig39DDCDD6DF48AE0907D15496 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.9 (MingW32) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBAgAGBQJQtRVGAAoJEG54KsA8mwz5bXUQAJ+TzlVtaFzGn6eS8r6FMQmS o2KyEY2uEDAXl89hWf6GgvTA063p4SMqInayvpL3outAH9skuKlKfilmF+Ttv0fG k1/RDpgNkWdKkStMZ5jtmTOkH7wDLAg4ntx3IyvbQjHVVCTYPdJCYa9Xx1t+WGlR AOarZ34EQuQWYD04rGfCSYnGakYM55IdZdfoVJTGNYdKuzA3dxHy51Q7Y0KCIKHz ewOfe/nEUFUTR9yiKxJTAuMrqGeyi5Oa9h0akBmu9jUzjESwznBJq5yT0m63Rc+i 643ZNHiOaonR/6c3vG0tSnjZjLkoLClxQ0tToN240UI5pNj5ow5fqo2x0PWGDSNt DwGAsVB8r0+nLJk0fxGdZ4ruT5/q9+bKsYymXArB3omgJMaYBoAvCEa2iR+1058/ WvMQBYnxfb1IXvybLzE6m7qXKttoODsBE7FYzTdXkdtpN4gIcp9hWIutsF3MLh3z yE7fi2kE5rJTnNjnLqarKd1Zf/4RQhp/NZgLTN6Lk9B4NB/y1WttL/uMY5D1wTsT 21MUun5L2x/VOGZGTtDTQ52pnbOuN+HcX1MRC/AU6nk9jtvafyyZ2lqFq2DvgSm0 btv36papNiOLJhyVjja+8EIQz9IpwuddlC68fYFP/B1yLzWrBZbUm6dbNAo/RWZU xxZeSwDmpF2Nmu2rFT7y =tymX -----END PGP SIGNATURE----- --------------enig39DDCDD6DF48AE0907D15496--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50B51541.5010804>