Date: Thu, 22 Jun 2006 10:55:00 -0300 From: Marcus Alves Grando <mnag@FreeBSD.org> To: vd@FreeBSD.org 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 Message-ID: <449AA134.5060400@FreeBSD.org> In-Reply-To: <20060622101749.GA58621@qlovarnika.bg.datamax> References: <200606211711.k5LHBGfr014825@repoman.freebsd.org> <20060622101749.GA58621@qlovarnika.bg.datamax>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?449AA134.5060400>