From rea-fbsd@codelabs.ru  Thu Dec 17 09:30:00 2009
Return-Path: <rea-fbsd@codelabs.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24E14106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 Dec 2009 09:30:00 +0000 (UTC)
	(envelope-from rea-fbsd@codelabs.ru)
Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45])
	by mx1.freebsd.org (Postfix) with ESMTP id CE5738FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 Dec 2009 09:29:59 +0000 (UTC)
Received: from void.codelabs.ru (void.codelabs.ru [144.206.177.25])
	by 0.mx.codelabs.ru with esmtps (TLSv1:CAMELLIA256-SHA:256)
	id 1NLCgI-000BWJ-OY for FreeBSD-gnats-submit@freebsd.org; Thu, 17 Dec 2009 12:29:58 +0300
Message-Id: <20091217092958.AE8B8DA81A@void.codelabs.ru>
Date: Thu, 17 Dec 2009 12:29:58 +0300 (MSK)
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Reply-To: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] www/trac-autocomplete: fix Makefile and download URLs
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         141703
>Category:       ports
>Synopsis:       [patch] www/trac-autocomplete: fix Makefile and download URLs
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 17 09:40:00 UTC 2009
>Closed-Date:    Fri Dec 18 00:50:38 UTC 2009
>Last-Modified:  Fri Dec 18 01:00:12 UTC 2009
>Originator:     Eygene Ryabinkin
>Release:        FreeBSD 8.0-RC1 amd64
>Organization:
Code Labs
>Environment:

System: FreeBSD 8.0-RC1 amd64

>Description:

There are a couple of issues with the current port:
 * port prefix must be 'trac-', not just 'trac': this produces port name
'  tracautocomplete' that is silly;
 * distfiles are located only at dist.codelabs.ru, URL at codelabs.ru now
   serves just as a redirector;
 * we should use '${CHMOD}' instead of bare 'chmod'.

>How-To-Repeat:

Look at the port's current Makefile,
  http://www.freebsd.org/cgi/cvsweb.cgi/ports/www/trac-autocomplete/Makefile?rev=1.2;content-type=text%2Fplain

>Fix:

The following two patches fix all issues.  They were tested at
Tinderbox for 7.x, 8.x and 9.x; real-life testing showed no regressions.

--- 0001-fix-Makefile.diff begins here ---
From 610fc76f6572febf2e9e1bf9eaaadbc0455dd120 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Date: Thu, 17 Dec 2009 11:43:31 +0300

* fix port name -- now it should be trac-autocomplete instead of
  tracautocomplete;
* use ${CHMOD} instead of bare 'chmod'.

Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
---
 www/trac-autocomplete/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/trac-autocomplete/Makefile b/www/trac-autocomplete/Makefile
index 28f450e..2a61128 100644
--- a/www/trac-autocomplete/Makefile
+++ b/www/trac-autocomplete/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.4.1
 CATEGORIES=	www python
 MASTER_SITES=	http://codelabs.ru/fbsd/distfiles/ \
 		http://dist.codelabs.ru/fbsd/
-PKGNAMEPREFIX=	trac
+PKGNAMEPREFIX=	trac-
 DISTNAME=	autocompleteusersplugin-r${REL}
 
 MAINTAINER=	rea-fbsd@codelabs.ru
@@ -33,8 +33,8 @@ PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 # Directory permissions are fine (they aren't stored inside ZIP
 # file), but we set them too -- just in case.
 post-extract:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} chmod 644
-	@${FIND} ${WRKSRC} -type d | ${XARGS} chmod 755
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} 644
+	@${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} 755
 
 # Target to generate packaging list
 plist:
-- 
1.6.5.3
--- 0001-fix-Makefile.diff ends here ---

--- 0002-change-distfile-location.diff begins here ---
From 909fe9d4918f35842c916128b14fda25f3a9fa56 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Date: Thu, 17 Dec 2009 11:45:54 +0300
Subject: [PATCH 2/2] git-autocomplete: change distfile location

Distfiles for FreeBSD are now live at http://dist.codelabs.ru/fbsd/,
so, to avoid redirections, I had explicitely changed base URL.

Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
---
 www/trac-autocomplete/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/www/trac-autocomplete/Makefile b/www/trac-autocomplete/Makefile
index 2a61128..b5fa652 100644
--- a/www/trac-autocomplete/Makefile
+++ b/www/trac-autocomplete/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	autocomplete
 PORTVERSION=	0.4.1
 CATEGORIES=	www python
-MASTER_SITES=	http://codelabs.ru/fbsd/distfiles/ \
-		http://dist.codelabs.ru/fbsd/
+MASTER_SITES=	http://dist.codelabs.ru/fbsd/
 PKGNAMEPREFIX=	trac-
 DISTNAME=	autocompleteusersplugin-r${REL}
 
-- 
1.6.5.3
--- 0002-change-distfile-location.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Dec 17 09:40:10 UTC 2009 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141703 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Dec 18 00:50:36 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/141703: commit references a PR
Date: Fri, 18 Dec 2009 00:50:36 +0000 (UTC)

 miwi        2009-12-18 00:50:27 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/trac-autocomplete Makefile 
   Log:
   - Fix PKGNAME
   - Replace chmod to ${CHMOD}
   - Update MASTER_SITES
   
   PR:             141703
   Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru> (maintainer)
   
   Revision  Changes    Path
   1.3       +5 -5      ports/www/trac-autocomplete/Makefile
 _______________________________________________
 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:
