diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2004-06-03 06:34:13 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-06-03 06:34:13 +0000 |
| commit | 399e0de8ebeab9c05edf94944b594b46274b7d21 (patch) | |
| tree | a99c52bcc5028a6925ef47314e240b0e9c660ca2 /x11-base/xfree | |
| parent | added the missing enigmail dir into FILESDIR -- for some reason epkgmove didn... (diff) | |
| download | historical-399e0de8ebeab9c05edf94944b594b46274b7d21.tar.gz historical-399e0de8ebeab9c05edf94944b594b46274b7d21.tar.bz2 historical-399e0de8ebeab9c05edf94944b594b46274b7d21.zip | |
Fix typo in xrender.pc generation, includ to include.
Diffstat (limited to 'x11-base/xfree')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r6.ebuild | 27 |
2 files changed, 21 insertions, 14 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 88c8fdef247b..ec3ef6620ef3 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.337 2004/05/29 07:44:10 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.338 2004/06/03 06:34:13 spyderous Exp $ + + 03 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: + Fix typo in xrender.pc generation, includ to include. + + 02 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: + Fix generation of xrender.pc so version is resolved (#52843). 29 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: Force opengl-update to change to xfree if xorg-x11 is currently selected, else diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild index 0798b6b12c21..c26266dd0c68 100644 --- a/x11-base/xfree/xfree-4.3.0-r6.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.34 2004/05/29 07:44:10 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.35 2004/06/03 06:34:13 spyderous Exp $ # TODO # 14 Mar. 2004 <spyderous@gentoo.org> @@ -698,18 +698,19 @@ src_install() { # Generate xrender.pc using 'EOF' style here document with no expansion # (adapted from Red Hat) - cat <<-'EOF' > ${D}/usr/X11R6/lib/pkgconfig/xrender.pc -prefix=/usr/X11R6 -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Xrender -Description: X Render Library -Version: ${XRENDER_VER} -Cflags: -I${includedir} -I/usr/X11R6/include -Libs: -L${libdir} -lXrender -L/usr/X11R6/lib -lX11 -EOF + local XRENDER_PC="${D}/usr/X11R6/lib/pkgconfig/xrender.pc" + # Note the single quotes, necessary to keep variables unresolved + echo 'prefix=/usr/X11R6' >> ${XRENDER_PC} + echo 'exec_prefix=${prefix}' >> ${XRENDER_PC} + echo 'libdir=${exec_prefix}/lib' >> ${XRENDER_PC} + echo 'includedir=${prefix}/include' >> ${XRENDER_PC} + echo '' >> ${XRENDER_PC} + echo 'Name: Xrender' >> ${XRENDER_PC} + echo 'Description: X Render Library' >> ${XRENDER_PC} + # Note the DOUBLE quotes here, necessary to resolve this variable + echo "Version: ${XRENDER_VER}" >> ${XRENDER_PC} + echo 'Cflags: -I${includedir} -I/usr/X11R6/include' >> ${XRENDER_PC} + echo 'Libs: -L${libdir} -lXrender -L/usr/X11R6/lib -lX11' >> ${XRENDER_PC} fperms 0644 /usr/X11R6/lib/pkgconfig/xrender.pc |