From matuska@mail.ba.zoznam.sk  Mon Jul 19 08:42:24 2004
Return-Path: <matuska@mail.ba.zoznam.sk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BB42516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Jul 2004 08:42:24 +0000 (GMT)
Received: from mail.ba.zoznam.sk (mail.ba.zoznam.sk [217.75.73.35])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 74C2143D5A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Jul 2004 08:42:24 +0000 (GMT)
	(envelope-from matuska@mail.ba.zoznam.sk)
Received: from localhost (localhost.budkova.zoznam.sk [127.0.0.1])
	by mail.ba.zoznam.sk (Postfix) with ESMTP id 8F79A229F7
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Jul 2004 10:42:22 +0200 (CEST)
Received: from mail.ba.zoznam.sk ([127.0.0.1])
 by localhost (mail.example.com [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 32441-01-17 for <FreeBSD-gnats-submit@freebsd.org>;
 Mon, 19 Jul 2004 10:42:21 +0200 (CEST)
Received: by mail.ba.zoznam.sk (Postfix, from userid 1000)
	id 620F6229F5; Mon, 19 Jul 2004 10:42:21 +0200 (CEST)
Message-Id: <20040719084221.620F6229F5@mail.ba.zoznam.sk>
Date: Mon, 19 Jul 2004 10:42:21 +0200 (CEST)
From: Martin Matuska <martin@tradex.sk>
Reply-To: Martin Matuska <martin@tradex.sk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE] archivers/bsdtar to 2004.07.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         69270
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] archivers/bsdtar to 2004.07.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 19 08:50:22 GMT 2004
>Closed-Date:    Mon Jul 19 17:57:06 GMT 2004
>Last-Modified:  Mon Jul 19 17:57:06 GMT 2004
>Originator:     Martin Matuska
>Release:        FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD 5.2.1-RELEASE-p8
>Description:
Update of archivers/bsdtar
Renaming of patch-file, compatibility with both FreeBSD 4 and 5 series up to 5.2.1

Files to remove: files/patch-bsdtar.h
Files to add:    files/diff-bsdtar.h
>How-To-Repeat:
>Fix:
diff -NPbur bsdtar.orig/Makefile bsdtar/Makefile
--- bsdtar.orig/Makefile	Mon Jul 19 10:35:13 2004
+++ bsdtar/Makefile	Mon Jul 19 10:35:21 2004
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/archivers/bsdtar/Makefile,v 1.1 2004/07/18 11:18:21 edwin Exp $
 
 PORTNAME=	bsdtar
-PORTVERSION=	2004.06.07
+PORTVERSION=	2004.07.14
 CATEGORIES=	archivers
 MASTER_SITES=	http://people.freebsd.org/~kientzle/libarchive/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
@@ -34,6 +34,10 @@
 
 .if ${OSVERSION} >= 502111
 IGNORE=		is in the base system
+.endif
+
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES=	${PATCHDIR}/diff-bsdtar.h
 .endif
 
 post-patch:
diff -NPbur bsdtar.orig/distinfo bsdtar/distinfo
--- bsdtar.orig/distinfo	Mon Jul 19 10:35:13 2004
+++ bsdtar/distinfo	Mon Jul 19 10:35:21 2004
@@ -1,2 +1,2 @@
-MD5 (bsdtar-2004-06-07.tgz) = fb2064ac8897d55b5d6cbd2565673db8
-SIZE (bsdtar-2004-06-07.tgz) = 40091
+MD5 (bsdtar-2004-07-14.tgz) = 3be99578825c9a3ba606ad12783785b4
+SIZE (bsdtar-2004-07-14.tgz) = 41039
diff -NPbur bsdtar.orig/files/diff-bsdtar.h bsdtar/files/diff-bsdtar.h
--- bsdtar.orig/files/diff-bsdtar.h	Thu Jan  1 01:00:00 1970
+++ bsdtar/files/diff-bsdtar.h	Mon Jul 19 10:35:21 2004
@@ -0,0 +1,10 @@
+--- bsdtar.h.orig	Sun Jul 18 11:08:41 2004
++++ bsdtar.h	Sun Jul 18 11:09:20 2004
+@@ -107,3 +107,7 @@
+ void	usage(struct bsdtar *);
+ int	yes(const char *fmt, ...);
+ 
++#ifndef id_t
++typedef       __int64_t       __id_t;         /* can hold a gid_t, pid_t, or uid_t */
++typedef        __id_t          id_t;           /* can hold a uid_t or pid_t */
++#endif
diff -NPbur bsdtar.orig/files/patch-bsdtar.h bsdtar/files/patch-bsdtar.h
--- bsdtar.orig/files/patch-bsdtar.h	Mon Jul 19 10:35:13 2004
+++ bsdtar/files/patch-bsdtar.h	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- bsdtar.h.orig	Sun Jul 18 11:08:41 2004
-+++ bsdtar.h	Sun Jul 18 11:09:20 2004
-@@ -107,3 +107,7 @@
- void	usage(struct bsdtar *);
- int	yes(const char *fmt, ...);
- 
-+#ifndef id_t
-+typedef       __int64_t       __id_t;         /* can hold a gid_t, pid_t, or uid_t */
-+typedef        __id_t          id_t;           /* can hold a uid_t or pid_t */
-+#endif
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon Jul 19 17:56:59 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

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