Re: updating xorg-libraries 7.2 to 7.2.1
Stephen Montgomery-Smith wrote: I think that the easiest way (i.e. least disruption) is to add to each of the X11R6 scripts a test at their beginning to see if X11R6 is a symlink to /usr/local, and have the scripts do nothing if this is the case. Umm, no. The easiest way to fix this is in rc.subr, to prevent it from running scripts with the same name more than once. A fix for that problem is currently under discussion. Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Stephen Montgomery-Smith wrote: Also, the last change you propose vis a vis man pages, is that actually necessary - I would have thought that the overhead in searching both local and X11R6 would be fairly negligable. Hence my description of it as trivial. Cheers, Matthew - -- Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate Kent, CT11 9PW -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.3 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGWoZA8Mjk52CukIwRCKTxAKCQrZpUXVl7AjdfBhvypccSJ3/SwACaAziQ ChOdO/g+rpwqUDHTluC5Qgw= =0UsD -END PGP SIGNATURE- ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
updating xorg-libraries 7.2 to 7.2.1
I just updated my system from xorg-libraries 7.2 to 7.2.1 [EMAIL PROTECTED]:xorg-libraries$ portversion -v|grep xorg-libraries-7.2needs updating (port has 7.2_1) and had a little trouble with portupgrade === Cleaning for xorg-libraries-7.2_1 Read /usr/ports/UPDATING for the procedure to upgrade or install xorg 7.2. *** Error code 1 until I used export XORG_UPGRADE=yes from /usr/ports/UPDATING. Do I have to do this everytime I run portupgrade? UPDATING says: It is necessary to set the XORG_UPGRADE environment variable while updating from xorg 6.9 to 7.2. Once the upgrade is complete this is no longer be required. xorg 7.2 was installed on this system from scratch, ie no ports to start with. uname -a FreeBSD sagan.cai 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri May 25 20:45:33 CST 2007 [EMAIL PROTECTED]:/usr/obj/usr/src/sys/SAGAN i386 thanks shaun -- Shaun Branden: Alchemist and Bit Bender PGP and contact details in the headers. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
Shaun Branden wrote: I just updated my system from xorg-libraries 7.2 to 7.2.1 [EMAIL PROTECTED]:xorg-libraries$ portversion -v|grep xorg-libraries-7.2needs updating (port has 7.2_1) and had a little trouble with portupgrade === Cleaning for xorg-libraries-7.2_1 Read /usr/ports/UPDATING for the procedure to upgrade or install xorg 7.2. *** Error code 1 until I used export XORG_UPGRADE=yes from /usr/ports/UPDATING. Do I have to do this everytime I run portupgrade? UPDATING says: It is necessary to set the XORG_UPGRADE environment variable while updating from xorg 6.9 to 7.2. Once the upgrade is complete this is no longer be required. xorg 7.2 was installed on this system from scratch, ie no ports to start with. uname -a FreeBSD sagan.cai 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri May 25 20:45:33 CST 2007 [EMAIL PROTECTED]:/usr/obj/usr/src/sys/SAGAN i386 thanks shaun -- Shaun Branden: Alchemist and Bit Bender PGP and contact details in the headers. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED] For right now if you want portupgrade to do anything with xorg you need to export XORG_UPGRADE -- Thanks, Josh Paetzel ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
On Sun, May 27, 2007 at 03:01:18PM +0100, Matthew Seaman wrote: Josh Paetzel wrote: Shaun Branden wrote: xorg 7.2 was installed on this system from scratch, ie no ports to start with. For right now if you want portupgrade to do anything with xorg you need to export XORG_UPGRADE Creating the /usr/X11R6 - /usr/local symlink is necessary, even on a system with xorg 7.2 installed from scratch. The presence of that symlink will stop the xorg-libraries port whinging at you. There are a couple of other bits that need twiddling in the default system, and a very handy way of getting them all to happen is by running mergebase.sh. On a completely virgin newly instaleld system, with /usr/ports populated, but no ports yet installed you may need to: mkdir /usr/X11R6 to give that script something to chew on, and then just: sh /usr/ports/Tools/scripts/mergebase.sh before proceeding to install whatever ports you want. Yeah, I have already run that script but no symlink is created: [EMAIL PROTECTED]:ports$ ls -l /usr/ total 108 drwxrwxr-x 2 root operator 512 May 9 16:17 .snap drwxr-xr-x 11 root wheel 512 May 20 19:03 X11R6 drwxr-xr-x 2 root wheel 7168 May 25 20:55 bin drwxr-xr-x 3 root wheel 512 Apr 29 2006 compat drwxr-xr-x 2 root wheel 512 May 25 20:53 games drwxr-xr-x 13 root wheel 512 May 11 17:52 home drwxr-xr-x 47 root wheel 4608 May 25 20:53 include drwxr-xr-x 4 root wheel 9728 May 25 20:55 lib drwxr-xr-x 5 root wheel 512 Apr 29 2006 libdata drwxr-xr-x 5 root wheel 1536 May 25 20:55 libexec drwxr-xr-x 26 root wheel 512 May 26 19:14 local drwxr-xr-x 3 root wheel 512 May 25 19:53 obj drwxr-xr-x 70 root wheel 1536 May 27 23:36 ports drwxr-xr-x 2 root wheel 5120 May 25 20:55 sbin drwxr-xr-x 27 root wheel 512 Apr 29 2006 share drwxr-xr-x 21 root wheel 512 May 19 18:53 src [EMAIL PROTECTED]:ports$ sh /usr/ports/Tools/scripts/mergebase.sh This script will attempt to backup /usr/X11R6 into /usr/tmp/mergebase/oldx11base.20070527.233644.tar and then move the contents onto /usr/local. It will then replace /usr/X11R6 with a symbolic link, pointing to /usr/local. After that, the script will attempt to change some settings in /etc that by default point to both /usr/X11R6 and /usr/local to remove references to /usr/X11R6; specifically, the files that could get altered are /etc/periodic.conf /etc/manpath.config /etc/rc.conf. Be advised that this script expects default environment, notably it assumes that you have not changed $X11BASE and $LOCALBASE variables from their default values and that /usr/X11R6 is regular directory and not separate mount. If these assumptions are not correct, either edit this script to change $X11BASE $LOCALBASE and/or $BACKUPDIR values or do the merge by hand (perhaps using this script as a rough guide). Enter 'yes' to continue, anything else will exit script: yes CONFLICTING FILES: ./etc/gconf/gconf.xml.defaults/%gconf-tree-af.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ar.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-az.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-be.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-bg.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-bn.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-bn_IN.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-br.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-bs.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ca.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-cs.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-cy.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-da.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-de.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-dz.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-el.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-en_CA.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-eo.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-es.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-et.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-eu.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-fa.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-fi.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-fr.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ga.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-gl.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-gu.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-he.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-hi.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-hr.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-hu.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-hy.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-id.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-is.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-it.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ja.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ka.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-km.xml
Re: updating xorg-libraries 7.2 to 7.2.1
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Josh Paetzel wrote: Shaun Branden wrote: xorg 7.2 was installed on this system from scratch, ie no ports to start with. For right now if you want portupgrade to do anything with xorg you need to export XORG_UPGRADE Creating the /usr/X11R6 - /usr/local symlink is necessary, even on a system with xorg 7.2 installed from scratch. The presence of that symlink will stop the xorg-libraries port whinging at you. There are a couple of other bits that need twiddling in the default system, and a very handy way of getting them all to happen is by running mergebase.sh. On a completely virgin newly instaleld system, with /usr/ports populated, but no ports yet installed you may need to: mkdir /usr/X11R6 to give that script something to chew on, and then just: sh /usr/ports/Tools/scripts/mergebase.sh before proceeding to install whatever ports you want. Cheers, Matthew - -- Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate Kent, CT11 9PW -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.3 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGWY8u8Mjk52CukIwRCJ4XAJ9gRk7IA2tm7XrE6cIIZvP+2QkolACfWhlB oRdigwLSCQq8TuPZISgOfJw= =OBLn -END PGP SIGNATURE- ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
xorg 7.2 was installed on this system from scratch, ie no ports to start with. Creating the /usr/X11R6 - /usr/local symlink is necessary, even on a system with xorg 7.2 installed from scratch. The presence of that symlink will stop the xorg-libraries port whinging at you. I did a clean (re)install of current and upgraded to gcc 4.2 and then installed xorg 7.1 and kdebase afterwards. I did not encounter any problems running X, I haven't symlinked /usr/X11R6 to /usr/local. I havent's ssh into the machine from outside though but X appears to work locally. -- regards Claus When lenity and cruelty play for a kingdom, the gentlest gamester is the soonest winner. Shakespeare ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
Matthew Seaman wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Josh Paetzel wrote: Shaun Branden wrote: xorg 7.2 was installed on this system from scratch, ie no ports to start with. For right now if you want portupgrade to do anything with xorg you need to export XORG_UPGRADE Creating the /usr/X11R6 - /usr/local symlink is necessary, even on a system with xorg 7.2 installed from scratch. The presence of that symlink will stop the xorg-libraries port whinging at you. There are a couple of other bits that need twiddling in the default system, and a very handy way of getting them all to happen is by running mergebase.sh. On a completely virgin newly instaleld system, with /usr/ports populated, but no ports yet installed you may need to: mkdir /usr/X11R6 to give that script something to chew on, and then just: sh /usr/ports/Tools/scripts/mergebase.sh before proceeding to install whatever ports you want. Cheers, Matthew My experience is that simply having the symlink /usr/X11R6-/usr/local is totally sufficient. However it seems to me that what the port building procedure should now do is the following: * if /usr/X11R6 exists as a directory, it should issue an error message like it does now. * if /usr/X11R6 doesn't yet exist, silently create the symlink. This will mirror how it used to behave, in that if /usr/local or /usr/X11R6 did not exist, they would be created as needed. Stephen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Stephen Montgomery-Smith wrote: Matthew Seaman wrote: Josh Paetzel wrote: Shaun Branden wrote: xorg 7.2 was installed on this system from scratch, ie no ports to start with. sh /usr/ports/Tools/scripts/mergebase.sh before proceeding to install whatever ports you want. My experience is that simply having the symlink /usr/X11R6-/usr/local is totally sufficient. However it seems to me that what the port building procedure should now do is the following: * if /usr/X11R6 exists as a directory, it should issue an error message like it does now. * if /usr/X11R6 doesn't yet exist, silently create the symlink. This will mirror how it used to behave, in that if /usr/local or /usr/X11R6 did not exist, they would be created as needed. Oh, agreed to that. However, there are still more changes needed beyond that: Stopping the system running periodic jobs from /usr/X11R6/etc/periodic Stopping the system running startup scripts from /usr/X11R6/etc/rc.d Stopping the system searching for manpages from /usr/X11R6/man The last is fairly trivial, but realise that the first two mean that with the /usr/X11R6 - /usr/local link in place all /usr/local/etc/periodic jobs would get run twice, and even more importantly all /usr/local/etc/rc.d/ startup scripts would also run twice. Until there are new system releases incorporating the necessary changes in /etc/defaults/rc.conf and /etc/defaults/periodic.conf it will be necessary to override some of the default settings. In /etc/rc.conf: local_startup=/usr/local/etc/rc.d In /etc/periodic.conf: local_periodic=/usr/local/etc/periodic and for completeness sake, comment out the 'X11R6' lines in /etc/manpath.conf Cheers, Matthew - -- Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate Kent, CT11 9PW -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.3 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGWbri8Mjk52CukIwRCI9IAJ9ENBHBtRtxaiheAjAOyfo2PBadKACfQhn7 GcCE3wr0BoZEX9a6NgeTEHk= =ZTdB -END PGP SIGNATURE- ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
On Sun, 27 May 2007, Matthew Seaman wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Stephen Montgomery-Smith wrote: Matthew Seaman wrote: Josh Paetzel wrote: Shaun Branden wrote: xorg 7.2 was installed on this system from scratch, ie no ports to start with. sh /usr/ports/Tools/scripts/mergebase.sh before proceeding to install whatever ports you want. My experience is that simply having the symlink /usr/X11R6-/usr/local is totally sufficient. However it seems to me that what the port building procedure should now do is the following: * if /usr/X11R6 exists as a directory, it should issue an error message like it does now. * if /usr/X11R6 doesn't yet exist, silently create the symlink. This will mirror how it used to behave, in that if /usr/local or /usr/X11R6 did not exist, they would be created as needed. Oh, agreed to that. However, there are still more changes needed beyond that: Stopping the system running periodic jobs from /usr/X11R6/etc/periodic Stopping the system running startup scripts from /usr/X11R6/etc/rc.d Stopping the system searching for manpages from /usr/X11R6/man The last is fairly trivial, but realise that the first two mean that with the /usr/X11R6 - /usr/local link in place all /usr/local/etc/periodic jobs would get run twice, and even more importantly all /usr/local/etc/rc.d/ startup scripts would also run twice. Until there are new system releases incorporating the necessary changes in /etc/defaults/rc.conf and /etc/defaults/periodic.conf it will be necessary to override some of the default settings. In /etc/rc.conf: local_startup=/usr/local/etc/rc.d In /etc/periodic.conf: local_periodic=/usr/local/etc/periodic and for completeness sake, comment out the 'X11R6' lines in /etc/manpath.conf I think that the easiest way (i.e. least disruption) is to add to each of the X11R6 scripts a test at their beginning to see if X11R6 is a symlink to /usr/local, and have the scripts do nothing if this is the case. This way people who haven't yet switched to xorg-7.2 will not be disadvantaged in any way. (I don't think simply testing to see if X11R6 is a symlink by itself will be sufficient because I bet that some people already have symlinks like X11R6-X11 or such like.) Also, the last change you propose vis a vis man pages, is that actually necessary - I would have thought that the overhead in searching both local and X11R6 would be fairly negligable. Stephen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: updating xorg-libraries 7.2 to 7.2.1
On 27/05/07, Stephen Montgomery-Smith [EMAIL PROTECTED] wrote: On Sun, 27 May 2007, Matthew Seaman wrote: Stephen Montgomery-Smith wrote: Matthew Seaman wrote: Josh Paetzel wrote: Shaun Branden wrote: xorg 7.2 was installed on this system from scratch, ie no ports to start with. sh /usr/ports/Tools/scripts/mergebase.sh before proceeding to install whatever ports you want. My experience is that simply having the symlink /usr/X11R6-/usr/local is totally sufficient. However it seems to me that what the port building procedure should now do is the following: * if /usr/X11R6 exists as a directory, it should issue an error message like it does now. * if /usr/X11R6 doesn't yet exist, silently create the symlink. This will mirror how it used to behave, in that if /usr/local or /usr/X11R6 did not exist, they would be created as needed. Oh, agreed to that. However, there are still more changes needed beyond that: Stopping the system running periodic jobs from /usr/X11R6/etc/periodic Stopping the system running startup scripts from /usr/X11R6/etc/rc.d Stopping the system searching for manpages from /usr/X11R6/man The last is fairly trivial, but realise that the first two mean that with the /usr/X11R6 - /usr/local link in place all /usr/local/etc/periodic jobs would get run twice, and even more importantly all /usr/local/etc/rc.d/ startup scripts would also run twice. Until there are new system releases incorporating the necessary changes in /etc/defaults/rc.conf and /etc/defaults/periodic.conf it will be necessary to override some of the default settings. In /etc/rc.conf: local_startup=/usr/local/etc/rc.d I had never previously noticed that (/usr/X11R6/etc/rc.d) in /etc/defaults/rc.conf. I understand why it is in there but I find it overly solicitous towards that beast. In /etc/periodic.conf: local_periodic=/usr/local/etc/periodic and for completeness sake, comment out the 'X11R6' lines in /etc/manpath.conf I think that the easiest way (i.e. least disruption) is to add to each of the X11R6 scripts a test at their beginning to see if X11R6 is a symlink to /usr/local, and have the scripts do nothing if this is the case. This way people who haven't yet switched to xorg-7.2 will not be disadvantaged in any way. (I don't think simply testing to see if X11R6 is a symlink by itself will be sufficient because I bet that some people already have symlinks like X11R6-X11 or such like.) Philosophically, I would have voted for /usr/X11R6/etc/rc.d never appearing in /etc/defaults/rc.conf in the first place. Setting the string explicitly in /etc/rc.conf seems just fine by me. Of course, X having its own etc tree (oh, you special little thing, you) was likely a silly idea all along. Of course, given its absurd compexity and size one could easily adopt the opposite argument. -- -- ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]