ports/122410: Port fix: archivers/pbzip2 - Get rid of PORTVERSION + DISTVERSION error and strange PORTVERSION number

[Ganael Laplanche]

>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:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 03 12:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>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 at 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 at 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:
>Unformatted: