Fix some missing includes. Make sure Makefile does not run make Makefiles as xmkmf -a already does that. Move xmkmf to src_configure(). Respect LDFLAGS (bug #336116), CC, CFLAGS. Add missing deps. Fix quoting issue.

(Portage version: 2.2_rc86/cvs/Linux i686)

3 files changed, 84 insertions, 2 deletions

diff --git a/net-misc/vncrec/ChangeLog b/net-misc/vncrec/ChangeLog
index 88344b285d6f..fa11e1ccfc62 100644
--- a/net-misc/vncrec/ChangeLog
+++ b/net-misc/vncrec/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vncrec
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.7 2007/07/22 08:06:24 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.8 2010/09/28 18:28:34 jer Exp $
+
+*vncrec-0.2-r1 (28 Sep 2010)
+
+  28 Sep 2010; Jeroen Roovers <jer@gentoo.org> +vncrec-0.2-r1.ebuild,
+  +files/vncrec-0.2-includes.patch:
+  Fix some missing includes. Make sure Makefile does not run make Makefiles
+  as xmkmf -a already does that. Move xmkmf to src_configure(). Respect
+  LDFLAGS (bug #336116), CC, CFLAGS. Add missing deps. Fix quoting issue.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vncrec-0.2.ebuild:
   Drop virtual/x11 references.
diff --git a/net-misc/vncrec/files/vncrec-0.2-includes.patch b/net-misc/vncrec/files/vncrec-0.2-includes.patch
new file mode 100644
index 000000000000..174a42738ab7
--- /dev/null
+++ b/net-misc/vncrec/files/vncrec-0.2-includes.patch
@@ -0,0 +1,21 @@
+--- a/vncconnect/vncconnect.c	2001-06-09 05:41:45.000000000 +0200
++++ b/vncconnect/vncconnect.c	2010-09-28 20:19:03.000000000 +0200
+@@ -5,6 +5,8 @@
+ #include <stdio.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
++#include <stdlib.h> /* exit() */
++#include <string.h> /* strlen() */
+ 
+ static char *programName;
+ 
+--- a/libvncauth/vncauth.c	2001-06-09 05:41:45.000000000 +0200
++++ b/libvncauth/vncauth.c	2010-09-28 20:19:44.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <sys/stat.h>
+ #include <vncauth.h>
+ #include <d3des.h>
++#include <time.h> /* time() */
+ 
+ 
+ /*
diff --git a/net-misc/vncrec/vncrec-0.2-r1.ebuild b/net-misc/vncrec/vncrec-0.2-r1.ebuild
new file mode 100644
index 000000000000..d880fc425207
--- /dev/null
+++ b/net-misc/vncrec/vncrec-0.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/vncrec-0.2-r1.ebuild,v 1.1 2010/09/28 18:28:34 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="VNC session recorder and player"
+HOMEPAGE="http://www.sodan.org/~penny/vncrec/"
+SRC_URI="http://www.sodan.org/~penny/vncrec/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-includes.patch
+	touch vncrec/vncrec.man
+	sed -i Imakefile \
+		-e '/make Makefiles/d' \
+		|| die "sed Imakefile"
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CXXFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		World || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog README README.vnc
+}