* 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]

PR:		46842, 42178
Submitted by:	maintainer

2 files changed, 49 insertions, 12 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 7d7813ba93fe..6dfbd31439b4 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -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 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-unixsrc
 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 --git a/net/vnc/distinfo b/net/vnc/distinfo
index 6f56eb0fce9c..6b3b2199b35d 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1 +1 @@
-MD5 (vnc-3.3.5-unixsrc.tar.gz) = cd1d0cfa4ae7d43d3cbf994b40018f3e
+MD5 (vnc-3.3.6-unixsrc.tar.gz) = 9ab3d27e4b34540baaaa02527938330a