Use the system libvncserver instead of the bundled version.

(Portage version: 2.0.51-r15)

4 files changed, 61 insertions, 36 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 051d801763d0..a13c541c538f 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.5 2005/01/06 22:51:58 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.6 2005/01/29 09:07:02 vapier Exp $
+
+  29 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/0.6.2-configure.ac.patch, +files/0.7-autotools.patch,
+  x11vnc-0.7.ebuild:
+  Use the system libvncserver instead of the bundled version.
 
   06 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org> x11vnc-0.7.ebuild:
   Added to ~amd64, bug #75388
diff --git a/x11-misc/x11vnc/files/0.6.2-configure.ac.patch b/x11-misc/x11vnc/files/0.6.2-configure.ac.patch
deleted file mode 100644
index 21665d069262..000000000000
--- a/x11-misc/x11vnc/files/0.6.2-configure.ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur x11vnc-0.6.2.orig/configure.ac x11vnc-0.6.2/configure.ac
---- x11vnc-0.6.2.orig/configure.ac	2004-11-16 17:39:24.860061978 +0100
-+++ x11vnc-0.6.2/configure.ac	2004-11-16 17:39:39.745018698 +0100
-@@ -14,6 +14,10 @@
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
- 
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])
-+
- # Options
- AH_TEMPLATE(BACKCHANNEL, [Enable BackChannel communication])
- AC_ARG_WITH(backchannel,
-@@ -108,7 +112,3 @@
- AC_SUBST(SDL_LIBS)
--
--# Checks for header files.
--AC_HEADER_STDC
--AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
diff --git a/x11-misc/x11vnc/files/0.7-autotools.patch b/x11-misc/x11vnc/files/0.7-autotools.patch
new file mode 100644
index 000000000000..97817553b534
--- /dev/null
+++ b/x11-misc/x11vnc/files/0.7-autotools.patch
@@ -0,0 +1,47 @@
+diff -Nur x11vnc.orig/configure.ac x11vnc/configure.ac
+--- x11vnc.orig/configure.ac	2004-11-16 17:39:24.860061978 +0100
++++ x11vnc/configure.ac	2004-11-16 17:39:39.745018698 +0100
+@@ -14,6 +14,10 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ 
++# Checks for header files.
++AC_HEADER_STDC
++AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])
++
+ # Options
+ AH_TEMPLATE(BACKCHANNEL, [Enable BackChannel communication])
+ AC_ARG_WITH(backchannel,
+@@ -108,7 +112,3 @@
+ AC_SUBST(SDL_LIBS)
+-
+-# Checks for header files.
+-AC_HEADER_STDC
+-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+@@ -200,3 +200,2 @@
+ AC_CONFIG_FILES([Makefile
+-                 libvncserver/Makefile
+                  
+--- x11vnc.orig/Makefile.am	2005-01-28 10:15:00.205392800 -0500
++++ x11vnc/Makefile.am	2005-01-28 10:15:10.882769592 -0500
+@@ -1,7 +1,7 @@
+ CFLAGS=-g -Wall
+ 
+-SUBDIRS=libvncserver x11vnc classes
+-DIST_SUBDIRS=libvncserver x11vnc classes
++SUBDIRS=x11vnc classes
++DIST_SUBDIRS=x11vnc classes
+ 
+ 
+ includedir=$(prefix)/include/rfb
+--- x11vnc.orig/x11vnc/Makefile.am	2005-01-28 10:15:22.031074792 -0500
++++ x11vnc/x11vnc/Makefile.am	2005-01-28 10:18:37.532354080 -0500
+@@ -1,5 +1,5 @@
+ DEFINES = -I ..
+-LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
++LDADD = -lvncserver @WSOCKLIB@
+ 
+ man_MANS=x11vnc.1
+ EXTRA_DIST=ChangeLog README tkx11vnc $(man_MANS)
diff --git a/x11-misc/x11vnc/x11vnc-0.7.ebuild b/x11-misc/x11vnc/x11vnc-0.7.ebuild
index b9f836cf03d4..70478338262a 100644
--- a/x11-misc/x11vnc/x11vnc-0.7.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.7.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.7.ebuild,v 1.3 2005/01/06 22:51:58 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.7.ebuild,v 1.4 2005/01/29 09:07:02 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
 SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~hppa ~amd64"
+KEYWORDS="amd64 hppa x86"
 IUSE="jpeg zlib"
 
 RDEPEND="virtual/x11
@@ -19,21 +20,15 @@ RDEPEND="virtual/x11
 		sys-libs/zlib
 	)"
 DEPEND="${RDEPEND}
+	net-libs/libvncserver
 	sys-devel/autoconf"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Hack to avoid running all autotools
-	touch -r configure configure.timestamp
-	touch -r configure.ac configure.ac.timestamp
-
-	epatch ${FILESDIR}/0.6.2-configure.ac.patch
-	WANT_AUTOCONF="2.5" autoconf || die "autoconf failed"
-
-	touch -r configure.timestamp configure
-	touch -r configure.ac.timestamp configure.ac
+	epatch ${FILESDIR}/0.7-autotools.patch
+	aclocal && automake && autoconf || die "autoconf failed"
 }
 
 src_compile() {
@@ -46,6 +41,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc x11vnc/{ChangeLog,README} || die "dodoc failed"
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc x11vnc/{ChangeLog,README}
 }