diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-12-28 17:45:34 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-12-28 17:45:34 +0000 |
commit | 69bdf418adbe51a9094b9ad92c7b579af6774677 (patch) | |
tree | deb8fbf158605664f2ab2e3fe4312d2513d93add /net-misc | |
parent | whitespace (diff) | |
download | gentoo-2-69bdf418adbe51a9094b9ad92c7b579af6774677.tar.gz gentoo-2-69bdf418adbe51a9094b9ad92c7b579af6774677.tar.bz2 gentoo-2-69bdf418adbe51a9094b9ad92c7b579af6774677.zip |
old
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/ssvnc/files/ssvnc-1.0.24-optional-java.patch | 41 | ||||
-rw-r--r-- | net-misc/ssvnc/files/ssvnc-1.0.25-build.patch | 153 | ||||
-rw-r--r-- | net-misc/ssvnc/ssvnc-1.0.25.ebuild | 61 |
3 files changed, 0 insertions, 255 deletions
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 deleted file mode 100644 index 44fddcfe6cdd..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.24-optional-java.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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/files/ssvnc-1.0.25-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.25-build.patch deleted file mode 100644 index 097c89c11998..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.25-build.patch +++ /dev/null @@ -1,153 +0,0 @@ ---- a/vnc_unixsrc/libvncauth/vncauth.c -+++ b/vnc_unixsrc/libvncauth/vncauth.c -@@ -29,6 +29,7 @@ - #include <unistd.h> - #include <vncauth.h> - #include <d3des.h> -+#include <time.h> - - #include <fcntl.h> - ---- a/vnc_unixsrc/vncviewer/fullscreen.c -+++ b/vnc_unixsrc/vncviewer/fullscreen.c -@@ -21,6 +21,7 @@ - * fullscreen.c - functions to deal with full-screen mode. - */ - -+#include <time.h> - #include <vncviewer.h> - #include <X11/Xaw/Form.h> - #include <X11/Xaw/Viewport.h> ---- a/vnc_unixsrc/vncviewer/misc.c -+++ b/vnc_unixsrc/vncviewer/misc.c -@@ -24,6 +24,7 @@ - #include <vncviewer.h> - #include <signal.h> - #include <fcntl.h> -+#include <sys/wait.h> - - static void CleanupSignalHandler(int sig); - static int CleanupXErrorHandler(Display *dpy, XErrorEvent *error); ---- a/vnc_unixsrc/vncviewer/popup.c -+++ b/vnc_unixsrc/vncviewer/popup.c -@@ -22,6 +22,8 @@ - */ - - #include "vncviewer.h" -+#include <sys/wait.h> -+#include <time.h> - - #include <X11/Xaw/Form.h> - #include <X11/Xaw/Command.h> ---- a/vnc_unixsrc/vncviewer/rfbproto.c -+++ b/vnc_unixsrc/vncviewer/rfbproto.c -@@ -23,6 +23,8 @@ - * rfbproto.c - functions to deal with client side of RFB protocol. - */ - -+#include <ctype.h> -+#include <time.h> - #include <sys/stat.h> - #include <unistd.h> - #include <errno.h> ---- a/vnc_unixsrc/vncviewer/sockets.c -+++ b/vnc_unixsrc/vncviewer/sockets.c -@@ -31,6 +31,7 @@ - #include <netdb.h> - #include <fcntl.h> - #include <assert.h> -+#include <time.h> - #include <vncviewer.h> - - /* Solaris (sysv?) needs INADDR_NONE */ ---- a/vnc_unixsrc/vncviewer/vncviewer.c -+++ b/vnc_unixsrc/vncviewer/vncviewer.c -@@ -21,6 +21,7 @@ - * vncviewer.c - the Xt-based VNC viewer. - */ - -+#include <ctype.h> - #include "vncviewer.h" - #include <X11/Xaw/Toggle.h> - ---- a/vncstorepw/lim_accept.c -+++ b/vncstorepw/lim_accept.c -@@ -6,6 +6,7 @@ - #include <stdlib.h> - #include <time.h> - #include <errno.h> -+#include <unistd.h> - - /* rename accept something else while we do the includes: */ - #define accept __accept_5_Moos ---- a/vncstorepw/unwrap.c -+++ b/vncstorepw/unwrap.c -@@ -21,6 +21,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include <errno.h> - - int db = 0; ---- 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/ssvnc-1.0.25.ebuild b/net-misc/ssvnc/ssvnc-1.0.25.ebuild deleted file mode 100644 index 85e1ed3db723..000000000000 --- a/net-misc/ssvnc/ssvnc-1.0.25.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ssvnc/ssvnc-1.0.25.ebuild,v 1.3 2010/04/19 21:39:12 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 - net-misc/stunnel - 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.25-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 -} |