diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2005-06-25 18:53:40 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2005-06-25 18:53:40 +0000 |
| commit | 6344c70e4f58980796b392bb6cc586378af047ed (patch) | |
| tree | c08bf250c8b692fac797066d865f0b078e6540cd | |
| parent | Stable on ppc. (diff) | |
| download | gentoo-2-6344c70e4f58980796b392bb6cc586378af047ed.tar.gz gentoo-2-6344c70e4f58980796b392bb6cc586378af047ed.tar.bz2 gentoo-2-6344c70e4f58980796b392bb6cc586378af047ed.zip | |
make vnc multilib-capable, bug 91755
(Portage version: 2.0.51.19)
| -rw-r--r-- | net-misc/vnc/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/vnc/vnc-4.0-r1.ebuild | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog index 22c9371afe77..265f0bc76f3a 100644 --- a/net-misc/vnc/ChangeLog +++ b/net-misc/vnc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/vnc # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.36 2005/06/09 15:07:20 omkhar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.37 2005/06/25 18:53:40 blubb Exp $ + + 25 Jun 2005; Simon Stelling <blubb@gentoo.org> vnc-4.0-r1.ebuild: + make vnc multilib-capable, bug 91755 09 Jun 2005; <omkhar@gentoo.org> +files/xc.patch-eieio.patch, vnc-4.0-r1.ebuild: diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild index f8302f77d12a..946aff819edf 100644 --- a/net-misc/vnc/vnc-4.0-r1.ebuild +++ b/net-misc/vnc/vnc-4.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.10 2005/06/10 15:31:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.11 2005/06/25 18:53:40 blubb Exp $ -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs multilib X_VERSION="6.8.1" @@ -54,7 +54,11 @@ src_unpack() { epatch ${FILESDIR}/xc.patch-eieio.patch epatch xc.patch - echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def + HOSTCONF="${S}/xc/config/cf/vnc.def" + echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} + echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF} + echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF} + echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF} fi } @@ -70,9 +74,9 @@ src_compile() { src_install() { dodir /usr/bin /usr/share/man/man1 - use server && dodir /usr/X11R6/lib/modules/extensions + use server && dodir /usr/$(get_libdir)/modules/extensions - ./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die + ./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/$(get_libdir)/modules/extensions || die dodoc LICENCE.TXT README use server || ( |