From owner-cvs-all@FreeBSD.ORG Thu Jan 20 15:40:43 2005 Return-Path: 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 AD21C16A4CE; Thu, 20 Jan 2005 15:40:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BAC043D4C; Thu, 20 Jan 2005 15:40:43 +0000 (GMT) (envelope-from netchild@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0KFehch069440; Thu, 20 Jan 2005 15:40:43 GMT (envelope-from netchild@repoman.freebsd.org) Received: (from netchild@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0KFehGp069439; Thu, 20 Jan 2005 15:40:43 GMT (envelope-from netchild) Message-Id: <200501201540.j0KFehGp069439@repoman.freebsd.org> From: Alexander Leidinger Date: Thu, 20 Jan 2005 15:40:43 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: ports/emulators/linux_base-8 Makefile ports/x11/linux-XFree86-libs Makefile ports/x11/linux-XFree86-libs/files pkg-install.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 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: Thu, 20 Jan 2005 15:40:43 -0000 netchild 2005-01-20 15:40:43 UTC FreeBSD ports repository Modified files: emulators/linux_base-8 Makefile x11/linux-XFree86-libs Makefile x11/linux-XFree86-libs/files pkg-install.in Log: Minimal changes to let users update the linux base and the linux X11 bits in any order: - add the X11 lib path to ld.so.conf in the linux base port - (re)generate the ld.so.cache file in the linux base port too - don't change the ld.so.conf in the linux X11 port At deinstall time the linux base port may still complain about a changed ld.so.cache file. A clean way to solve this would be to use ("@unexec" and "@exec") in the plist. Since the plist is autogenerated this would need some little magic in the plist generation or we have to switch to a static plist. Delay the decission about how to handle this until we know when/how to update to a more recent linux base port. Revision Changes Path 1.99 +6 -1 ports/emulators/linux_base-8/Makefile 1.16 +1 -1 ports/x11/linux-XFree86-libs/Makefile 1.2 +0 -4 ports/x11/linux-XFree86-libs/files/pkg-install.in