Version bump and avoid imake #289407 by Dmitri Pogosian.

(Portage version: 2.2_rc54/cvs/Linux x86_64)

6 files changed, 180 insertions, 1 deletions

diff --git a/net-misc/ssvnc/ChangeLog b/net-misc/ssvnc/ChangeLog
index 6c1ce24ccd06..841abbbee928 100644
--- a/net-misc/ssvnc/ChangeLog
+++ b/net-misc/ssvnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ssvnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ChangeLog,v 1.5 2009/06/29 20:55:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ChangeLog,v 1.6 2009/12/04 08:19:54 vapier Exp $
+
+*ssvnc-1.0.24 (04 Dec 2009)
+
+  04 Dec 2009; Mike Frysinger <vapier@gentoo.org> +ssvnc-1.0.24.ebuild,
+  +files/ssvnc-1.0.24-build.patch, +files/ssvnc-1.0.24-optional-java.patch,
+  +files/Makefile.libvncauth, +files/Makefile.vncviewer:
+  Version bump and avoid imake #289407 by Dmitri Pogosian.
 
   29 Jun 2009; Markus Meier <maekke@gentoo.org> ssvnc-1.0.22.ebuild:
   amd64/x86 stable, bug #274986
diff --git a/net-misc/ssvnc/files/Makefile.libvncauth b/net-misc/ssvnc/files/Makefile.libvncauth
new file mode 100644
index 000000000000..09406d6fe386
--- /dev/null
+++ b/net-misc/ssvnc/files/Makefile.libvncauth
@@ -0,0 +1,5 @@
+AR ?= ar
+CPPFLAGS += -I. -I../include -D_GNU_SOURCE
+srcs = $(wildcard *.c)
+libvncauth.a: $(srcs:.c=.o)
+	$(AR) rc $@ $^
diff --git a/net-misc/ssvnc/files/Makefile.vncviewer b/net-misc/ssvnc/files/Makefile.vncviewer
new file mode 100644
index 000000000000..46b4a8b6e269
--- /dev/null
+++ b/net-misc/ssvnc/files/Makefile.vncviewer
@@ -0,0 +1,5 @@
+CPPFLAGS += -I. -I../include -D_GNU_SOURCE
+LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lX11 -lXt -lXaw
+include Makefile.in
+all: vncviewer
+vncviewer: $(SRCS:.c=.o)
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.24-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.24-build.patch
new file mode 100644
index 000000000000..8988c2f5b12a
--- /dev/null
+++ b/net-misc/ssvnc/files/ssvnc-1.0.24-build.patch
@@ -0,0 +1,61 @@
+--- a/vncstorepw/vncauth.c
++++ b/vncstorepw/vncauth.c
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/stat.h>
+ #include "d3des.h"
+ #if 0
+--- a/vncstorepw/vncstorepw.c
++++ b/vncstorepw/vncstorepw.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ extern int rfbEncryptAndStorePasswd(char *, char*);
+ 
+--- a/Makefile
++++ b/Makefile
+@@ -21,11 +21,11 @@
+ 
+ # N.B. ?= is gnu make specific.  Some of the subdir Makefiles are too. 
+ #
+-PREFIX  ?= /usr/local
+-ROOT    ?=
++PREFIX   = /usr
++ROOT     = $(DESTDIR)
+ BIN      = bin
+ LIB      = lib/ssvnc
+ MAN      = man
+-MANDIR  ?= $(MAN)
++MANDIR   = share/$(MAN)
+ APPS    ?= share/applications
+ BINNAME ?= ssvncviewer
+@@ -66,7 +66,6 @@
+ 
+ install: all
+ 	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
+-	strip $(VIEWER)
+ 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
+--- a/vncstorepw/Makefile
++++ b/vncstorepw/Makefile
+@@ -14,7 +14,6 @@
+ 
+ $(CMD): vncauth.o vncstorepw.o d3des.o
+ 	PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
+-	PATH=$$PATH:$(EPATH) strip $(CMD)
+ 	@ls -l $(CMD)
+ 
+ $(UNWRAP): unwrap.c
+@@ -41,7 +40,6 @@
+ 	else \
+ 		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \
+ 	fi
+-	PATH=$$PATH:$(EPATH) strip $(ULTDSM)
+ 	@ls -l $(ULTDSM)
+ 
+ test: $(CMD)
+
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.24-optional-java.patch b/net-misc/ssvnc/files/ssvnc-1.0.24-optional-java.patch
new file mode 100644
index 000000000000..44fddcfe6cdd
--- /dev/null
+++ b/net-misc/ssvnc/files/ssvnc-1.0.24-optional-java.patch
@@ -0,0 +1,41 @@
+--- a/Makefile
++++ b/Makefile
+@@ -44,8 +44,10 @@
+ 
+ config:
+ 	sh -c 'type xmkmf'
++ifneq ($(JSRC),)
+ 	sh -c 'type javac'
+ 	sh -c 'type jar'
++endif
+ 	@echo
+ 	cd $(VSRC)/libvncauth; pwd; xmkmf
+ 	cd $(VSRC)/vncviewer;  pwd; xmkmf
+@@ -55,13 +55,17 @@ config:
+ all:
+ 	cd $(VSRC)/libvncauth; $(MAKE)
+ 	cd $(VSRC)/vncviewer;  $(MAKE)
++ifneq ($(JSRC),)
+ 	cd $(JSRC); $(MAKE)
++endif
+ 	cd $(PSRC); $(MAKE)
+ 
+ clean:
+ 	cd $(VSRC)/libvncauth; $(MAKE) clean
+ 	cd $(VSRC)/vncviewer;  $(MAKE) clean
++ifneq ($(JSRC),)
+ 	cd $(JSRC); $(MAKE) clean
++endif
+ 	cd $(PSRC); $(MAKE) clean
+ 
+ install: all
+@@ -72,7 +76,9 @@ install: all
+ 	cp -p $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -pR scripts/* $(ROOT)$(PREFIX)/$(LIB)
++ifneq ($(JSRC),)
+ 	cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util
++endif
+ 	cp -p $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1
+ 	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc  $(PREFIX)/$(LIB)/ssvnc
+ 	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/tsvnc  $(PREFIX)/$(LIB)/tsvnc
diff --git a/net-misc/ssvnc/ssvnc-1.0.24.ebuild b/net-misc/ssvnc/ssvnc-1.0.24.ebuild
new file mode 100644
index 000000000000..2903208e326c
--- /dev/null
+++ b/net-misc/ssvnc/ssvnc-1.0.24.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.24.ebuild,v 1.1 2009/12/04 08:19:54 vapier Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="VNC viewer that adds encryption security to VNC connections"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
+SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="java"
+
+RDEPEND="sys-libs/zlib
+	media-libs/jpeg
+	dev-libs/openssl
+	dev-lang/tk
+	java? ( virtual/jre )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXaw
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	java? ( virtual/jdk )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.24-build.patch
+	epatch "${FILESDIR}"/${PN}-1.0.24-optional-java.patch
+
+	sed -i \
+		-e "/^LIB/s:lib/:$(get_libdir)/:" \
+		-e $(use java || echo '/^JSRC/s:=.*:=:') \
+		Makefile
+	sed -i \
+		-e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \
+		vncstorepw/Makefile
+
+	cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile
+	cd "${S}"/vnc_unixsrc/vncviewer
+	sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in
+	cp "${FILESDIR}"/Makefile.vncviewer Makefile
+}
+
+src_compile() {
+	tc-export AR CC CXX RANLIB
+	emake all || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README
+}