From owner-cvs-all@FreeBSD.ORG  Wed Dec  3 08:57:38 2003
Return-Path: <owner-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 0E29A16A4CE; Wed,  3 Dec 2003 08:57:38 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 679BC43FBF; Wed,  3 Dec 2003 08:57:37 -0800 (PST)
	(envelope-from trevor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3GvbXJ060723;
	Wed, 3 Dec 2003 08:57:37 -0800 (PST)
	(envelope-from trevor@repoman.freebsd.org)
Received: (from trevor@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB3GvaVr060722;
	Wed, 3 Dec 2003 08:57:36 -0800 (PST)
	(envelope-from trevor)
Message-Id: <200312031657.hB3GvaVr060722@repoman.freebsd.org>
From: Trevor Johnson <trevor@FreeBSD.org>
Date: Wed, 3 Dec 2003 08:57:36 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/x11/linux-XFree86-libs Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 03 Dec 2003 16:57:38 -0000

trevor      2003/12/03 08:57:36 PST

  FreeBSD ports repository

  Modified files:
    x11/linux-XFree86-libs Makefile 
  Log:
  The linux-gtk port sets USE_LINUX_PREFIX which adds a dependency
  on linux_base 7.1, but the latter port has its own XFree86 libraries
  which conflict with the ones from this port.  The rpm2cpio (used
  in pre-install) and rpm (used in do-install) ports conflict with
  each other.  Fix the dependencies by bringing in parts of the
  linux-gtk Makefile so this port can stand on its own, and by using
  the rpm2cpio that accompanies rpm.
  
  While I'm here, be less verbose, reorder some lines to please
  portlint, and slim the pre-install a little.
  
  Approved by:    portmgr (marcus) for 5.2 freeze
  
  Revision  Changes    Path
  1.4       +25 -17    ports/x11/linux-XFree86-libs/Makefile