From owner-cvs-all@FreeBSD.ORG Tue Jun 6 05:02:37 2006 Return-Path: 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 CDC7C16B6C7; Tue, 6 Jun 2006 04:27:05 +0000 (UTC) (envelope-from mezz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66F1543D6D; Tue, 6 Jun 2006 04:27:05 +0000 (GMT) (envelope-from mezz@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k564PI3v095509; Tue, 6 Jun 2006 04:25:18 GMT (envelope-from mezz@repoman.freebsd.org) Received: (from mezz@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k564PIWc095508; Tue, 6 Jun 2006 04:25:18 GMT (envelope-from mezz) Message-Id: <200606060425.k564PIWc095508@repoman.freebsd.org> From: Jeremy Messenger Date: Tue, 6 Jun 2006 04:25:18 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/multimedia/gstreamer-plugins80 Makefile.common X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jun 2006 05:02:38 -0000 mezz 2006-06-06 04:25:18 UTC FreeBSD ports repository Modified files: multimedia/gstreamer-plugins80 Makefile.common Log: Fix the CONFLICTS in gstreamer-plugins-jpeg-mmx80 and gstreamer-plugins-jpeg80 to not get in conflict by themselves. Also, use -[0-9]*. Found by portlint. Revision Changes Path 1.34 +2 -2 ports/multimedia/gstreamer-plugins80/Makefile.common