From owner-freebsd-ports@FreeBSD.ORG Sun Aug 6 20:21:31 2006 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC86216A4DD for ; Sun, 6 Aug 2006 20:21:31 +0000 (UTC) (envelope-from buhnux@gmail.com) Received: from py-out-1112.google.com (py-out-1112.google.com [64.233.166.181]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5C0643D68 for ; Sun, 6 Aug 2006 20:21:26 +0000 (GMT) (envelope-from buhnux@gmail.com) Received: by py-out-1112.google.com with SMTP id c59so840193pyc for ; Sun, 06 Aug 2006 13:21:26 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:references:x-google-sender-auth; b=kQyAQ1toENCteu/7aPjPJqp4j1G9r4qw4Mbg5KQy4BQIUGBoGXzVy7OGk+PCeFUU+fP+HUAm5sgNVoUjGtqki0hHvoFem3HLu+lszikYEvFZlzBqIhED3hUqj6udaxDoTK/z+lw09k2/YNHd+W4g/G6wmJNU36+mKLPw1vPbNQM= Received: by 10.35.94.2 with SMTP id w2mr10454568pyl; Sun, 06 Aug 2006 13:21:25 -0700 (PDT) Received: by 10.35.87.5 with HTTP; Sun, 6 Aug 2006 13:21:25 -0700 (PDT) Message-ID: Date: Sun, 6 Aug 2006 16:21:25 -0400 From: "michael johnson" Sender: buhnux@gmail.com To: "[LoN]Kamikaze" In-Reply-To: <44D64D33.8040002@gmx.de> MIME-Version: 1.0 References: <44D64D33.8040002@gmx.de> X-Google-Sender-Auth: 6a1ad74e188c2c58 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-ports@freebsd.org Subject: Re: conflict check for upcoming merge X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 20:21:31 -0000 On 8/6/06, [LoN]Kamikaze wrote: > > I have written a small script that checks for conflicts that would > occur if /usr/X11R6 and /usr/local were merged. Whoever is interested > should mail me. This is the output on my system. > > ==> Conflict man/man3/Object.3.gz > /usr/X11R6/man/man3/Object.3.gz: x11-toolkits/open-motif > /usr/local/man/man3/Object.3.gz: lang/tcl84 > > ==> Conflict man/whatis > /usr/X11R6/man/whatis: Does not belong to a package. > /usr/local/man/whatis: Does not belong to a package. > > ==> Conflict bin/showfont > /usr/X11R6/bin/showfont: x11/xorg-clients > /usr/local/bin/showfont: graphics/sdl_ttf > > ==> Conflict share/locale/locale.alias > /usr/X11R6/share/locale/locale.alias: multimedia/vlc > /usr/local/share/locale/locale.alias: devel/gettext > > ==> Conflict share/mime/subclasses > /usr/X11R6/share/mime/subclasses: Does not belong to a package. > /usr/local/share/mime/subclasses: Does not belong to a package. > > ==> Conflict share/mime/globs > /usr/X11R6/share/mime/globs: Does not belong to a package. > /usr/local/share/mime/globs: Does not belong to a package. > > ==> Conflict share/mime/magic > /usr/X11R6/share/mime/magic: Does not belong to a package. > /usr/local/share/mime/magic: Does not belong to a package. > > ==> Conflict share/mime/XMLnamespaces > /usr/X11R6/share/mime/XMLnamespaces: Does not belong to a package. > /usr/local/share/mime/XMLnamespaces: Does not belong to a package. > > ==> Conflict share/mime/aliases > /usr/X11R6/share/mime/aliases: Does not belong to a package. > /usr/local/share/mime/aliases: Does not belong to a package. > > ==> Conflict share/mime/mime.cache > /usr/X11R6/share/mime/mime.cache: Does not belong to a package. > /usr/local/share/mime/mime.cache: Does not belong to a package. > > ==> Conflict share/icons/hicolor/index.theme > /usr/X11R6/share/icons/hicolor/index.theme: misc/hicolor-icon-theme > /usr/local/share/icons/hicolor/index.theme: x11/kdelibs3 ==> Conflict share/gnome/applications/mimeinfo.cache > /usr/X11R6/share/gnome/applications/mimeinfo.cache: Does not belong to a > package. > /usr/local/share/gnome/applications/mimeinfo.cache: Does not belong to a > package. > > ==> Conflict share/applications/mimeinfo.cache > /usr/X11R6/share/applications/mimeinfo.cache: Does not belong to a > package. > /usr/local/share/applications/mimeinfo.cache: Does not belong to a > package. > > ==> Conflict info/dir > /usr/X11R6/info/dir: Does not belong to a package. > /usr/local/info/dir: Does not belong to a package. > > > I'm working on a script that moves all the files from /usr/X11R6 to > /usr/local > and only leave a symlink /usr/X11R6 -> /usr/local behind. > Afterwards it is supposed to update /var/db/pkg . Thanks for the work, all the .cache files and info/dir files are safe for the merge since they are auto-generated. The kde/gnome conflicts we're working on resolving. _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" >