diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-07-17 19:04:21 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-07-17 19:04:21 +0000 |
| commit | dc991fa65159fa22180187af79479169bd89683a (patch) | |
| tree | 6608f333c641c2396e7fce6f0d58ea0e56b88b4c /x11-base | |
| parent | removing kde-cvs.eclass, deprecated eclass (diff) | |
| download | gentoo-2-dc991fa65159fa22180187af79479169bd89683a.tar.gz gentoo-2-dc991fa65159fa22180187af79479169bd89683a.tar.bz2 gentoo-2-dc991fa65159fa22180187af79479169bd89683a.zip | |
symlink fixes
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.0-r12.ebuild | 23 |
2 files changed, 23 insertions, 6 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 90eefa266e9e..742a4958eb88 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.31 2002/07/15 23:57:11 owen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.32 2002/07/17 19:04:21 azarah Exp $ + + 17 Jul 2002; Martin Schlemmer <azarah@gentoo.org> : + + Make sure the standard symlinks (/usr/include/X11, etc) will not be removed. 15 Jul 2002; Owen Stampflee <owen@gentoo.org> : diff --git a/x11-base/xfree/xfree-4.2.0-r12.ebuild b/x11-base/xfree/xfree-4.2.0-r12.ebuild index b4e439df6b48..1f392361a08b 100644 --- a/x11-base/xfree/xfree-4.2.0-r12.ebuild +++ b/x11-base/xfree/xfree-4.2.0-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r12.ebuild,v 1.8 2002/07/15 23:57:11 owen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r12.ebuild,v 1.9 2002/07/17 19:04:21 azarah Exp $ FT2_VER=2.0.9 MY_V="`echo ${PV} |sed -e 's:\.::g'`" @@ -207,10 +207,12 @@ src_install() { tar -xz --no-same-owner -f ${DISTDIR}/truetype.tar.gz || \ die "Failed to unpack truetype.tar.gz" - dodir /usr/bin - dosym /usr/X11R6/bin /usr/bin/X11 - - dosym /usr/X11R6/lib/X11 /usr/lib/X11 + # Standard symlinks + dodir /usr/{bin,include,lib} + dosym ../X11R6/bin /usr/bin/X11 + dosym ../X11R6/include/X11 /usr/include/X11 + dosym ../X11R6/include/GL /usr/include/GL + dosym ../X11R6/lib/X11 /usr/lib/X11 dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so.1 @@ -302,3 +304,14 @@ pkg_postinst() { touch ${ROOT}/var/lib/xdm/.keep } +pkg_postrm() { + # Fix problematic links + if [ -x ${ROOT}/usr/X11R6/bin/XFree86 ] + then + ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11 + ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 + ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL + ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 + fi +} + |