Attachment 95773 Details for Bug 134236 – file.diff

[patch] file.diff

file.diff (text/plain), 7.97 KB, created by Cezary Morga on 2009-05-05 17:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cezary Morga

Created: 2009-05-05 17:20:01 UTC

Size: 7.97 KB

patch

obsolete

>diff -ruN ssvnc.orig/Makefile ssvnc/Makefile
>--- ssvnc.orig/Makefile	2009-05-05 18:03:44.000000000 +0200
>+++ ssvnc/Makefile	2009-05-05 18:04:02.000000000 +0200
>@@ -6,51 +6,58 @@
> #
> 
> PORTNAME=	ssvnc
>-PORTVERSION=	1.0.20
>-PORTREVISION=	7
>+PORTVERSION=	1.0.22
> CATEGORIES=	net security
>-MASTER_SITES=	http://www.karlrunge.com/x11vnc/etv/
>+MASTER_SITES=	SF
>+DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
> 
> MAINTAINER=	alepulver@FreeBSD.org
> COMMENT=	Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
> 
> BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
> LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
>-RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel
>+RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel \
>+		xterm:${PORTSDIR}/x11/xterm
> 
>-USE_XORG=	xi xmu xt xaw
>+OPTIONS=	ULTRAFTP "UltraVNC File Transfer support (Java required)"	off
>+
>+USE_GMAKE=	yes
>+USE_XORG=	xi xmu xt xaw ice xpm xext sm
> USE_TCL_RUN=	84
> USE_TK_RUN=	84
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>+USE_PERL5_RUN=	yes
>+
>+.if defined(WITH_ULTRAFTP)
>+USE_JAVA=	yes
>+PLIST_SUB+=	ULTRAFTP=""
>+.else
>+PLIST_SUB+=	ULTRAFTP="@comment "
>+.endif
>+.if defined(NOPORTDOCS)
>+MAKE_ARGS+=	DOCS=""
>+.endif
>+
>+MAN1=	ssvnc-gui.1 \
>+	ssvncviewer.1
>+
>+PLIST_SUB+=	LIBDIR=lib/${PORTNAME} DESKTOPDIR=${_DESKTOPDIR_REL}
> 
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g' \
>-		${WRKSRC}/build.unix
>-	@${REINPLACE_CMD} -e \
>-		's|exec wish|exec ${WISH}|; \
>-		 303,$$s|ss_vncviewer|ssvnc-stunnel|; \
>-		 s|ssvnc_cmd|ssvnc-stunnel|' \
>-		 ${WRKSRC}/bin/util/ssvnc.tcl
>-	@${REINPLACE_CMD} -e \
>-		's|ss_vncviewer|ssvnc-stunnel|; \
>-		 s|-vncviewer|-ssvnc|; \
>-		 s|grep Linux|grep ${OPSYS}|' \
>-		 ${WRKSRC}/bin/util/ss_vncviewer
>-
>-do-build:
>-	@cd ${WRKSRC} && ${SETENV} UNAME="${OPSYS}" ${SH} build.unix
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${OPSYS}/vncviewer ${PREFIX}/bin/ssvnc
>-	${INSTALL_SCRIPT} ${WRKSRC}/bin/util/ss_vncviewer \
>-		${PREFIX}/bin/ssvnc-stunnel
>-	${INSTALL_SCRIPT} ${WRKSRC}/bin/util/ssvnc.tcl ${PREFIX}/bin/ssvnc-gui
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} README bin/util/stunnel-server.conf \
>-		${DOCSDIR}
>+	@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|' ${WRKSRC}/scripts/util/ssvnc.tcl
>+	@${REINPLACE_CMD} -e 's|grep Linux|grep ${OPSYS}|' ${WRKSRC}/scripts/util/ss_vncviewer
>+	@${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' ${WRKSRC}/man/man1/ssvnc.1
>+.if !defined(WITH_ULTRAFTP)
>+	@${REINPLACE_CMD} -e "s|sh -c 'type javac'||" \
>+		-e "s|sh -c 'type jar'||" \
>+		-e 's|cd $$(JSRC);|@#|' \
>+		-e 's|cp -p $$(ARCHIVE)|@#|' \
>+		${WRKSRC}/Makefile
> .endif
>+
>+do-configure:
>+	@cd ${WRKSRC} && ${GMAKE} config
>+
>+post-install:
> 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
> 
> .include <bsd.port.mk>
>diff -ruN ssvnc.orig/distinfo ssvnc/distinfo
>--- ssvnc.orig/distinfo	2009-05-05 18:03:44.000000000 +0200
>+++ ssvnc/distinfo	2009-05-05 18:04:02.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (ssvnc-1.0.20.tar.gz) = 9d4b1531cac07df5a9975d6760b426c1
>-SHA256 (ssvnc-1.0.20.tar.gz) = 27edb3bec4cd48a899bec3bcbee437c9ee3514cdd29eb21c3a2b16546780e0f1
>-SIZE (ssvnc-1.0.20.tar.gz) = 13191851
>+MD5 (ssvnc-1.0.22.src.tar.gz) = 6273ae862a0e1b1b9dd5aa46eab512dc
>+SHA256 (ssvnc-1.0.22.src.tar.gz) = a758ad5f4584f2b7aa170fbae5a99849bbc97ef0500b1ecb7445dcbd01d736d9
>+SIZE (ssvnc-1.0.22.src.tar.gz) = 453665
>diff -ruN ssvnc.orig/files/patch-Makefile ssvnc/files/patch-Makefile
>--- ssvnc.orig/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
>+++ ssvnc/files/patch-Makefile	2009-05-05 18:04:02.000000000 +0200
>@@ -0,0 +1,45 @@
>+--- Makefile.orig	2008-11-16 18:31:44.000000000 +0100
>++++ Makefile	2009-05-05 16:24:14.572268630 +0200
>+@@ -29,6 +29,7 @@
>+ MANDIR  ?= $(MAN)
>+ APPS    ?= share/applications
>+ BINNAME ?= ssvncviewer
>++DOCS    ?= share/doc/ssvnc
>+ 
>+ 
>+ VSRC = vnc_unixsrc
>+@@ -65,23 +66,28 @@
>+ 	cd $(PSRC); $(MAKE) clean
>+ 
>+ install: all
>+-	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)
>++	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB)/util $(ROOT)$(PREFIX)/$(MANDIR)
>+ 	strip $(VIEWER)
>+ 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
>+ 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
>+ 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
>+ 	cp -p $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
>+ 	cp -p $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
>+-	cp -pR scripts/* $(ROOT)$(PREFIX)/$(LIB)
>++	cp -p scripts/ssvnc $(ROOT)$(PREFIX)/$(LIB)
>++	cp -p scripts/ssvnc_cmd $(ROOT)$(PREFIX)/$(LIB)
>++	cp -p scripts/util/ssvnc.tcl $(ROOT)$(PREFIX)/$(LIB)/util
>++	cp -p scripts/util/ss_vncviewer $(ROOT)$(PREFIX)/$(LIB)/util
>+ 	cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util
>+-	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
>+-	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/sshvnc $(PREFIX)/$(LIB)/sshvnc
>++	cp -p $(MAN)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/ssvnc-gui.1
>++	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-gui  $(PREFIX)/$(LIB)/ssvnc
>++	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-stunnel  $(PREFIX)/$(LIB)/util/ss_vncviewer
>+ 	if [ "X$(APPS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(APPS); fi
>+ 	if [ "X$(APPS)" != X ]; then cp -p ssvnc.desktop $(ROOT)$(PREFIX)/$(APPS); fi
>+ 	if [ "X$(BINNAME)" != X ]; then cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(BIN)/$(BINNAME); fi
>+ 	if [ "X$(BINNAME)" != X ]; then cp -p $(MAN)/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/$(BINNAME).1; fi
>++	if [ "X$(DOCS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(DOCS); fi
>++	if [ "X$(DOCS)" != X ]; then cp -p scripts/util/stunnel-server.conf $(ROOT)$(PREFIX)/$(DOCS); fi
>++	if [ "X$(DOCS)" != X ]; then cp -p README $(ROOT)$(PREFIX)/$(DOCS); fi
>+ 
>+ 
>+ #internal use only, a test install:
>diff -ruN ssvnc.orig/files/patch-build.unix ssvnc/files/patch-build.unix
>--- ssvnc.orig/files/patch-build.unix	2009-05-05 18:03:38.000000000 +0200
>+++ ssvnc/files/patch-build.unix	1970-01-01 01:00:00.000000000 +0100
>@@ -1,47 +0,0 @@
>---- ./build.unix.orig	Sat Apr 21 20:10:49 2007
>-+++ ./build.unix	Mon Apr 23 21:43:58 2007
>-@@ -77,12 +77,13 @@
>- 
>- # Create a tmp dir for this build:
>- #
>--tmp=./src/tmp/$name.$$
>-+tmp=./src/tmp/$name
>- if [ "X$TMPDIR" != "X" ]; then
>- 	tmp="$TMPDIR/$tmp"
>- fi
>- mkdir -p $tmp || exit 1
>- 
>-+if false; then
>- # Try to find some static archives of various libraries:
>- #
>- libs="$tmp/libs"
>-@@ -108,6 +109,7 @@
>- ls -ld $libs
>- ls -l $libs
>- echo
>-+fi
>- 
>- have_gcc=""
>- if type gcc > /dev/null; then
>-@@ -203,7 +205,7 @@
>- xmkmf
>- make Makefiles
>- mv vncviewer/Makefile vncviewer/Makefile.orig
>--sed -e "s,EXTRA_LDOPTIONS =,EXTRA_LDOPTIONS = -L$start/$libs $LDFLAGS_OS," \
>-+sed -e "s,EXTRA_LDOPTIONS =,EXTRA_LDOPTIONS = $LDFLAGS_OS," \
>-     -e "s,CCOPTIONS =,CCOPTIONS = $CPPFLAGS_OS," \
>- 	vncviewer/Makefile.orig > vncviewer/Makefile
>- 
>-@@ -245,6 +247,7 @@
>- $LDD $dest/vncviewer$suff
>- echo ""
>- 
>-+if false; then
>- # Do stunnel:
>- #
>- stunnel_src=`ls -td ./src/stunnel* | head -1`
>-@@ -322,3 +325,4 @@
>- 
>- $dest/vncviewer$suff -h
>- $LDD $dest/vncviewer$suff
>-+fi
>diff -ruN ssvnc.orig/pkg-message ssvnc/pkg-message
>--- ssvnc.orig/pkg-message	2009-05-05 18:03:44.000000000 +0200
>+++ ssvnc/pkg-message	2009-05-05 18:04:02.000000000 +0200
>@@ -2,7 +2,7 @@
> 
> SSVNC has been installed, and the following commands are available:
> 
>-ssvnc		- SSVNC viewer
>+ssvncviewer	- SSVNC viewer
> ssvnc-stunnel	- Wrapper script for SSVNC + stunnel (SSH/SSL tunnels)
> ssvnc-gui	- GUI for the previous commands
> 
>diff -ruN ssvnc.orig/pkg-plist ssvnc/pkg-plist
>--- ssvnc.orig/pkg-plist	2009-05-05 18:03:44.000000000 +0200
>+++ ssvnc/pkg-plist	2009-05-05 18:04:02.000000000 +0200
>@@ -1,6 +1,19 @@
>-bin/ssvnc
> bin/ssvnc-gui
> bin/ssvnc-stunnel
>+bin/ssvncviewer
>+%%DESKTOPDIR%%ssvnc.desktop
>+%%LIBDIR%%/lim_accept.so
>+%%LIBDIR%%/ssvnc
>+%%LIBDIR%%/ssvnc_cmd
>+%%LIBDIR%%/ultravnc_dsm_helper
>+%%LIBDIR%%/unwrap.so
>+%%LIBDIR%%/util/ss_vncviewer
>+%%LIBDIR%%/util/ssvnc.tcl
>+%%LIBDIR%%/vncstorepw
>+%%LIBDIR%%/vncviewer
>+%%ULTRAFTP%%%%LIBDIR%%/ultraftp.jar
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/stunnel-server.conf
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrmtry %%LIBDIR%%/util
>+@dirrmtry %%LIBDIR%%

Actions: View | Diff

Attachments on bug 134236: 95773