From owner-cvs-all@FreeBSD.ORG  Sat Nov 29 21:27:17 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E7961065677;
	Sat, 29 Nov 2008 21:27:17 +0000 (UTC) (envelope-from bsam@ipt.ru)
Received: from mail.ipt.ru (mail.ipt.ru [194.62.233.102])
	by mx1.freebsd.org (Postfix) with ESMTP id B7F878FC08;
	Sat, 29 Nov 2008 21:27:16 +0000 (UTC) (envelope-from bsam@ipt.ru)
Received: from sp34.ipt.ru ([194.62.233.107] helo=bs1.sp34.ru)
	by mail.ipt.ru with esmtp (Exim 4.62 (FreeBSD))
	(envelope-from <bsam@ipt.ru>)
	id 1L6WoR-0000ns-PM; Sat, 29 Nov 2008 23:53:11 +0300
Received: from bsam by bs1.sp34.ru with local (Exim 4.69 (FreeBSD))
	(envelope-from <bsam@ipt.ru>)
	id 1L6WoR-000CVr-GL; Sat, 29 Nov 2008 23:53:11 +0300
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
References: <20081128172225.137721065719@hub.freebsd.org>
From: Boris Samorodov <bsam@ipt.ru>
Date: Sat, 29 Nov 2008 23:53:11 +0300
In-Reply-To: <20081128172225.137721065719@hub.freebsd.org> (Hajimu UMEMOTO's
	message of "Fri\, 28 Nov 2008 17\:22\:25 +0000 \(UTC\)")
Message-ID: <69742824@bs1.sp34.ru>
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Hajimu UMEMOTO <ume@FreeBSD.org>
Subject: Re: cvs commit: ports/devel/linux-glib2 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** 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: Sat, 29 Nov 2008 21:27:17 -0000

Hajimu UMEMOTO <ume@FreeBSD.org> writes:

> ume         2008-11-28 17:22:13 UTC
>
>   FreeBSD ports repository
>
>   Modified files:
>     devel/linux-glib2    Makefile 
>   Log:
>   Make CONFLICTS work.
>   
>   Revision  Changes    Path
>   1.19      +1 -1      ports/devel/linux-glib2/Makefile
> _______________________________________________
> cvs-all@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/cvs-all
> To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
>
>
> Index: ports/devel/linux-glib2/Makefile
> diff -u ports/devel/linux-glib2/Makefile:1.18 ports/devel/linux-glib2/Makefile:1.19
> --- ports/devel/linux-glib2/Makefile:1.18	Mon Oct 13 11:07:11 2008
> +++ ports/devel/linux-glib2/Makefile	Fri Nov 28 17:22:13 2008
> @@ -14,7 +14,7 @@
>  MAINTAINER=	freebsd-emulation@FreeBSD.org
>  COMMENT=	Version 2.X Linux/i386 binary port of GLib
>  
> -CONFLICTS=	linux_base-fc6 linux_base-f7 linux_base-f8
> +CONFLICTS=	linux_base-fc6-* linux_base-f7-* linux_base-f8-*

Seems that linux_base-fc6* and so on will be better here.

>  USE_LINUX_RPM=	yes
>  LINUX_DIST_VER=	4


WBR
-- 
Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD committer, http://www.FreeBSD.org The Power To Serve