diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-04-19 21:37:45 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-04-19 21:37:45 +0000 |
commit | bf92fc2656f3300dbe91f2ccb959a43939ff3674 (patch) | |
tree | 585bdefeaadda997e9ca8b561ef46c753765ea69 /net-misc | |
parent | Forgot one small cleanup with my previous commit. (diff) | |
download | gentoo-2-bf92fc2656f3300dbe91f2ccb959a43939ff3674.tar.gz gentoo-2-bf92fc2656f3300dbe91f2ccb959a43939ff3674.tar.bz2 gentoo-2-bf92fc2656f3300dbe91f2ccb959a43939ff3674.zip |
old
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/ssvnc/files/ssvnc-1.0.22-build.patch | 61 | ||||
-rw-r--r-- | net-misc/ssvnc/files/ssvnc-1.0.22-optional-java.patch | 41 | ||||
-rw-r--r-- | net-misc/ssvnc/ssvnc-1.0.22.ebuild | 57 |
3 files changed, 0 insertions, 159 deletions
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.22-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.22-build.patch deleted file mode 100644 index b61c972562c7..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.22-build.patch +++ /dev/null @@ -1,61 +0,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/man1 --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) -- 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.22-optional-java.patch b/net-misc/ssvnc/files/ssvnc-1.0.22-optional-java.patch deleted file mode 100644 index c9263a453cc6..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.22-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)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR) - ./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.22.ebuild b/net-misc/ssvnc/ssvnc-1.0.22.ebuild deleted file mode 100644 index f1f7a542cf05..000000000000 --- a/net-misc/ssvnc/ssvnc-1.0.22.ebuild +++ /dev/null @@ -1,57 +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.22.ebuild,v 1.4 2010/01/07 00:07:07 vapier Exp $ - -inherit eutils multilib - -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 ) - x11-misc/imake" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-optional-java.patch - sed -i \ - -e '/CXXDEBUGFLAGS =/s:-O2:$(CXXFLAGS):' \ - -e '/CDEBUGFLAGS =/s:-O2:$(CFLAGS):' \ - vnc_unixsrc/vncviewer/Makefile - sed -i \ - -e "/^LIB/s:lib/:$(get_libdir)/:" \ - -e "$(use java || echo '/^JSRC/s:=.*:=:')" \ - Makefile -} - -src_compile() { - emake || die - emake all || die -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc README -} |