svn commit: r307836 - head/Mk

[Pietro Cerutti]

On 2012-Nov-27, 13:32, Bryan Drewery wrote:
> 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
> >>>   
> >>>   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=  http://cloud.github.com/downloads/sebastinas/yafc/
> >> +MASTER_SITES=  GHC
> >> +USE_GITHUB=    yes
> >> +GH_ACCOUNT=    sebastinas
> >> $ make PORTSDIR=~/freebsd/ports DISTDIR=/tmp/distfiles -V MASTER_SITES
> >> http://cloud.github.com/downloads/sebastinas/yafc/
> >> $ make PORTSDIR=~/freebsd/ports DISTDIR=/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
> 
> 
> 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.

You've been clear, I was just explaining the sebastinas-yafc-, which is
based on GH_ACCOUNT, GH_PROJECT, and GH_COMMIT.

But you are correct, tarballs on nodeload differ from the ones on cloud
as far as the directory name is concerned.

Maybe we should add a GH_NODELOAD or GH_CLOUD define so the porter knows
where the distfile will be fetched from?

> 
> I worked around it by defining WRKSRC.
> 
> > 
> >> $ make PORTSDIR=~/freebsd/ports DISTDIR=/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..
> > 
> >>>
> >>> Modified:
> >>>   head/Mk/bsd.sites.mk
> >>>
> >>> Modified: head/Mk/bsd.sites.mk
> >>> ==============================================================================
> >>> --- 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+= \
> >>>  #                 default: not set, mandatory
> >>>  #            
> >>>  .if defined(USE_GITHUB)
> >>> -MASTER_SITE_GITHUB+= https://nodeload.github.com/%SUBDIR%
> >>> -.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH}
> >>> -MASTER_SITES+=	GH
> >>> +MASTER_SITE_GITHUB+=		https://nodeload.github.com/%SUBDIR%
> >>> +MASTER_SITE_GITHUB_CLOUD+=	http://cloud.github.com/downloads/%SUBDIR%
> >>> +.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC}
> >>> +MASTER_SITES+=	GH GHC
> >>>  .endif
> >>>  GH_PROJECT?=	${PORTNAME}
> >>>  GH_TAGNAME?=	${DISTVERSION}
> >>> @@ -1427,6 +1428,7 @@ MASTER_SITE_KERNEL_ORG+= \
> >>>  
> >>>  MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN \
> >>>  			GH:GITHUB \
> >>> +			GHC:GITHUB_CLOUD \
> >>>  			NL:NETLIB \
> >>>  			SF:SOURCEFORGE \
> >>>  			SFJP:SOURCEFORGE_JP \
> >>> @@ -1441,6 +1443,7 @@ MASTER_SITES_SUBDIRS=	\
> >>>  			DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
> >>>  			GCC:releases/${DISTNAME} \
> >>>  			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
> >>> +			GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
> >>>  			GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
> >>>  			GNU:${PORTNAME} \
> >>>  			HORDE:${PORTNAME} \
> >>>
> >>
> >>
> >> -- 
> >> Regards,
> >> Bryan Drewery
> >> bdrewery at freenode/EFNet
> >>
> > 
> > 
> > 
> 
> 
> -- 
> Regards,
> Bryan Drewery
> bdrewery at freenode/EFNet
> 



-- 
Pietro Cerutti
The FreeBSD Project
gahr at FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20121127/f8560d72/attachment.sig>