3 files changed, 62 insertions, 78 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 5974fb544eaf..9bfd46e2d4f3 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -8,71 +8,63 @@
 PORTNAME=	vnc
 PORTVERSION=	4.1.1
 CATEGORIES=	net ipv6
-# This is a placeholder MASTER_SITES entry -- see the pre-fetch target.
 MASTER_SITES=	http://www.realvnc.com/:vnc
-.if !defined(WITHOUT_SERVER)
-MASTER_SITES+=	${MASTER_SITE_XFREE:S/$/:x/}
-MASTER_SITE_SUBDIR+=	4.3.0/:x
-.endif
 DISTNAME=	vnc-4_1_1-unixsrc
-DISTFILES=	vnc-4_1_1-unixsrc.tar.gz:vnc
-.if !defined(WITHOUT_SERVER)
-DISTFILES+=	X430src-1.tgz:x \
-		X430src-2.tgz:x \
-		X430src-3.tgz:x
-.endif
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:vnc
 DIST_SUBDIR=	xc
 
 MAINTAINER=	james@now.ie
 COMMENT=	Display X and Win32 desktops on remote X/Win32/Java displays
 
-.if !defined(WITHOUT_SERVER)
-RUN_DEPENDS=	xauth:${X_CLIENTS_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT}
-
-USE_PERL5=	yes
-
-EXTRA_PATCHES=	${WRKSRC}/xc.patch \
-		${PATCHDIR}/vnc.def-patch \
-		${PATCHDIR}/FreeBSD.cf-patch
-.endif
-
 GNU_CONFIGURE=	yes
 # The vnc supplied zlib seg. faults if compiled with -O
 CONFIGURE_ARGS=	--with-installed-zlib
 USE_GCC=	3.4
-USE_REINPLACE=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 PLIST=		${WRKDIR}/pkg-plist
-CONFLICTS=	vnc-[0-9]* tightvnc-[0-9]*
+CONFLICTS=	tightvnc-[0-9]*
+
+OPTIONS=	SERVER "Install VNC server components" on
 
 MAN1=		vncviewer.1 \
 		vncpasswd.1 \
 		vncconfig.1 \
 		x0vncserver.1
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_SERVER)
+# This is a placeholder MASTER_SITES entry -- see the pre-fetch target.
+MASTER_SITES+=	${MASTER_SITE_XFREE:S/$/:x/}
+MASTER_SITE_SUBDIR+=	4.3.0/:x
+DISTFILES+=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x
+
+RUN_DEPENDS+=	xauth:${X_CLIENTS_PORT} \
+		${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT}
+
+USE_PERL5=	yes
+
+EXTRA_PATCHES+=	${WRKSRC}/xc.patch \
+		${PATCHDIR}/vnc.def-patch \
+		${PATCHDIR}/FreeBSD.cf-patch
+
 MAN1+=		Xvnc.1 \
 		vncserver.1
-.endif
 
-.include <bsd.port.pre.mk>
+PLIST_SUB+=	SERVER=""
+.else
+PLIST_SUB+=	SERVER="@comment "
+.endif
 
 # No direct URL for VNC -- have to pseudo-submit their webform.
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && cd ${DISTDIR}/${DIST_SUBDIR} && \
 	${FETCH_CMD} -o ${DISTNAME}.tar.gz 'http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&acceptLicense=1&filever=4.1.1&filetype=tar_gz&haveDetails=1'
-.if !defined(WITHOUT_SERVER)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " ######################################################"
-	@${ECHO_MSG} " # Use 'make -DWITHOUT_SERVER ...' if you do not wish #"
-	@${ECHO_MSG} " # to compile/install the VNC server components.      #"
-	@${ECHO_MSG} " ######################################################"
-	@${ECHO_MSG} ""
-.endif
 
 post-extract:
 .if !defined(WITHOUT_SERVER)
@@ -96,58 +88,39 @@ post-build:
 .endif
 
 pre-install:
-	@${RM} -f ${PLIST}
-	@${TOUCH} -f ${PLIST}
-	@${ECHO_CMD} bin/vncviewer >> ${PLIST}
-	@${ECHO_CMD} bin/vncpasswd >> ${PLIST}
-	@${ECHO_CMD} bin/vncconfig >> ${PLIST}
-	@${ECHO_CMD} bin/x0vncserver >> ${PLIST}
+	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
 .if !defined(WITHOUT_SERVER)
-	@${ECHO_CMD} bin/Xvnc >> ${PLIST}
-	@${ECHO_CMD} bin/vncserver >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/index.vnc >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/logo150x150.gif >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/vncviewer.jar >> ${PLIST}
-	@${ECHO_CMD} @dirrm share/vnc/classes >> ${PLIST}
-	@${ECHO_CMD} @dirrm share/vnc >> ${PLIST}
 	@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
-		${ECHO_CMD} @cwd ${X11BASE} >> ${PLIST} ; \
-		${ECHO_CMD} lib/modules/extensions/vnc.so >> ${PLIST} ; \
-		${ECHO_CMD} "@dirrmtry lib/modules/extensions" >> ${PLIST} ; \
-		${ECHO_CMD} "@dirrmtry lib/modules" >> ${PLIST} ; \
-		${ECHO_CMD} "@dirrmtry lib" >> ${PLIST} ; \
-	fi
+		${ECHO_CMD} @cwd ${X11BASE} ; \
+		${ECHO_CMD} lib/modules/extensions/vnc.so ; \
+		${ECHO_CMD} "@dirrmtry lib/modules/extensions" ; \
+		${ECHO_CMD} "@dirrmtry lib/modules" ; \
+		${ECHO_CMD} "@dirrmtry lib" ; \
+	fi >> ${PLIST}
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
-	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
-	${INSTALL_PROGRAM} ${WRKSRC}/vncconfig/vncconfig ${PREFIX}/bin/vncconfig
-	${INSTALL_PROGRAM} ${WRKSRC}/x0vncserver/x0vncserver \
-		${PREFIX}/bin/x0vncserver
-	${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}/vncconfig/vncconfig.man \
-		${PREFIX}/man/man1/vncconfig.1
-	${INSTALL_MAN} ${WRKSRC}/x0vncserver/x0vncserver.man \
-		${PREFIX}/man/man1/x0vncserver.1
+.for f in vncviewer vncpasswd vncconfig x0vncserver
+	${INSTALL_PROGRAM} ${WRKSRC}/${f}/${f} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${f}/${f}.man ${PREFIX}/man/man1/${f}.1
+.endfor
 .if !defined(WITHOUT_SERVER)
 	@${REINPLACE_CMD} -e \
-		's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
+		's|/usr/local/vnc/classes|${DATADIR}/classes|g' \
 		${WRKSRC}/vncserver
-	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
-	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver
+	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin
 	@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
-		${MKDIR} ${X11BASE}/lib/modules/extensions; \
-		${INSTALL_DATA} ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ${X11BASE}/lib/modules/extensions; \
+		${MKDIR} ${X11BASE}/lib/modules/extensions ; \
+		${INSTALL_PROGRAM} \
+			${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so \
+			${X11BASE}/lib/modules/extensions ; \
 	fi
 	${INSTALL_MAN} ${WRKSRC}/xc/programs/Xserver/Xvnc.man \
 		${PREFIX}/man/man1/Xvnc.1
 	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/man/man1/vncserver.1
-	${MKDIR} ${PREFIX}/share/vnc/classes
-	${CP} ${WRKDIR}/${DISTNAME}/common/javabin/* ${PREFIX}/share/vnc/classes
+	${MKDIR} ${DATADIR}/classes
+	${INSTALL_DATA} ${WRKSRC}/../common/javabin/* ${DATADIR}/classes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/vnc/pkg-descr b/net/vnc/pkg-descr
index 6e59c67872cd..44d4d1a24e7e 100644
--- a/net/vnc/pkg-descr
+++ b/net/vnc/pkg-descr
@@ -1,7 +1,7 @@
-"VNC stands for Virtual Network Computing. It is, in essence, a remote
- display system which allows you to view a computing 'desktop'
- environment not only on the machine where it is running, but from
- anywhere on the Internet and from a wide variety of machine
- architectures."
+VNC stands for Virtual Network Computing. It is, in essence, a remote
+display system which allows you to view a computing 'desktop'
+environment not only on the machine where it is running, but from
+anywhere on the Internet and from a wide variety of machine
+architectures.
 
 WWW: http://www.realvnc.com/
diff --git a/net/vnc/pkg-plist b/net/vnc/pkg-plist
new file mode 100644
index 000000000000..063cdd4018ad
--- /dev/null
+++ b/net/vnc/pkg-plist
@@ -0,0 +1,11 @@
+bin/vncviewer
+bin/vncpasswd
+bin/vncconfig
+bin/x0vncserver
+%%SERVER%%bin/Xvnc
+%%SERVER%%bin/vncserver
+%%SERVER%%%%DATADIR%%/classes/index.vnc
+%%SERVER%%%%DATADIR%%/classes/logo150x150.gif
+%%SERVER%%%%DATADIR%%/classes/vncviewer.jar
+%%SERVER%%@dirrm %%DATADIR%%/classes
+%%SERVER%%@dirrm %%DATADIR%%