From owner-cvs-all@FreeBSD.ORG  Thu Jun 22 13:55:06 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D53AF16A47C;
	Thu, 22 Jun 2006 13:55:05 +0000 (UTC)
	(envelope-from mnag@FreeBSD.org)
Received: from corp.grupos.com.br (corp.grupos.com.br [200.193.29.43])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 71D2E44664;
	Thu, 22 Jun 2006 13:55:04 +0000 (GMT)
	(envelope-from mnag@FreeBSD.org)
Received: from corp.grupos.com.br (corp.grupos.com.br [192.168.10.2])
	by corp.grupos.com.br (Postfix) with ESMTP id 674CC5C82;
	Thu, 22 Jun 2006 10:55:02 -0300 (BRT)
Received: from [192.168.10.10] (marcus.grupos.com.br [192.168.10.10])
	by corp.grupos.com.br (Postfix) with ESMTP id 7A4095C26;
	Thu, 22 Jun 2006 10:55:01 -0300 (BRT)
Message-ID: <449AA134.5060400@FreeBSD.org>
Date: Thu, 22 Jun 2006 10:55:00 -0300
From: Marcus Alves Grando <mnag@FreeBSD.org>
Organization: FreeBSD.org
User-Agent: Thunderbird 1.5.0.4 (X11/20060605)
MIME-Version: 1.0
To: vd@FreeBSD.org
References: <200606211711.k5LHBGfr014825@repoman.freebsd.org>
	<20060622101749.GA58621@qlovarnika.bg.datamax>
In-Reply-To: <20060622101749.GA58621@qlovarnika.bg.datamax>
X-Enigmail-Version: 0.94.0.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Filtered: By ProxSMTP using Clamav and Bogofilter
Cc: mux@freebsd.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org,
	ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports/net/csup Makefile distinfo
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 13:55:06 -0000

Vasil Dimov wrote:
> On Wed, Jun 21, 2006 at 05:11:16PM +0000, Marcus Alves Grando wrote:
>> mnag        2006-06-21 17:11:16 UTC
>>
>>   FreeBSD ports repository
>>
>>   Modified files:
>>     net/csup             Makefile distinfo 
>>   Log:
>>   - Update to 20060318
>>   - Fix build in tinderbox using ${OSVERSION} instead .if exists()
>>   
>>   Approved by:    mux
>>   
> 
> % portupgrade /var/db/pkg/csup-20060313_1/
> ** Port marked as IGNORE: net/csup:
>         is already in the base system
> % which csup
> /usr/local/bin/csup
> % ls -l /usr/bin/csup
> ls: /usr/bin/csup: No such file or directory
> % sysctl kern.osreldate
> kern.osreldate: 601100
> %
> 

There are two possibilities to fix:

1. Bump __FreeBSD_version in RELENG_6 to reflect csup MFC

or

2. Continue testing exists() and test PACKAGE_BUILDING too

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/csup/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	21 Jun 2006 17:11:16 -0000	1.12
+++ Makefile	22 Jun 2006 13:41:16 -0000
@@ -24,7 +24,7 @@

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} > 700014 || ( ${OSVERSION} >= 601100 && ${OSVERSION} <
700000 )
+.if exists(/usr/bin/csup) && !defined(PACKAGE_BUILDING)
 IGNORE=		is already in the base system
 .endif


I prefer first.

Regards

-- 
Marcus Alves Grando
marcus(at)corp.grupos.com.br  |  Grupos Internet S/A
  mnag(at)FreeBSD.org         |  FreeBSD.org