On 2014/07/10 18:30, David Coppa wrote:
> On Thu, Jul 10, 2014 at 1:06 PM, Robert Peichaer <[email protected]> wrote:
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: [email protected] 2014/07/10 05:06:15
> >
> > Modified files:
> > audio/glyr : Makefile
> > audio/pithos : Makefile
> > databases/py-redis: Makefile
> > devel/boris : Makefile
> > devel/git-cola : Makefile
> > devel/lua-lgi : Makefile
> > devel/lua-penlight: Makefile
> > devel/lualdoc : Makefile
> > devel/ninja : Makefile
> > devel/ocaml-batteries: Makefile
> > devel/ocaml-lwt: Makefile
> > devel/rebar : Makefile distinfo
> > graphics/pqiv : Makefile
> > graphics/py-gd : Makefile
> > lang/clojure : Makefile
> >
> > Log message:
> > Move ports that used filename{url}sufx to fetch DISTFILES from
> > Github to GH_ACCOUNT, GH_PROJECT, GH_TAGNAME, GH_COMMIT.
> >
> > OK sthen@ jasper@ aja@
> >
>
> ninja is broken.
> It requires an additional:
>
> WRKDIST = ${WRKDIR}/${GH_PROJECT}-${V}
>
>
> Ciao,
> David
>
> P.S.: I'm coming back... Sorry for having disappeared!
>
ls: /usr/obj/ports/git-cola-1.9.1/git-cola-v1.9.1: No such file or directory
ls: /usr/obj/ports/lualdoc-1.4.2/ldoc-1.4.2: No such file or directory
ls: /usr/obj/ports/ninja-1.4.0/ninja-v1.4.0: No such file or directory
ls: /usr/obj/ports/ocaml-batteries-2.1.0/batteries-included-v2.1.0: No such
file or directory
ls: /usr/obj/ports/py-gd-0.58/gdmodule-v0.58: No such file or directory
drwxr-xr-x 4 sthen wsrc 512 Jan 17 12:21
/usr/obj/ports/boris-1.0.8/boris-1.0.8
drwxr-xr-x 6 sthen wsrc 512 Mar 25 13:44
/usr/obj/ports/clojure-1.6.0/clojure-clojure-1.6.0/
drwxr-xr-x 7 sthen wsrc 512 Jul 10 17:48 /usr/obj/ports/glyr-1.0.1/glyr-1.0.1
drwxr-xr-x 7 sthen wsrc 512 Sep 12 2013
/usr/obj/ports/lua-lgi-0.7.2/lgi-0.7.2
drwxr-xr-x 6 sthen wsrc 512 Sep 19 2013
/usr/obj/ports/lua-penlight-1.3.1/Penlight-1.3.1
drwxr-xr-x 8 sthen wsrc 512 Oct 22 2013
/usr/obj/ports/ocaml-lwt-2.4.4/lwt-2.4.4
drwxr-xr-x 5 sthen wsrc 512 Dec 5 2013
/usr/obj/ports/pithos-0.3.18/pithos-0.3.18
drwxr-xr-x 3 sthen wsrc 512 Sep 3 2013 /usr/obj/ports/pqiv-2.0/pqiv-2.0
drwxr-xr-x 5 sthen wsrc 512 Jan 23 17:01
/usr/obj/ports/py-redis-2.9.1/redis-py-2.9.1
drwxr-xr-x 8 sthen wsrc 512 May 13 16:01
/usr/obj/ports/rebar-2.3.0/rebar-2.3.0
So it seems all the ones with 'v' in the tag name need to have the
'v' stripped. Thoughts on the diff below? Does anyone know of proper
documentation about github's tar.gz creation?
lualdoc is different, capitalization of the project name was wrong, I've
fixed that.
Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1268
diff -u -p -r1.1268 bsd.port.mk
--- bsd.port.mk 9 Jul 2014 10:28:42 -0000 1.1268
+++ bsd.port.mk 10 Jul 2014 16:56:27 -0000
@@ -786,7 +786,7 @@ GH_ACCOUNT ?=
GH_PROJECT ?=
.if !empty(GH_TAGNAME)
-WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
+WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
.elif !empty(GH_COMMIT)
WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
.else
