diff options
Diffstat (limited to 'net-misc/vnc')
| -rw-r--r-- | net-misc/vnc/ChangeLog | 176 | ||||
| -rw-r--r-- | net-misc/vnc/Manifest | 27 | ||||
| -rw-r--r-- | net-misc/vnc/files/vnc-4.0/vnc-xorg.patch | 59 | ||||
| -rw-r--r-- | net-misc/vnc/vnc-3.3.7.ebuild | 37 | ||||
| -rw-r--r-- | net-misc/vnc/vnc-4.0-r1.ebuild | 87 | ||||
| -rw-r--r-- | net-misc/vnc/vnc-4.0.ebuild | 17 |
6 files changed, 78 insertions, 325 deletions
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog index 98aa10d5e40c..7d2d968f75d9 100644 --- a/net-misc/vnc/ChangeLog +++ b/net-misc/vnc/ChangeLog @@ -1,179 +1,11 @@ # 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.42 2005/11/18 10:00:05 hansmi Exp $ - - 18 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> vnc-4.0-r1.ebuild: - Stable on ppc. - - 16 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> vnc-4.0-r1.ebuild: - Stable on sparc - - 15 Nov 2005; Paul Varner <fuzzyray@gentoo.org> vnc-4.0-r1.ebuild: - Stable on x86 - - 15 Sep 2005; Aron Griffis <agriffis@gentoo.org> vnc-4.0-r1.ebuild: - Mark 4.0-r1 stable on alpha - - 25 Aug 2005; Aron Griffis <agriffis@gentoo.org> vnc-4.0-r1.ebuild: - stable on ia64 - - 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: - fix for eieio compile error with 2.6 headers and vnc server on ppc64 - - 18 May 2005; Michael Sterrett <mr_bones_@gentoo.org> vnc-4.0.ebuild, - vnc-4.0-r1.ebuild: - remove invalid virtual - - 22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> vnc-4.0-r1.ebuild: - ~alpha + ~ia64 keywords. - - 22 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0-r1.ebuild: - Removed subshells, closing #78638. - - 08 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0-r1.ebuild: - Fixed optional building of server. - -*vnc-4.0-r1 (07 Jan 2005) - - 07 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> - files/vnc-4.0/vnc-xorg.patch, +vnc-4.0-r1.ebuild, vnc-4.0.ebuild, +imake-tmpdir.patch, - vnc-xorg-x11-fixes.patch: - Revision bump to use X.Org 6.8.1, closing #67565. - Create /usr/X11R6/lib/modules/extensions so that .so file gets installed, closing #63596. - Added patch to prevent /tmp execution, closing #71295. - Don't hardcode CC/CXX, closing #69277. - Split server and client with USE flags, closing #68290." - Updated SRC_URI to xorg.freedesktop.org. - - 15 Sep 2004; <agriffis@gentoo.org> vnc-4.0.ebuild: - stable on amd64 - - 25 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0.ebuild, - files/xc.patch-cfbglblt8.patch: - Added missing patch. - -*vnc-4.0 (20 Aug 2004) - - 20 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0.ebuild: - Version bump, closing #55592. - - 15 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> vnc-3.3.7.ebuild: - Marked stable on amd64. - - 10 Jan 2004; <augustus@gentoo.org> vnc-3.3.7.ebuild: - Added ~amd64 keyword. In order for this to work I had to disable Xvnc like ppc - did. This may be able to be fixed but my knowledge of Imake is limited and I - didn't see Xvnc as a show stopper to this package. - - 01 Dec 2003; Jason Wever <weeve@gentoo.org> vnc-3.3.7.ebuild: - Marked stable on sparc. - - 21 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> vnc-3.3.7.ebuild : - Copied patch from tightvnc that fixes compilation if /tmp is set noexec. Closing #22356. - - 09 Jun 2003; Jason Wever <weeve@gentoo.org> vnc-3.3.3-r2.ebuild, - vnc-3.3.3-r3.ebuild, vnc-3.3.4.ebuild, vnc-3.3.5-r1.ebuild, - vnc-3.3.5.ebuild, vnc-3.3.6-r1.ebuild, vnc-3.3.6.ebuild, vnc-3.3.7.ebuild, - files/vnc-3.3.3-10-xdm-auth-support.patch, - files/vnc-3.3.3r2-getline-fix.patch, files/vnc-3.3.4-platform-fixes.patch: - Added a couple patches from debian to make vnc-3.3.7 build and display - correctly on sparc. Marked all other vnc ebuilds as -sparc. - -*vnc-3.3.7 (24 Mar 2003) - - 19 Aug 2003; Mike Frysinger <vapier@gentoo.org> : - Disable Xvnc for ppc building and remove -ppc. - - 04 May 2003; Daniel Ahlberg <aliz@gentoo.org> vnc-3.3.7.ebuild : - Do not allow tightvnc and vnc to be installed at the same time as they - overwrite each others files. Closes #15152. - - 24 Mar 2003; Patrick Kursawe <phosphan@gentoo.org> vnc-3.3.7.ebuild, - files/digest-vnc-3.3.7, files/vnc-3.3.7-gentoo.security.patch: - Version bump. - -*vnc-3.3.6-r1 (21 Feb 2003) - - 21 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> : - Security update. - -*vnc-3.3.6 (11 Dec 2002) - - 21 Dec 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.6.ebuild : - Added CFLAGS fix from 3.3.5-r1. Closes bug #12024 - - 11 Dec 2002; Brad Cowan <bcowan@gentoo.org> vnc-3.3.6.ebuild, - files/digest-vnc-3.3.6: - Version bump. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*vnc-3.3.5-r1 (27 Nov 2002) - - 29 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5-r1.ebuild : - Marked stable. - - 27 Nov 2002; Martin Holzer <mholzer@gentoo.org> vnc-3.3.5-r1.ebuild : - Rechanged make to emake, added dependency and added compilerflags. - Fixed #11080. - -*vnc-3.3.5 (18 Nov 2002) - - 26 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5.ebuild : - Changed emake to make. This should clear up compile issues found - on gcc2 systems. - - 21 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5.ebuild : - Marked stable. - - 18 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5.ebuild, - files/digest-vnc-3.3.5 : - Version bump. Currently marked unstable. - -*vnc-3.3.4 (26 Sep 2002) - - 26 Sep 2002; Brad Cowan <bradlyatc@gentoo.org> vnc-3.3.4.ebuild - files/digest-vnc-3.3.4 : - Updated version with many bugfixes. Notably a change in maintainers - back to the original dev team. Homepage changed, removed patches, - patches may need replaced after testing. - -*vnc-3.3.3-r3 (03 Sep 2002) - - 09 Sep 2002; Seemant Kulleen <seemant@gentoo.org> vnc-3.3.3-r3.ebuild : - Added Mandrake's javabin stuff, since the javasrc stuff was written in the - Roaring 20's and the days of Coltrane and Java-1.1, so it is not even - compilable with the more contemporary (and altogether more hip) java - compilers (1.3 and above) - - 03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> vnc-3.3.3-r3.ebuild - files/digest-vnc-3.3.3-r3 : - Added a bunch of packages, courtesy of Mandrake's src.rpm. The following - patches are applied: imake, xauth, tightvnc encoding, using xinit's - XClients script to start the session, vncpassword creates ~/.vnc if - non-existent, system libs (zlib) and shared memory patch. Additionally, - there is a patch to let it use the X font server (closing bug #6614 by: - kelsall@dsl.pipex.com (Chris Paulson-Ellis)) and a patch to compile even - though the manpage isn';t present (closing bug #7365 by: gentoo@inrevo.com - (Alistair McDonald)). Additionally, an optional patch is applied if - "tcpd" is in USE to use tcp wrappers. Finally, for ppc users a patch is - applied so that vnc is compilable/installable/runnable on ppc systems. +# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $ *vnc-3.3.3-r2 (1 Feb 2002) - 09 Jul 2002; phoen][x <phoenix@gentoo.org> vnc-3.3.3-r2.ebuild : - Added KEYWORDS, LICENSE, SLOT, DESCRIPTION. - - 11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> vnc-3.3.3-r2.ebuild : - Added X as a dependency since xmkmf is required for compilation, and that is - provided by X (and openmotif, but that is pointless). Also, brought ebuild's - syntax up to date. No revision bump necessary. - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + Added initial ChangeLog which should be updated whenever the package is updated in any way. This changelog is targetted to users. This means that the comments should well explained and written in clean English. The details about diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest index 3459c4de8f1f..e69de29bb2d1 100644 --- a/net-misc/vnc/Manifest +++ b/net-misc/vnc/Manifest @@ -1,27 +0,0 @@ -MD5 f915651ee1c8a1d1fd423f770f341578 vnc-4.0.ebuild 2078 -MD5 6f59f15a8b013fa3c8897c311ae596ff vnc-3.3.7.ebuild 1628 -MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220 -MD5 78428f930fbc7a018c25d18b28d05d7f ChangeLog 7207 -MD5 7f5d47c9e69b03072fcc7637f7f27404 vnc-4.0-r1.ebuild 2789 -MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205 -MD5 a30c29b08a93f6fb42177887aa132e18 files/vnc-3.3.3-10-xdm-auth-support.patch 11575 -MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738 -MD5 bc74b6827faf0e3039de99a4e21cc5bd files/digest-vnc-4.0-r1 270 -MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.7-gentoo.security.patch 781 -MD5 2132dc5ea4e5a5349f5ec193ea3667c6 files/xc.patch-eieio.patch 703 -MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956 -MD5 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270 -MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70 -MD5 69dfbaa72c6b66cba94868885c09fc92 files/vnc-3.3.4-platform-fixes.patch 63005 -MD5 a47315b0d740135ce27a952e00a0438f files/vnc-4.0/vnc-xclients.patch 557 -MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062 -MD5 ec954c0400a90b9de9d5d59db4c7eefb files/vnc-4.0/vnc-idle.patch 482 -MD5 7237b4f63e22a412ecba796be21e218d files/vnc-4.0/vnc-gcc34.patch 5911 -MD5 6572073121cd6b24eb72ec9df69927e0 files/vnc-4.0/vnc-via.patch 5681 -MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216 -MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698 -MD5 0959d633e7ca36b8995398b1ba1e315c files/vnc-4.0/vnc-cookie.patch 819 -MD5 43179a2e046f430fea7d2bc617dce6b0 files/vnc-4.0/vnc-xorg.patch 3440 -MD5 5f386c352a0c2fb8298434174b7f4691 files/vnc-4.0/vnc-def.patch 365 -MD5 ff4f3d8258e8e4612c637b86fcc50605 files/vnc-4.0/vnc-fPIC.patch 2401 -MD5 999db9342ac0003537daee1f4193fd92 files/vnc-4.0/vnc-sparc.patch 1244 diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch index cd749c5398c3..d7a46223ab3c 100644 --- a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch +++ b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch @@ -37,6 +37,25 @@ #endif #if BuildXprint +--- vnc-4.0b4-unixsrc/xc.patch.xorg 2004-03-23 10:53:05.000000000 +0000 ++++ vnc-4.0b4-unixsrc/xc.patch 2004-03-23 10:53:42.000000000 +0000 +@@ -8,11 +8,11 @@ + + XCOMM + + XCOMM X VNC server + + XCOMM +-+ MFBDIR = mfb +-+ CFB8DIR = cfb +-+ CFB16DIR = cfb16 +-+ CFB24DIR = cfb24 +-+ CFB32DIR = cfb32 +++ MFBSUBDIR = mfb +++ CFB8SUBDIR = cfb +++ CFB16SUBDIR = cfb16 +++ CFB24SUBDIR = cfb24 +++ CFB32SUBDIR = cfb32 + + XVNCDDXDIR = vnc/Xvnc + + XVNCDIRS = $(STDDIRS) $(MFBDIR) \ + + $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ --- vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h.xorg 2003-05-30 11:42:38.000000000 +0100 +++ vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h 2004-05-27 11:26:06.499536143 +0100 @@ -36,7 +36,7 @@ @@ -59,43 +78,3 @@ } else { REGION_INIT(pScreen, reg, rect, size); } ---- vnc-4.0-unixsrc/xc.patch.xorg 2004-08-25 16:10:52.131987786 +0100 -+++ vnc-4.0-unixsrc/xc.patch 2004-08-25 16:12:23.896276533 +0100 -@@ -8,11 +8,11 @@ - + XCOMM - + XCOMM X VNC server - + XCOMM --+ MFBDIR = mfb --+ CFB8DIR = cfb --+ CFB16DIR = cfb16 --+ CFB24DIR = cfb24 --+ CFB32DIR = cfb32 -++ MFBSUBDIR = mfb -++ CFB8SUBDIR = cfb -++ CFB16SUBDIR = cfb16 -++ CFB24SUBDIR = cfb24 -++ CFB32SUBDIR = cfb32 - + XVNCDDXDIR = vnc/Xvnc - + XVNCDIRS = $(STDDIRS) $(MFBDIR) \ - + $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ ---- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.xorg 2004-08-31 14:24:12.140503335 +0100 -+++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2004-08-31 14:24:45.189675775 +0100 -@@ -201,6 +201,7 @@ - } - - extern "C" { -+ void ddxInitGlobals() {} - void ddxGiveUp() - { - int i; ---- vnc-4.0-unixsrc/xc/config/cf/vnc.def 2004-09-29 15:55:57.732303799 +0100 -+++ vnc-4.0-unixsrc/xc/config/cf/vnc.def 2004-09-29 15:56:30.495034234 +0100 -@@ -9,6 +9,8 @@ - #define XnestServer YES - #define XF86Server NO - #define XprtServer NO -+#define BuildXFree86ConfigTools NO -+#define BuildScanpci NO - - #ifdef SunArchitecture - #define ProjectRoot /usr/openwin diff --git a/net-misc/vnc/vnc-3.3.7.ebuild b/net-misc/vnc/vnc-3.3.7.ebuild index f2b31d7ac7f2..72ffdac01cf9 100644 --- a/net-misc/vnc/vnc-3.3.7.ebuild +++ b/net-misc/vnc/vnc-3.3.7.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.7.ebuild,v 1.14 2005/01/07 18:12:04 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.7.ebuild,v 1.1 2003/03/24 15:38:19 phosphan Exp $ inherit eutils +IUSE="java tcpd" + MY_P="${P}-unixsrc" + DESCRIPTION="Remote desktop viewer display system" HOMEPAGE="http://www.realvnc.com/" + SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 sparc ppc amd64" -IUSE="java tcpd" +KEYWORDS="~x86" -DEPEND="tcpd? ( sys-apps/tcp-wrappers ) - !net-misc/tightvnc" +DEPEND="tcpd? ( sys-apps/tcp-wrappers )" RDEPEND="java? ( virtual/jre )" S="${WORKDIR}/${MY_P}" @@ -25,29 +27,16 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-gentoo.security.patch - epatch ${FILESDIR}/${P}-imake-tmpdir.patch - if [ "${ARCH}" = "sparc" ] - then - epatch ${FILESDIR}/vnc-3.3.3r2-getline-fix.patch - epatch ${FILESDIR}/vnc-3.3.4-platform-fixes.patch - epatch ${FILESDIR}/vnc-3.3.3-10-xdm-auth-support.patch - fi - sed -i \ - 's:CC = cc:CC = gcc:' \ - Xvnc/config/imake/Makefile.ini \ - Xvnc/config/util/Makefile.ini } src_compile() { - + export CXX="g++" econf || die "./configure failed" - make - - use ppc && return 0 - use amd64 && return 0 + make + cd Xvnc if use tcpd then @@ -66,7 +55,7 @@ src_compile() { } src_install () { - + dodir /usr/bin /usr/share/man/man1 ./vncinstall ${D}/usr/bin ${D}/usr/share/man || die @@ -76,7 +65,7 @@ src_install () { cd ${S}/classes insinto /usr/share/vnc/classes doins *.class *.jar *.vnc - fi + fi cd ${S} dodoc LICENCE.TXT README diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild index 86b46934f971..05d711c19d9e 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.16 2005/11/18 10:00:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.1 2005/01/07 18:12:04 aliz Exp $ -inherit eutils toolchain-funcs multilib +inherit eutils toolchain-funcs X_VERSION="6.8.1" @@ -10,85 +10,68 @@ MY_P="${P}-unixsrc" DESCRIPTION="Remote desktop viewer display system" HOMEPAGE="http://www.realvnc.com/" SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz - server? ( - http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz - http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz - http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz - )" + http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz + http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz + http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="server" +KEYWORDS="~x86 ~sparc ~ppc ~amd64" +IUSE="" DEPEND="sys-libs/zlib media-libs/freetype + !virtual/vnc x11-base/xorg-x11" +PROVIDE="virtual/vnc" S="${WORKDIR}/${MY_P}" src_unpack() { + mkdir -p ${S}/xc ; cd ${S} + + unpack X11R${X_VERSION}-src1.tar.gz + unpack X11R${X_VERSION}-src2.tar.gz + unpack X11R${X_VERSION}-src3.tar.gz + + cd ${WORKDIR} unpack ${MY_P}.tar.gz ; cd ${S} - epatch ${FILESDIR}/${P}/vnc-gcc34.patch + # patches from Redhat epatch ${FILESDIR}/${P}/vnc-cookie.patch + epatch ${FILESDIR}/${P}/vnc-def.patch epatch ${FILESDIR}/${P}/vnc-fPIC.patch + epatch ${FILESDIR}/${P}/vnc-gcc34.patch epatch ${FILESDIR}/${P}/vnc-idle.patch epatch ${FILESDIR}/${P}/vnc-restart.patch + epatch ${FILESDIR}/${P}/vnc-sparc.patch epatch ${FILESDIR}/${P}/vnc-via.patch + epatch ${FILESDIR}/${P}/vnc-xclients.patch + epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch + epatch ${FILESDIR}/${P}/vnc-xorg.patch + epatch ${FILESDIR}/${P}/imake-tmpdir.patch - if use server; then - unpack X11R${X_VERSION}-src1.tar.gz - unpack X11R${X_VERSION}-src2.tar.gz - unpack X11R${X_VERSION}-src3.tar.gz - - # patches from Redhat - epatch ${FILESDIR}/${P}/vnc-sparc.patch - epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch - epatch ${FILESDIR}/${P}/vnc-def.patch - epatch ${FILESDIR}/${P}/vnc-xclients.patch - epatch ${FILESDIR}/${P}/vnc-xorg.patch - epatch ${FILESDIR}/${P}/imake-tmpdir.patch - - epatch ${FILESDIR}/xc.patch-cfbglblt8.patch - epatch ${FILESDIR}/xc.patch-eieio.patch - epatch xc.patch - - 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 + epatch ${FILESDIR}/xc.patch-cfbglblt8.patch + epatch xc.patch + + echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def } src_compile() { + # client econf --with-installed-zlib || die emake || die - if use server; then - cd ${S}/xc - make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die - fi + # server + cd ${S}/xc + make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die } src_install() { - dodir /usr/bin /usr/share/man/man1 - use server && dodir /usr/$(get_libdir)/modules/extensions - - ./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/$(get_libdir)/modules/extensions || die + # client + dodir /usr/bin /usr/share/man/man1 /usr/X11R6/lib/modules/extensions + ./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die dodoc LICENCE.TXT README - use server || ( - rm ${D}/usr/bin/vncserver - rm ${D}/usr/bin/x0vncserver - rm ${D}/usr/share/man/man1/vncpasswd.1.gz - rm ${D}/usr/bin/vncpasswd - rm ${D}/usr/share/man/man1/vncconfig.1.gz - rm ${D}/usr/bin/vncconfig - rm ${D}/usr/share/man/man1/vncserver.1.gz - rm ${D}/usr/share/man/man1/x0vncserver.1.gz - ) - ewarn "Note that the free VNC release is not designed for use on untrusted networks" } diff --git a/net-misc/vnc/vnc-4.0.ebuild b/net-misc/vnc/vnc-4.0.ebuild index 2de570de538e..2a8adaf9cf9b 100644 --- a/net-misc/vnc/vnc-4.0.ebuild +++ b/net-misc/vnc/vnc-4.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.6 2005/05/18 04:18:29 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.1 2004/08/23 12:53:44 aliz Exp $ -inherit eutils toolchain-funcs +inherit eutils X_VERSION="6.7.0" @@ -16,14 +16,14 @@ SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~sparc ~ppc amd64" +KEYWORDS="~x86 ~sparc ~ppc ~amd64" IUSE="" DEPEND="sys-libs/zlib - !net-misc/tightvnc media-libs/freetype - x11-base/xorg-x11" + !virtual/vnc" +PROVIDE="virtual/vnc" S="${WORKDIR}/${MY_P}" src_unpack() { @@ -46,7 +46,6 @@ src_unpack() { epatch ${FILESDIR}/${P}/vnc-sparc.patch epatch ${FILESDIR}/${P}/vnc-via.patch epatch ${FILESDIR}/${P}/vnc-xclients.patch - epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch epatch ${FILESDIR}/${P}/vnc-xorg.patch epatch ${FILESDIR}/xc.patch-cfbglblt8.patch @@ -65,9 +64,7 @@ src_compile() { src_install() { # client - dodir /usr/bin /usr/share/man/man1 /usr/X11R6/lib/modules/extensions + dodir /usr/bin /usr/share/man/man1 ./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die dodoc LICENCE.TXT README - - ewarn "Note that the free VNC release is not designed for use on untrusted networks" } |