From owner-freebsd-ports@FreeBSD.ORG  Tue Dec  5 16:39:30 2006
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: ports@freebsd.org
Delivered-To: freebsd-ports@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3CE2316A50E
	for <ports@freebsd.org>; Tue,  5 Dec 2006 16:39:30 +0000 (UTC)
	(envelope-from swhetzel@gmail.com)
Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.175])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F48443D9F
	for <ports@freebsd.org>; Tue,  5 Dec 2006 16:38:24 +0000 (GMT)
	(envelope-from swhetzel@gmail.com)
Received: by ug-out-1314.google.com with SMTP id o2so3009538uge
	for <ports@freebsd.org>; Tue, 05 Dec 2006 08:38:43 -0800 (PST)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=HSr9W3X3hPm22zxvBcWHmY9W7YfneV9TFwJyZQzxz2ptITG3BOLrvIZ/YltjbH21lpywCJKTgCi1lNxky7Hw+XwMDJvovculzxP/nXmcWVra4sEmrEDAzDF/N5yDbMuZnwY0lCtFOfv4TRCO/H0xA3/SFoMqIuFtwnOghWPCr9A=
Received: by 10.67.117.18 with SMTP id u18mr13957523ugm.1165336722885;
	Tue, 05 Dec 2006 08:38:42 -0800 (PST)
Received: by 10.67.86.15 with HTTP; Tue, 5 Dec 2006 08:38:42 -0800 (PST)
Message-ID: <790a9fff0612050838s66c655fapfde80d4038f64ca2@mail.gmail.com>
Date: Tue, 5 Dec 2006 10:38:42 -0600
From: "Scot Hetzel" <swhetzel@gmail.com>
To: "Wesley Shields" <wxs@atarininja.org>
In-Reply-To: <20061204232125.GA42307@atarininja.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <17771.24717.95357.989644@jerusalem.litteratus.org>
	<456B70E9.4030408@FreeBSD.org> <20061204213106.GA42084@atarininja.org>
	<45749998.3070308@FreeBSD.org> <20061204232125.GA42307@atarininja.org>
Cc: ports@freebsd.org, Doug Barton <dougb@freebsd.org>
Subject: Re: distfile belongs to?
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Dec 2006 16:39:30 -0000

On 12/4/06, Wesley Shields <wxs@atarininja.org> wrote:
> > After a cursory exam this looks really great! I'd love to see this, or
> > something like it added ASAP. At minimum the bsd.port.mk patch should
> > definitely be added even if it takes a while for the other stuff to
> > percolate.
> >
> > Doug
>
> I'm fairly certain that the bsd.port.mk patch requires the other one
> (pkg_create will fall over when it encounters the @distfile lines).  I'd
> be happy to send-pr it if nobody objects in a day or two.
>
The bsd.port.mk patch could be changed to:

.if (${OSVERSION} > 602100  && ${OSVERSION} < 700000) || ${OSVERSION} > 700027
PKGDISTFILE= "comment distfile"
.else
PKGDISTFILE="distfile"
.endif
:
:
-	${ECHO_CMD} "@distfle $${file}" >> ${TMPPLIST}; \
+	${ECHO_CMD} "@${PKGDISTFILE} $${file}" >> ${TMPPLIST}; \

This would allow the bsd.port.mk patch be added, without having to
update the pkg_install tools on older systems.

Then the ports tools (portupgrade, portmaster, ..) could be changed to
look for either "@distfile" or "@comment distfile" in the +CONTENTS
file.

I also noticed that the patch to the pkg_info man page is using a
lower case f, instead of an upper case F for the option to show the
distfiles of a given package.

Scot
-- 
DISCLAIMER:
No electrons were mamed while sending this message. Only slightly bruised.