Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Aug 2012 21:12:25 +0000
From:      "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To:        Pietro Cerutti <gahr@freebsd.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r302794 - in head: . Mk www www/tivoka
Message-ID:  <CACM2dAb7MYjrFjp4X0fTfUE_o0=WWvqTMiY0j9G-Fg6Q8qQG=g@mail.gmail.com>
In-Reply-To: <201208201004.q7KA4EOd017503@svn.freebsd.org>
References:  <201208201004.q7KA4EOd017503@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Beer is owed!


On Mon, Aug 20, 2012 at 10:04 AM, Pietro Cerutti <gahr@freebsd.org> wrote:

> Author: gahr
> Date: Mon Aug 20 10:04:13 2012
> New Revision: 302794
> URL: http://svn.freebsd.org/changeset/ports/302794
>
> Log:
>   - Add support for fetching from GitHub in bsd.sites.mk
>   - Document the mechanism in CHANGES
>   - Add www/tivoka (a JSON-RPC client/server library in PHP) which
>     uses the GitHub mechanism
>
>   Approved by:  beat (portmgr) after exp-run
>
> Added:
>   head/www/tivoka/
>   head/www/tivoka/Makefile   (contents, props changed)
>   head/www/tivoka/distinfo   (contents, props changed)
>   head/www/tivoka/pkg-descr   (contents, props changed)
>   head/www/tivoka/pkg-plist   (contents, props changed)
> Modified:
>   head/CHANGES
>   head/Mk/bsd.sites.mk
>   head/www/Makefile
>
> Modified: head/CHANGES
>
> ==============================================================================
> --- head/CHANGES        Mon Aug 20 09:57:33 2012        (r302793)
> +++ head/CHANGES        Mon Aug 20 10:04:13 2012        (r302794)
> @@ -10,6 +10,28 @@ in the release notes and/or placed into
>
>  All ports committers are allowed to commit to this file.
>
> +20120820:
> +AUTHOR: gahr@FreeBSD.org
> +
> +  * GitHub support has been integrated into bsd.sites.mk. In order to
> +    fetch distfiles from GitHub, a port must define USE_GITHUB along
> +    with the following variables:
> +
> +    GH_ACCOUNT  - account name of the GitHub user hosting the project
> +                  default: not set, mandatory
> +
> +    GH_PROJECT  - name of the project on GitHub
> +                  default: ${PORTNAME}
> +
> +    GH_TAGNAME  - name of the tag to download (master, 2.0.1, ...)
> +                  default: ${DISTVERSION}
> +
> +    GH_COMMIT   - first 7 digits of the commit that generated GH_TAGNAME
> +                  (man git-describe(1))
> +                  default: not set, mandatory
> +
> +    The port www/tivoka is an example how to use this mechanism.
> +
>  20120726:
>  AUTHOR: bapt@FreeBSD.org
>
>
> Modified: head/Mk/bsd.sites.mk
>
> ==============================================================================
> --- head/Mk/bsd.sites.mk        Mon Aug 20 09:57:33 2012        (r302793)
> +++ head/Mk/bsd.sites.mk        Mon Aug 20 10:04:13 2012        (r302794)
> @@ -515,6 +515,33 @@ MASTER_SITE_GET_E+= \
>         http://www5.get-e.org/%SUBDIR%/_files/
>  .endif
>
> +.if !defined(IGNORE_MASTER_SITE_GITHUB)
> +#
> +# In order to use GitHub your port must define USE_GITHUB and the
> following
> +# variables:
> +#
> +# GH_ACCOUNT    - account name of the GitHub user hosting the project
> +#                 default: not set, mandatory
> +#
> +# GH_PROJECT    - name of the project on GitHub
> +#                 default: ${PORTNAME}
> +#
> +# GH_TAGNAME    - name of the tag to download (master, 2.0.1, ...)
> +#                 default: ${DISTVERSION}
> +#
> +# GH_COMMIT     - first 7 digits of the commit that generated GH_TAGNAME
> +#                 (man git-describe(1))
> +#                 default: not set, mandatory
> +#
> +.if defined(USE_GITHUB)
> +MASTER_SITE_GITHUB+= https://nodeload.github.com/%SUBDIR%
> +MASTER_SITES+= GH
> +GH_PROJECT?=   ${PORTNAME}
> +GH_TAGNAME?=   ${DISTVERSION}
> +WRKSRC=                ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
> +.endif
> +.endif
> +
>  .if !defined(IGNORE_MASTER_SITE_GNOME)
>  MASTER_SITE_GNOME+= \
>         ftp://ftp.belnet.be/mirror/ftp.gnome.org/%SUBDIR%/ \
> @@ -1461,6 +1488,7 @@ MASTER_SITE_KERNEL_ORG+= \
>  # Macro magic
>
>  MASTER_SITES_ABBREVS=  CPAN:PERL_CPAN \
> +                       GH:GITHUB \
>                         NL:NETLIB \
>                         SF:SOURCEFORGE \
>                         SFJP:SOURCEFORGE_JP \
> @@ -1474,6 +1502,7 @@ MASTER_SITES_SUBDIRS=     \
>                         CSME:myports \
>
> DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
>                         GCC:releases/${DISTNAME} \
> +
> GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tarball/${GH_TAGNAME}?dummy=/ \
>
> GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
>                         GNU:${PORTNAME} \
>                         HORDE:${PORTNAME} \
>
> Modified: head/www/Makefile
>
> ==============================================================================
> --- head/www/Makefile   Mon Aug 20 09:57:33 2012        (r302793)
> +++ head/www/Makefile   Mon Aug 20 10:04:13 2012        (r302794)
> @@ -1832,6 +1832,7 @@
>      SUBDIR += tinymce3
>      SUBDIR += tinyproxy
>      SUBDIR += tinytinyhttpd
> +    SUBDIR += tivoka
>      SUBDIR += tntnet
>      SUBDIR += tokyopromenade
>      SUBDIR += tomcat-native
>
> Added: head/www/tivoka/Makefile
>
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/www/tivoka/Makefile    Mon Aug 20 10:04:13 2012        (r302794)
> @@ -0,0 +1,36 @@
> +# New ports collection Makefile for:    tivoka
> +# Date created:                                16 July 2012
> +# Whom:                                        gahr
> +#
> +# $FreeBSD$
> +#
> +
> +PORTNAME=      tivoka
> +PORTVERSION=   3.0.1
> +CATEGORIES=    www
> +
> +MAINTAINER=    gahr@FreeBSD.org
> +COMMENT=       JSON-RPC client/server library for PHP
> +
> +LICENSE=       MIT
> +
> +USE_PHP=       json filter
> +NO_BUILD=      yes
> +
> +USE_GITHUB=    yes
> +GH_ACCOUNT=    marcelklehr
> +GH_COMMIT=     4cbf436
> +
> +LIBDIR=                ${PREFIX}/lib/php/${PHP_EXT_DIR}/${PORTNAME}
> +PLIST_SUB+=    LIBDIR=${LIBDIR:S/${PREFIX}\///}
> +
> +do-install:
> +       @${MKDIR} ${LIBDIR}
> +       @${INSTALL_DATA} ${WRKSRC}/include.php ${LIBDIR}
> +       @cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${LIBDIR}
> +.if !defined(NOPORTEXAMPLES)
> +       @${MKDIR} ${EXAMPLESDIR}
> +       @cd ${WRKSRC}/example && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
> +.endif
> +
> +.include <bsd.port.mk>
>
> Added: head/www/tivoka/distinfo
>
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/www/tivoka/distinfo    Mon Aug 20 10:04:13 2012        (r302794)
> @@ -0,0 +1,2 @@
> +SHA256 (tivoka-3.0.1.tar.gz) =
> 373b4793932b60973591fc8dc79897fc03610e224e5641bc3f6afd7f2b361982
> +SIZE (tivoka-3.0.1.tar.gz) = 10605
>
> Added: head/www/tivoka/pkg-descr
>
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/www/tivoka/pkg-descr   Mon Aug 20 10:04:13 2012        (r302794)
> @@ -0,0 +1,5 @@
> +tivoka is a JSON-RPC client and server for PHP 5.3+. For convenience,
> +you can easily switch between JSON-RPC 1.0 and JSON-RPC 2.0 without
> +having to change your code.
> +
> +WWW: http://marcelklehr.github.com/tivoka/
>
> Added: head/www/tivoka/pkg-plist
>
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/www/tivoka/pkg-plist   Mon Aug 20 10:04:13 2012        (r302794)
> @@ -0,0 +1,26 @@
> +%%LIBDIR%%/include.php
> +%%LIBDIR%%/lib/Tivoka/Client.php
> +%%LIBDIR%%/lib/Tivoka/Client/BatchRequest.php
> +%%LIBDIR%%/lib/Tivoka/Client/Connection.php
> +%%LIBDIR%%/lib/Tivoka/Client/NativeInterface.php
> +%%LIBDIR%%/lib/Tivoka/Client/Notification.php
> +%%LIBDIR%%/lib/Tivoka/Client/Request.php
> +%%LIBDIR%%/lib/Tivoka/Exception/ConnectionException.php
> +%%LIBDIR%%/lib/Tivoka/Exception/Exception.php
> +%%LIBDIR%%/lib/Tivoka/Exception/InvalidParamsException.php
> +%%LIBDIR%%/lib/Tivoka/Exception/ProcedureException.php
> +%%LIBDIR%%/lib/Tivoka/Exception/RemoteProcedureException.php
> +%%LIBDIR%%/lib/Tivoka/Exception/SpecException.php
> +%%LIBDIR%%/lib/Tivoka/Exception/SyntaxException.php
> +%%LIBDIR%%/lib/Tivoka/Server.php
> +%%LIBDIR%%/lib/Tivoka/Server/MethodWrapper.php
> +%%LIBDIR%%/lib/Tivoka/Server/Server.php
> +%%LIBDIR%%/lib/Tivoka/Tivoka.php
> +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client.php
> +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.php
> +@dirrm %%LIBDIR%%/lib/Tivoka/Server
> +@dirrm %%LIBDIR%%/lib/Tivoka/Exception
> +@dirrm %%LIBDIR%%/lib/Tivoka/Client
> +@dirrm %%LIBDIR%%/lib/Tivoka
> +@dirrm %%LIBDIR%%/lib
> +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>



-- 
---------------------------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
Member,                           Apache Software Foundation
Committer,                        FreeBSD Foundation
Consultant,                       P6M7G8 Inc.
Director Operations,      Ridecharge Inc.

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACM2dAb7MYjrFjp4X0fTfUE_o0=WWvqTMiY0j9G-Fg6Q8qQG=g>