Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jan 2003 16:45:20 -0500 (EST)
From:      Munish Chopra <mchopra@engmail.uwaterloo.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/46842: Update port: net/vnc
Message-ID:  <200301072145.h07LjKYg006870@opiate.thirteenandtwo.org>

next in thread | raw e-mail | index | archive | help

>Number:         46842
>Category:       ports
>Synopsis:       Update port: net/vnc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 07 13:50:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Munish Chopra
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD opiate.thirteenandtwo.org 5.0-CURRENT FreeBSD 5.0-CURRENT #15: Sun Jan 5 19:13:10 EST 2003 munish@opiate.thirteenandtwo.org:/usr/src/sys/i386/compile/OPIATE i386


	
>Description:
	* Update to 3.3.6 [James Raftery <james@now.ie>]
	* Add WITHOUT_SERVER knob [James Raftery <james@now.ie>]
	* Add USE_XPM [PR ports/42178]
	
	This should close ports/46106, supersede ports/46120, and also close ports/42178, since both vnc and tightvnc need libXpm.
>How-To-Repeat:
	
>Fix:

	

--- vnc.diff begins here ---
diff -ruN /usr/ports/net/vnc/Makefile vnc/Makefile
--- /usr/ports/net/vnc/Makefile	Mon Nov 25 21:26:40 2002
+++ vnc/Makefile	Tue Jan  7 16:39:25 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vnc
-PORTVERSION=	3.3.5
+PORTVERSION=	3.3.6
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.realvnc.com/dist/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-unixsrc
@@ -14,34 +14,71 @@
 MAINTAINER=	mchopra@engmail.uwaterloo.ca
 
 GNU_CONFIGURE=	yes
-USE_PERL5_RUN=	yes
 USE_REINPLACE=	yes
 USE_XLIB=	yes
+USE_XPM=	yes
+
+PLIST=		${WRKDIR}/pkg-plist
 
-MAN1=		Xvnc.1 \
-		vncviewer.1 \
+MAN1=		vncviewer.1 \
 		vncpasswd.1 \
-		vncconnect.1 \
+		vncconnect.1
+
+.if !defined(WITHOUT_SERVER)
+MAN1+=		Xvnc.1 \
 		vncserver.1
 
+USE_PERL5_RUN=	yes
+.endif
+
 post-build:
+.if defined(WITHOUT_SERVER)
+	@${ECHO_MSG} "Skipping build of VNC server."
+.else
 	@cd ${WRKSRC}/Xvnc && make World
+.endif
+
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} -f ${PLIST}
+.if !defined(WITHOUT_SERVER)
+	@${ECHO_CMD} bin/Xvnc >> ${PLIST}
+	@${ECHO_CMD} bin/vncserver >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/DesCipher.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/animatedMemoryImageSource.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/authenticationPanel.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/clipboardFrame.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/index.vnc >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/optionsFrame.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/rfbProto.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/shared.vnc >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/vncCanvas.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/vncviewer.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/vncviewer.jar >> ${PLIST}
+	@${ECHO_CMD} @dirrm share/vnc/classes >> ${PLIST}
+	@${ECHO_CMD} @dirrm share/vnc >> ${PLIST}
+.endif
+	@${ECHO_CMD} bin/vncviewer >> ${PLIST}
+	@${ECHO_CMD} bin/vncpasswd >> ${PLIST}
+	@${ECHO_CMD} bin/vncconnect >> ${PLIST}
 
 do-install:
+.if !defined(WITHOUT_SERVER)
 	${REINPLACE_CMD} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
 		-e 's|^\#!/usr/bin/perl|\#!${PERL}|g' ${WRKSRC}/vncserver
 	${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
+.endif
+	${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_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
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/net/vnc/distinfo vnc/distinfo
--- /usr/ports/net/vnc/distinfo	Mon Nov 25 06:15:50 2002
+++ vnc/distinfo	Tue Jan  7 16:33:36 2003
@@ -1 +1 @@
-MD5 (vnc-3.3.5-unixsrc.tar.gz) = cd1d0cfa4ae7d43d3cbf994b40018f3e
+MD5 (vnc-3.3.6-unixsrc.tar.gz) = 9ab3d27e4b34540baaaa02527938330a
--- vnc.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301072145.h07LjKYg006870>