From nobody@FreeBSD.org  Thu Apr  3 12:03:06 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92B19106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  3 Apr 2008 12:03:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F5988FC32
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  3 Apr 2008 12:03:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m33C31Ax081045
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 3 Apr 2008 12:03:01 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m33C30dp081044;
	Thu, 3 Apr 2008 12:03:00 GMT
	(envelope-from nobody)
Message-Id: <200804031203.m33C30dp081044@www.freebsd.org>
Date: Thu, 3 Apr 2008 12:03:00 GMT
From: Ganael Laplanche <ganael.laplanche@martymac.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Port fix: archivers/pbzip2 - Get rid of PORTVERSION + DISTVERSION error and strange PORTVERSION number
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         122410
>Category:       ports
>Synopsis:       Port fix: archivers/pbzip2 - Get rid of PORTVERSION + DISTVERSION error and strange PORTVERSION number
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    infofarmer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 03 12:10:02 UTC 2008
>Closed-Date:    Thu Apr 03 15:09:00 UTC 2008
>Last-Modified:  Thu Apr 03 15:09:00 UTC 2008
>Originator:     Ganael Laplanche
>Release:        7.0-STABLE
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 7.0-STABLE FreeBSD 7.0-STABLE #11: Tue Mar 25 14:32:03 CET 2008 root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL amd64
>Description:
This patch fixes the following :

- get rid of DISTVERSION + PORTVERSION (which portlint complains about)
- remove un-necessary DIST_SUBDIR
- come back to the real version of the distfile (1.0.2) and use PORTEPOCH
- filenames change in distinfo, but hashes remain the same
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aur pbzip2.orig/Makefile pbzip2/Makefile
--- pbzip2.orig/Makefile	2008-04-03 12:07:00.000000000 +0200
+++ pbzip2/Makefile	2008-04-03 13:56:02.000000000 +0200
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	pbzip2
-PORTVERSION=	1.0.2.0.2
-DISTVERSION=	1.0.2
+PORTVERSION=	1.0.2
+PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://compression.ca/pbzip2/ CENKES
-DIST_SUBDIR=	${PKGNAME}
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Parallel BZIP2
diff -aur pbzip2.orig/distinfo pbzip2/distinfo
--- pbzip2.orig/distinfo	2008-04-03 12:07:00.000000000 +0200
+++ pbzip2/distinfo	2008-04-03 13:17:18.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (pbzip2-1.0.2.0.2/pbzip2-1.0.2.tar.gz) = 7c959f0554695bc484865b938e791aaf
-SHA256 (pbzip2-1.0.2.0.2/pbzip2-1.0.2.tar.gz) = 41c654b493bfd045f3a625ca9f3fb66e327ad0a4395e515c2bd6c3070b83c0e4
-SIZE (pbzip2-1.0.2.0.2/pbzip2-1.0.2.tar.gz) = 22777
+MD5 (pbzip2-1.0.2.tar.gz) = 7c959f0554695bc484865b938e791aaf
+SHA256 (pbzip2-1.0.2.tar.gz) = 41c654b493bfd045f3a625ca9f3fb66e327ad0a4395e515c2bd6c3070b83c0e4
+SIZE (pbzip2-1.0.2.tar.gz) = 22777
Only in pbzip2: work


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->infofarmer 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Apr 3 12:10:09 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122410 
State-Changed-From-To: open->closed 
State-Changed-By: sat 
State-Changed-When: Thu Apr 3 15:07:00 UTC 2008 
State-Changed-Why:  
- Study the CVS history of the port 
- Portlint errors are often misleading 
Thanks anyway! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122410 
>Unformatted:
