From root@dgeo.sysadm.ec-m.fr  Tue Jun 12 21:26:03 2012
Return-Path: <root@dgeo.sysadm.ec-m.fr>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C2581065678
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Jun 2012 21:26:03 +0000 (UTC)
	(envelope-from root@dgeo.sysadm.ec-m.fr)
Received: from melo.ec-m.fr (melo.ec-m.fr [147.94.19.139])
	by mx1.freebsd.org (Postfix) with ESMTP id 55D978FC15
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Jun 2012 21:26:03 +0000 (UTC)
Received: from amavis4.serv.int (amavis4.serv.int [10.3.0.48])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 97B36AC91B;
	Tue, 12 Jun 2012 23:20:23 +0200 (CEST)
Received: from melo.ec-m.fr ([10.3.0.13])
	by amavis4.serv.int (amavis4.serv.int [10.3.0.48]) (amavisd-new, port 10024)
	with LMTP id wndb5ncRUmwl; Tue, 12 Jun 2012 23:20:24 +0200 (CEST)
Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 9F350AC938;
	Tue, 12 Jun 2012 23:20:22 +0200 (CEST)
Received: by dgeo.sysadm.ec-m.fr (Postfix, from userid 0)
	id 802901CD41; Tue, 12 Jun 2012 23:20:22 +0200 (CEST)
Message-Id: <20120612212022.802901CD41@dgeo.sysadm.ec-m.fr>
Date: Tue, 12 Jun 2012 23:20:22 +0200 (CEST)
From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc: hans@nordhaug.priv.no
Subject: [PATCH] www/piwik: update to 1.8.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify: hans@nordhaug.priv.no

>Number:         169012
>Category:       ports
>Synopsis:       [PATCH] www/piwik: update to 1.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 12 21:30:13 UTC 2012
>Closed-Date:    Sun Jun 17 19:43:28 UTC 2012
>Last-Modified:  Sun Jun 17 19:50:20 UTC 2012
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 9.0-STABLE FreeBSD 9.0-STABLE #0: Wed May  9 10:24:08 CEST
>Description:
- Update to 1.8.2
  changelog: http://piwik.org/changelog/

Port maintainer (hans@nordhaug.priv.no) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- piwik-1.8.2.patch begins here ---
diff -ruN --exclude=CVS ../piwik.orig/Makefile ./Makefile
--- ../piwik.orig/Makefile	2012-06-08 21:26:13.000000000 +0200
+++ ./Makefile	2012-06-12 22:54:48.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	piwik
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 CATEGORIES=	www
 MASTER_SITES=	http://builds.piwik.org/
 
@@ -18,11 +18,26 @@
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
-USE_PHP=	dom gd iconv json mysql pdo pdo_mysql session xml zlib
+USE_PHP=	dom gd iconv json session xml zlib
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	PHPPDOMYSQL PHPMYSQLI
+PHPPDOMYSQL_DESC=	Use pdo_mysql php module
+PHPMYSQLI_DESC=	Use mysqli php module
+
+OPTIONS_DEFAULT=	PHPPDOMYSQL
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPHPMYSQLI}
+USE_PHP+=	mysqli
+.endif
+.if ${PORT_OPTIONS:MPHPPDOMYSQL}
+USE_PHP+=	pdo_mysql
+.endif
+
 post-patch:
-	@cd $(WRKSRC)/misc/log-analytics && $(RM) -rf import_logs.py.orig
+	@cd ${WRKSRC}/misc/log-analytics && ${RM} -rf import_logs.py.orig
 
 pre-install:
 	@if [ ! -f ${LOCALBASE}/bin/php ]; then \
diff -ruN --exclude=CVS ../piwik.orig/distinfo ./distinfo
--- ../piwik.orig/distinfo	2012-06-08 21:26:13.000000000 +0200
+++ ./distinfo	2012-06-12 22:37:58.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (piwik-1.8.1.tar.gz) = 2df256aef16354ca6f726e3043fb9f0ca3a0142ac8f0e8b7fa7a811a65e41455
-SIZE (piwik-1.8.1.tar.gz) = 4753567
+SHA256 (piwik-1.8.2.tar.gz) = 613337ec2558f2b056fd75e8062edcc3b3743581919cd4539210592f3d727152
+SIZE (piwik-1.8.2.tar.gz) = 4753349
--- piwik-1.8.2.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jun 12 22:29:59 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169012 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: hans@nordhaug.priv.no
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/169012: [PATCH] www/piwik: update to 1.8.2
Date: Tue, 12 Jun 2012 22:29:57 UT

 Maintainer of www/piwik,
 
 Please note that PR ports/169012 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169012
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Tue Jun 12 23:29:26 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169012 

From: "Hans Fr. Nordhaug" <hans@nordhaug.priv.no>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169012: [PATCH] www/piwik: update to 1.8.2
Date: Thu, 14 Jun 2012 10:58:44 +0200

 I approve the patch. Thx to the commiter for adding 
 DB backend options to the Makefile. 
 
 Regards,
 Hans
 
 PS! When running "port test", it complained that 
 distinfo was missing a line break. It might be 
 my mistake when applying the patch - not sure.
State-Changed-From-To: feedback->closed 
State-Changed-By: sylvio 
State-Changed-When: Sun Jun 17 19:43:27 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169012 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169012: commit references a PR
Date: Sun, 17 Jun 2012 19:43:26 +0000 (UTC)

 sylvio      2012-06-17 19:43:12 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/piwik            Makefile distinfo 
   Log:
   - Update to 1.8.2
   
   PR:             ports/169012
   Submitted by:   Geoffroy Desvernay <dgeo@centrale-marseille.fr>
   Approved by:    hans@nordhaug.priv.no (maintainer)
   
   Revision  Changes    Path
   1.40      +18 -3     ports/www/piwik/Makefile
   1.35      +2 -2      ports/www/piwik/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
