From root@poudriere.ithil.palantiri.org  Tue Apr 15 23:23:02 2014
Return-Path: <root@poudriere.ithil.palantiri.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 37652ED3;
	Tue, 15 Apr 2014 23:23:02 +0000 (UTC)
Received: from poudriere.ithil.palantiri.org (ithil.palantiri.org [144.76.36.55])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "0254-fbsd-10-amd64", Issuer "0254-fbsd-10-amd64" (not verified))
	by mx1.freebsd.org (Postfix) with ESMTPS id A712A1A04;
	Tue, 15 Apr 2014 23:23:01 +0000 (UTC)
Received: from poudriere.ithil.palantiri.org (localhost [127.0.0.1])
	by poudriere.ithil.palantiri.org (8.14.8/8.14.8) with ESMTP id s3FNMwJu041543
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
	Wed, 16 Apr 2014 01:22:58 +0200 (CEST)
	(envelope-from root@poudriere.ithil.palantiri.org)
Received: (from root@localhost)
	by poudriere.ithil.palantiri.org (8.14.8/8.14.8/Submit) id s3FNMv6r041542;
	Wed, 16 Apr 2014 01:22:57 +0200 (CEST)
	(envelope-from root)
Message-Id: <201404152322.s3FNMv6r041542@poudriere.ithil.palantiri.org>
Date: Wed, 16 Apr 2014 01:22:57 +0200 (CEST)
From: Bartek Rutkowski <ports@robakdesign.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: wxs@FreeBSD.org
Subject: [PATCH] devel/git: fix stage errors
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         188677
>Category:       ports
>Synopsis:       [PATCH] devel/git: fix stage errors
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 15 23:30:00 UTC 2014
>Closed-Date:    Mon Apr 28 01:57:21 UTC 2014
>Last-Modified:  Mon Apr 28 02:00:00 UTC 2014
>Originator:     Bartek Rutkowski
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
Pixeware LTD
>Environment:
System: FreeBSD poudriere.ithil.palantiri.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r264341: Fri Apr 11 15:28:07 CEST
>Description:
- Fix stage errors

http://poudriere.ithil.palantiri.org:8080/latest-per-pkg/git/1.9.0_1/

Port maintainer (wxs@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- git-1.9.0.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 351371)
+++ Makefile	(working copy)
@@ -222,6 +222,9 @@
 	(cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1)
 	(cd ${WRKDIR}/man5/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5)
 	(cd ${WRKDIR}/man7/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man7)
+.if ${PORT_OPTIONS:MPERL}
+	${RM} -f ${STAGEDIR}/usr/local/lib/perl5/site_perl/5.16/mach/auto/Git/.packlist 
+.endif
 .if ${PORT_OPTIONS:MHTMLDOCS}
 	# Manually remove the index.html symlink before installing, and then
 	# recreate it after. This is necessary because the distfile is
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 351371)
+++ pkg-plist	(working copy)
@@ -367,7 +367,6 @@
 libexec/git-core/mergetools/araxis
 %%GUI%%bin/gitk
 %%PERLSUB%%%%SITE_PERL%%/Git.pm
-%%PERLSUB%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist
 %%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/SVN.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/IndexInfo.pm
--- git-1.9.0.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Apr 15 23:30:06 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188677 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Mon Apr 28 01:57:20 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/188677: commit references a PR
Date: Mon, 28 Apr 2014 01:55:46 +0000 (UTC)

 Author: wxs
 Date: Mon Apr 28 01:55:41 2014
 New Revision: 352468
 URL: http://svnweb.freebsd.org/changeset/ports/352468
 QAT: https://qat.redports.org/buildarchive/r352468/
 
 Log:
   Update to 1.9.2.
   Now back to grabbing distfiles from kernel.org mirrors as google code is
   no longer updated.
   Fix an issue with packlist when using PERL. [1]
   
   PR:		[1]: ports/188677
   Submitted by:	Bartek Rutkowski <ports@robakdesign.com>
   		Horia Racoviceanu (private mail)
 
 Modified:
   head/devel/git/Makefile
   head/devel/git/distinfo
   head/devel/git/pkg-plist
 
 Modified: head/devel/git/Makefile
 ==============================================================================
 --- head/devel/git/Makefile	Mon Apr 28 01:05:31 2014	(r352467)
 +++ head/devel/git/Makefile	Mon Apr 28 01:55:41 2014	(r352468)
 @@ -2,10 +2,10 @@
  # $FreeBSD$
  
  PORTNAME=	git
 -PORTVERSION=	1.9.0
 -PORTREVISION=	1
 +PORTVERSION=	1.9.2
  CATEGORIES=	devel
 -MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 +MASTER_SITES=	KERNEL_ORG
 +MASTER_SITE_SUBDIR=	software/scm/git
  DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
  		${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
  # We manually extract the htmldocs.
 @@ -15,8 +15,6 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}
  MAINTAINER=	wxs@FreeBSD.org
  COMMENT?=	Distributed source code management tool
  
 -PROJECTHOST=	git-core
 -
  CONFLICTS?=	git-subversion-[0-9]*
  
  USERS=	git_daemon
 @@ -254,4 +252,9 @@ post-install:
  	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/
  .endif
  
 +post-stage:
 +.if ${PORT_OPTIONS:MPERL}
 +	${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
 +.endif
 +
  .include <bsd.port.mk>
 
 Modified: head/devel/git/distinfo
 ==============================================================================
 --- head/devel/git/distinfo	Mon Apr 28 01:05:31 2014	(r352467)
 +++ head/devel/git/distinfo	Mon Apr 28 01:55:41 2014	(r352468)
 @@ -1,6 +1,6 @@
 -SHA256 (git-1.9.0.tar.gz) = de3097fdc36d624ea6cf4bb853402fde781acdb860f12152c5eb879777389882
 -SIZE (git-1.9.0.tar.gz) = 4839724
 -SHA256 (git-manpages-1.9.0.tar.gz) = a51e2b64a8adde39e774f052843e0f513b5d3318492b515e752e339b0d3a85c7
 -SIZE (git-manpages-1.9.0.tar.gz) = 571616
 -SHA256 (git-htmldocs-1.9.0.tar.gz) = e4e619b7dd5b24ab4ef17e598803497704aa5b0a7821bb544940f2cdd7cac60e
 -SIZE (git-htmldocs-1.9.0.tar.gz) = 2240600
 +SHA256 (git-1.9.2.tar.gz) = d0dceb2e881f6a8f6eada128f782904b8711ea93a4c86dd38da99a7773edc25b
 +SIZE (git-1.9.2.tar.gz) = 4845863
 +SHA256 (git-manpages-1.9.2.tar.gz) = bcf7cb8aa17885f6923c33cf420ecf249e097510079c2996396c6369014c4ca8
 +SIZE (git-manpages-1.9.2.tar.gz) = 571591
 +SHA256 (git-htmldocs-1.9.2.tar.gz) = ad36ec63e9d77310cd341d832eb9238cb47fde7852448b5cf63ab825973aa323
 +SIZE (git-htmldocs-1.9.2.tar.gz) = 2242774
 
 Modified: head/devel/git/pkg-plist
 ==============================================================================
 --- head/devel/git/pkg-plist	Mon Apr 28 01:05:31 2014	(r352467)
 +++ head/devel/git/pkg-plist	Mon Apr 28 01:55:41 2014	(r352468)
 @@ -1173,6 +1173,8 @@ share/git-core/templates/info/exclude
  %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.4.txt
  %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.5.txt
  %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.0.txt
 +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.1.txt
 +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.2.txt
  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
