Attachment #26718 for bug #45537

View | Details | Raw Unified | Return to bug 45537
Collapse All | Expand All




#

PORTNAME=	vnc
PORTVERSION=	3.3.5
PORTREVISION=	1
CATEGORIES=	net ipv6
MASTER_SITES=	http://www.realvnc.com/dist/
DISTNAME=	${PORTNAME}-${PORTVERSION}-unixsrc

MAINTAINER=	mchopra@engmail.uwaterloo.ca

GNU_CONFIGURE=	yes
USE_PERL5_RUN=	yes
USE_REINPLACE=	yes

MAN1=		Xvnc.1 \
		vncviewer.1 \
		vncpasswd.1 \
		vncconnect.1 \
		vncserver.1

post-build:
	@cd ${WRKSRC}/Xvnc && make World

do-install:
	${REINPLACE_CMD} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
		-e 's|^\#!/usr/bin/perl|\#!${PERL}|g' ${WRKSRC}/vncserver
post-install:
	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver
	${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man ${PREFIX}/man/man1/Xvnc.1
	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1
	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/man/man1/vncpasswd.1
	${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man ${PREFIX}/man/man1/vncconnect.1
	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/man/man1/vncserver.1
# Go install Java classes
	${MKDIR} ${PREFIX}/share/vnc
	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc

# The documentation comes with bogus ownerships; this is a little leaky
# security-wise
	${TAR} -C ${PREFIX}/share/doc -xzf ${DISTDIR}/vnc-latest_doc.tgz
	(cd ${PREFIX}/share/doc; ${RM} -rf vnc; ${MV} vnc_docs vnc)
	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
# Add to PLIST because VNC developers can't/won't freeze their doc
# distfile.
	(cd ${PREFIX}; ls share/doc/vnc/* >> ${TMPPLIST})
	${ECHO_CMD} '@dirrm share/doc/vnc' >> ${TMPPLIST}
.endif
.include <bsd.port.mk>

Lines 1-3 Link Here

(-)vnc/distinfo (-3 / +1 lines)
1	MD5 (vnc-3.3.3r2_unixsrc.tgz) = 6fc83e1b6153d3252649953267713f17	1	MD5 (vnc-3.3.5-unixsrc.tar.gz) = cd1d0cfa4ae7d43d3cbf994b40018f3e
2	MD5 (vnc-3.3.3r2-v6-20010421.diff.gz) = 05b2ccf5179f61ac8a52f02693331ad6
3	MD5 (vnc-latest_doc.tgz) = IGNORE

Lines 1-10 Link Here

(-)vnc/files/patch-Xvnc-programs-Xserver-os-osinit.c (-10 lines)
1	--- Xvnc/programs/Xserver/os/osinit.c.orig Thu Nov 7 22:41:44 2002
2	+++ Xvnc/programs/Xserver/os/osinit.c Thu Nov 7 22:41:59 2002
3	@@ -48,6 +48,7 @@
4	/* $XConsortium: osinit.c /main/45 1996/12/02 10:23:13 lehors $ */
5	/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.12 1997/01/18 06:58:02 dawes Exp $ */
6
7	+#include <stdlib.h>
8	#include <stdio.h>
9	#include "X.h"
10	#include "os.h"

Lines 1-10 Link Here

(-)vnc/files/patch-Xvnc-programs-Xserver-os-transport.c (-10 lines)
1	--- Xvnc/lib/xtrans/transport.c Thu Nov 7 23:01:27 2002
2	+++ Xvnc/lib/xtrans/transport.c Thu Nov 7 23:02:10 2002
3	@@ -53,6 +53,7 @@
4	* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
5	*/
6
7	+#include <stdlib.h>
8	#ifdef XSERV_t
9	#include "os.h"
10	#else




--- Xvnc/config/imake/imakemdep.h.orig	Sat Nov 24 16:43:07 2001
+++ Xvnc/config/imake/imakemdep.h	Sat Nov 24 16:44:48 2001
@@ -225,6 +225,9 @@
 #ifdef hpux
 #define USE_CC_E
 #endif
+#if defined(__FreeBSD__)
+#define USE_CC_E
+#endif
 #ifdef WIN32
 #define USE_CC_E
 #define DEFAULT_CC "cl"
@@ -253,7 +256,7 @@
 #ifdef _CRAY
 #define DEFAULT_CPP "/lib/pcpp"
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #define DEFAULT_CPP "/usr/libexec/cpp"
 #endif
 #if defined(__sgi) && defined(__ANSI_CPP__)

Line 0 Link Here

(-)vnc/files/patch-Xvnc::include::Xos.h (+10 lines)
	1	--- Xvnc/include/Xos.h.orig Sat Jul 13 02:14:08 2002
	2	+++ Xvnc/include/Xos.h Sat Jul 13 02:14:15 2002
	3	@@ -151,7 +151,6 @@
	4	#endif /* X_NOT_POSIX else */
	5
	6	#ifdef CSRG_BASED
	7	-#include <stdlib.h>
	8	#include <unistd.h>
	9	#endif /* CSRG_BASED */
	10




--- Xvnc/programs/Xserver/dix/Imakefile.orig	Fri Mar 29 05:30:51 2002
+++ Xvnc/programs/Xserver/dix/Imakefile	Fri Mar 29 05:32:27 2002
@@ -36,15 +36,11 @@
  * changed.
  */
 
-#ifdef DefaultFontPath
-DEFAULTFONTPATH = DefaultFontPath
+DEFAULTFONTPATH = ${X11BASE}/lib/X11/fonts/misc
 SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
-#endif
 
-#ifdef DefaultRGBDatabase
-DEFAULTRGBDATABASE = DefaultRGBDatabase
+DEFAULTRGBDATABASE = ${X11BASE}/lib/X11/rgb
    SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\"
-#endif
 
 #ifdef DefaultDisplayClass
 DEFAULTDISPLAYCLASS = DefaultDisplayClass




*** Imakefile.orig	Mon May 18 06:18:46 1998
--- Imakefile	Sat Jun 20 17:24:00 1998
***************
*** 11,16 ****
--- 11,18 ----
  	@echo Built $(SUBDIRS).
  	@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
  	@echo ""
+ 	(cd Xvnc; make World)
  
  MakeSubdirs($(SUBDIRS))
  DependSubdirs($(SUBDIRS))
+ 




--- Xvnc/config/imake/imakemdep.h~	Sat Jul 26 19:41:05 1997
+++ Xvnc/config/imake/imakemdep.h	Fri Nov 26 23:21:33 1999
@@ -225,6 +225,9 @@
 #ifdef hpux
 #define USE_CC_E
 #endif
+#if defined(__FreeBSD__)
+#define  USE_CC_E
+#endif
 #ifdef WIN32
 #define USE_CC_E
 #define DEFAULT_CC "cl"
@@ -253,7 +256,7 @@
 #ifdef _CRAY
 #define DEFAULT_CPP "/lib/pcpp"
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) 
 #define DEFAULT_CPP "/usr/libexec/cpp"
 #endif
 #if defined(__sgi) && defined(__ANSI_CPP__)






*** vncviewer/Imakefile.orig	Tue Nov  7 14:08:52 2000
--- vncviewer/Imakefile	Tue Nov  7 14:09:11 2000
***************
*** 35,38 ****
  
  OBJS = $(SRCS:.c=.o)
  
! ComplexProgramTarget(vncviewer)
--- 35,38 ----
  
  OBJS = $(SRCS:.c=.o)
  
! ComplexProgramTargetNoMan(vncviewer)

Lines 4-7 Link Here

(-)vnc/pkg-descr (-1 / +1 lines)
4	anywhere on the Internet and from a wide variety of machine	4	anywhere on the Internet and from a wide variety of machine
5	architectures."	5	architectures."
6		6
7	WWW: http://www.uk.research.att.com/vnc/	7	WWW: http://www.realvnc.com

Return to bug 45537

Lines 6-57 Link Here

(-)vnc/Makefile (-40 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= vnc	8	PORTNAME= vnc
9	PORTVERSION= 3.3.3.2	9	PORTVERSION= 3.3.5
10	PORTREVISION= 1
11	CATEGORIES= net ipv6	10	CATEGORIES= net ipv6
12	MASTER_SITES= http://www.uk.research.att.com/vnc/dist/ \	11	MASTER_SITES= http://www.realvnc.com/dist/
13	ftp://ftp.uk.research.att.com/pub/vnc/dist/	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-unixsrc
14	DISTFILES= vnc-3.3.3r2_unixsrc.tgz \	13
15	vnc-latest_doc.tgz	14	MAINTAINER= mchopra@engmail.uwaterloo.ca
16	EXTRACT_ONLY= vnc-3.3.3r2_unixsrc.tgz	15
17		16	GNU_CONFIGURE= yes
18	PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/	17	USE_PERL5_RUN= yes
19	PATCHFILES= vnc-3.3.3r2-v6-20010421.diff.gz	18	USE_REINPLACE= yes
20	PATCH_DIST_STRIP= -p1	19
21		20	MAN1= Xvnc.1 \
22	MAINTAINER= ports@FreeBSD.org	21	vncviewer.1 \
23		22	vncpasswd.1 \
24	USE_PERL5= yes	23	vncconnect.1 \
25	IGNOREFILES= vnc-latest_doc.tgz	24	vncserver.1
26	WRKSRC= ${WRKDIR}/vnc_unixsrc	25
27	USE_IMAKE= yes	26	post-build:
28	NO_INSTALL_MANPAGES= yes	27	@cd ${WRKSRC}/Xvnc && make World
29	ALL_TARGET= World	28
30		29	do-install:
31	# We have to frob a few things, and we want our own permissions, so it's easier	30	${REINPLACE_CMD} -e 's\|/usr/local/vnc/classes\|${PREFIX}/share/vnc/classes\|g' \
32	# to do the install ourselves.	31	-e 's\|^\#!/usr/bin/perl\|\#!${PERL}\|g' ${WRKSRC}/vncserver
33	post-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc	32	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
35	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer	33	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
36	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd	34	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
37	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect	35	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
38	${SED} -e s%/usr/local/vnc/classes%${PREFIX}/share/vnc/classes% \	36	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver
39	-e s%^\#!/usr/bin/perl%\#!${PERL}% \	37	${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man ${PREFIX}/man/man1/Xvnc.1
40	< ${WRKSRC}/vncserver \	38	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1
41	> ${WRKSRC}/vncserver.local	39	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/man/man1/vncpasswd.1
42	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver	40	${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man ${PREFIX}/man/man1/vncconnect.1
		41	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/man/man1/vncserver.1
43	# Go install Java classes	42	# Go install Java classes
44	${MKDIR} ${PREFIX}/share/vnc	43	${MKDIR} ${PREFIX}/share/vnc
45	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc	44	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc
46	.if !defined(NOPORTDOCS)	45
47	# The documentation comes with bogus ownerships; this is a little leaky
48	# security-wise
49	${TAR} -C ${PREFIX}/share/doc -xzf ${DISTDIR}/vnc-latest_doc.tgz
50	(cd ${PREFIX}/share/doc; ${RM} -rf vnc; ${MV} vnc_docs vnc)
51	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
52	# Add to PLIST because VNC developers can't/won't freeze their doc
53	# distfile.
54	(cd ${PREFIX}; ls share/doc/vnc/* >> ${TMPPLIST})
55	${ECHO_CMD} '@dirrm share/doc/vnc' >> ${TMPPLIST}
56	.endif
57	.include <bsd.port.mk>	46	.include <bsd.port.mk>

Line 0 Link Here

(-)vnc/files/patch-Xvnc::config::imake::imakemdep.h (+21 lines)
	1	--- Xvnc/config/imake/imakemdep.h.orig Sat Nov 24 16:43:07 2001
	2	+++ Xvnc/config/imake/imakemdep.h Sat Nov 24 16:44:48 2001
	3	@@ -225,6 +225,9 @@
	4	#ifdef hpux
	5	#define USE_CC_E
	6	#endif
	7	+#if defined(__FreeBSD__)
	8	+#define USE_CC_E
	9	+#endif
	10	#ifdef WIN32
	11	#define USE_CC_E
	12	#define DEFAULT_CC "cl"
	13	@@ -253,7 +256,7 @@
	14	#ifdef _CRAY
	15	#define DEFAULT_CPP "/lib/pcpp"
	16	#endif
	17	-#if defined(__386BSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__) \|\| defined(__FreeBSD__)
	18	+#if defined(__386BSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
	19	#define DEFAULT_CPP "/usr/libexec/cpp"
	20	#endif
	21	#if defined(__sgi) && defined(__ANSI_CPP__)

Line 0 Link Here

(-)vnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile (+20 lines)
	1	--- Xvnc/programs/Xserver/dix/Imakefile.orig Fri Mar 29 05:30:51 2002
	2	+++ Xvnc/programs/Xserver/dix/Imakefile Fri Mar 29 05:32:27 2002
	3	@@ -36,15 +36,11 @@
	4	* changed.
	5	*/
	6
	7	-#ifdef DefaultFontPath
	8	-DEFAULTFONTPATH = DefaultFontPath
	9	+DEFAULTFONTPATH = ${X11BASE}/lib/X11/fonts/misc
	10	SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
	11	-#endif
	12
	13	-#ifdef DefaultRGBDatabase
	14	-DEFAULTRGBDATABASE = DefaultRGBDatabase
	15	+DEFAULTRGBDATABASE = ${X11BASE}/lib/X11/rgb
	16	SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\"
	17	-#endif
	18
	19	#ifdef DefaultDisplayClass
	20	DEFAULTDISPLAYCLASS = DefaultDisplayClass

Lines 1-13 Link Here

(-)vnc/files/patch-aa (-13 lines)
1	*** Imakefile.orig Mon May 18 06:18:46 1998
2	--- Imakefile Sat Jun 20 17:24:00 1998
3	***************
4	* 11,16 **
5	--- 11,18 ----
6	@echo Built $(SUBDIRS).
7	@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
8	@echo ""
9	+ (cd Xvnc; make World)
10
11	MakeSubdirs($(SUBDIRS))
12	DependSubdirs($(SUBDIRS))
13	+

Lines 1-23 Link Here

(-)vnc/files/patch-ad (-23 lines)
1	--- Xvnc/config/imake/imakemdep.h~ Sat Jul 26 19:41:05 1997
2	+++ Xvnc/config/imake/imakemdep.h Fri Nov 26 23:21:33 1999
3	@@ -225,6 +225,9 @@
4	#ifdef hpux
5	#define USE_CC_E
6	#endif
7	+#if defined(__FreeBSD__)
8	+#define USE_CC_E
9	+#endif
10	#ifdef WIN32
11	#define USE_CC_E
12	#define DEFAULT_CC "cl"
13	@@ -253,7 +256,7 @@
14	#ifdef _CRAY
15	#define DEFAULT_CPP "/lib/pcpp"
16	#endif
17	-#if defined(__386BSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__) \|\| defined(__FreeBSD__)
18	+#if defined(__386BSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
19	#define DEFAULT_CPP "/usr/libexec/cpp"
20	#endif
21	#if defined(__sgi) && defined(__ANSI_CPP__)
22
23

Lines 1-13 Link Here

(-)vnc/files/patch-ae (-13 lines)
1	*** vncviewer/Imakefile.orig Tue Nov 7 14:08:52 2000
2	--- vncviewer/Imakefile Tue Nov 7 14:09:11 2000
3	***************
4	* 35,38 **
5
6	OBJS = $(SRCS:.c=.o)
7
8	! ComplexProgramTarget(vncviewer)
9	--- 35,38 ----
10
11	OBJS = $(SRCS:.c=.o)
12
13	! ComplexProgramTargetNoMan(vncviewer)