From nobody@FreeBSD.org  Mon Feb 24 15:51:04 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id DD5732BF
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 24 Feb 2014 15:51:04 +0000 (UTC)
Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id AD3E51629
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 24 Feb 2014 15:51:04 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s1OFp4HU093928
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 24 Feb 2014 15:51:04 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s1OFp4Fx093904;
	Mon, 24 Feb 2014 15:51:04 GMT
	(envelope-from nobody)
Message-Id: <201402241551.s1OFp4Fx093904@cgiserv.freebsd.org>
Date: Mon, 24 Feb 2014 15:51:04 GMT
From: Koichiro IWAO <meta+ports@vmeta.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] net/tigervnc:  Fix disabling VIEWER option didn't work, support stage, etc
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         187007
>Category:       ports
>Synopsis:       [maintainer update] net/tigervnc:  Fix disabling VIEWER option didn't work, support stage, etc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 24 16:00:00 UTC 2014
>Closed-Date:    Wed Mar 12 15:25:46 UTC 2014
>Last-Modified:  Wed Mar 12 15:25:46 UTC 2014
>Originator:     Koichiro IWAO
>Release:        
>Organization:
>Environment:
>Description:
- Fix disabling VIEWER option didn't work (obtained from upstream [1])
- Add missing dependency on ImageMagick required to generate icons
  during the build and use these icons for DESKTOP_ENTRIES
- Fix paths in CONFIGURE_ARGS which refer files from other ports
- Support stage
- Bump PORTREVISION for package change


[1] http://sourceforge.net/p/tigervnc/code/5161/
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/net/tigervnc/Makefile net/tigervnc/Makefile
--- /usr/ports/net/tigervnc/Makefile	2013-12-17 03:35:21.497268972 +0900
+++ net/tigervnc/Makefile	2014-02-24 23:30:29.759848541 +0900
@@ -3,7 +3,7 @@
 
 PORTNAME=	tigervnc
 PORTVERSION=	1.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net x11-servers
 MASTER_SITES=	SF:tigervnc
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
@@ -38,11 +38,6 @@
 		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
 		xfont xproto xrandr xtrans xtst xorg-macros
 
-MAN1+=		vncpasswd.1 \
-		x0vncserver.1 \
-		vncserver.1 \
-		vncconfig.1 \
-		Xvnc.1
 CFLAGS+=	-fPIC
 
 OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER HPJPG
@@ -50,10 +45,9 @@
 VIEWER_DESC=		Build vncviewer
 HPJPG_DESC=		Build with High-Performance JPEG support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-CMAKE_ARGS=	-G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_ARGS=	-G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX}
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	libtasn1.so:${PORTSDIR}/security/libtasn1 \
@@ -82,17 +76,18 @@
 .endif
 
 .if ${PORT_OPTIONS:MVIEWER}
-CMAKE_ARGS+=	-DENABLE_VIEWER=1
+CMAKE_ARGS+=	-DBUILD_VIEWER=1
 LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png \
 		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+# ImageMagick is required to generate icons during build process
+BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 USE_XORG+=	xcursor xfixes xft xinerama
-MAN1+=		vncviewer.1
 PLIST_SUB+=	VIEWER=""
 INSTALLS_ICONS=	yes
 DESKTOP_ENTRIES=	"TigerVNC viewer" "Connect to VNC server and display remote desktop" \
-			"${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg" \
-			"vncviewer" "Network;" false
+			"${PORTNAME}" "vncviewer" "Network;" false
 .else
+CMAKE_ARGS+=	-DBUILD_VIEWER=0
 PLIST_SUB+=	VIEWER="@comment "
 .endif
 
@@ -111,16 +106,15 @@
 		--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
 		--disable-config-dbus --disable-config-hal \
 		--disable-dri2 --enable-install-libxf86config --enable-glx \
-		--with-default-font-path="catalogue:${PREFIX}/share/fonts,built-ins" \
-		--with-xkb-path=${PREFIX}/share/X11/xkb \
-		--with-xkb-output=/var/lib/xkb \
-		--with-xkb-bin-directory=${PREFIX}/bin \
-		--with-serverconfig-path=${PREFIX}/lib/X11 \
+		--with-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \
+		--with-xkb-path=${LOCALBASE}/share/X11/xkb \
+		--with-xkb-bin-directory=${LOCALBASE}/bin \
+		--with-serverconfig-path=${LOCALBASE}/lib/X11 \
 		--disable-selective-werror
 .ifdef WITH_NEW_XORG
-CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
+CONFIGURE_ARGS+=	--with-fontrootdir=${LOCALBASE}/share/fonts
 .else
-CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/share/fonts
+CONFIGURE_ARGS+=	--with-fontdir=${LOCALBASE}/share/fonts
 .endif
 
 .include <bsd.port.pre.mk>
@@ -156,9 +150,5 @@
 
 post-install:
 	@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install
-.if ${PORT_OPTIONS:MVIEWER}
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps/
-	@cd ${WRKSRC}/media/ && ${INSTALL_DATA} icons/tigervnc.svg ${PREFIX}/share/icons/hicolor/scalable/apps/
-.endif
 
 .include <bsd.port.post.mk>
diff -ruN /usr/ports/net/tigervnc/pkg-plist net/tigervnc/pkg-plist
--- /usr/ports/net/tigervnc/pkg-plist	2013-05-20 10:55:39.696574590 +0900
+++ net/tigervnc/pkg-plist	2014-02-25 00:25:10.238621742 +0900
@@ -3,23 +3,43 @@
 bin/vncpasswd
 bin/vncserver
 %%VIEWER%%bin/vncviewer
-%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg
 bin/x0vncserver
 lib/xorg/modules/extensions/libvnc.la
 lib/xorg/modules/extensions/libvnc.so
+man/man1/vncpasswd.1.gz
+man/man1/x0vncserver.1.gz
+man/man1/vncserver.1.gz
+man/man1/vncconfig.1.gz
+man/man1/Xvnc.1.gz
+%%VIEWER%%man/man1/vncviewer.1.gz
 %%NLS%%share/locale/de/LC_MESSAGES/tigervnc.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/tigervnc.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/tigervnc.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/tigervnc.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo
-%%DOCSDIR%%/README.txt
-%%DOCSDIR%%/LICENCE.TXT
-@dirrm %%DOCSDIR%%
-@unexec %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry lib/xorg/modules/extensions
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
+%%VIEWER%%share/icons/hicolor/16x16/apps/tigervnc.png
+%%VIEWER%%share/icons/hicolor/22x22/apps/tigervnc.png
+%%VIEWER%%share/icons/hicolor/24x24/apps/tigervnc.png
+%%VIEWER%%share/icons/hicolor/32x32/apps/tigervnc.png
+%%VIEWER%%share/icons/hicolor/48x48/apps/tigervnc.png
+%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg
+%%VIEWER%%@dirrmtry share/icons/hicolor/48x48/apps
+%%VIEWER%%@dirrmtry share/icons/hicolor/48x48
+%%VIEWER%%@dirrmtry share/icons/hicolor/32x32/apps
+%%VIEWER%%@dirrmtry share/icons/hicolor/32x32
+%%VIEWER%%@dirrmtry share/icons/hicolor/24x24/apps
+%%VIEWER%%@dirrmtry share/icons/hicolor/24x24
+%%VIEWER%%@dirrmtry share/icons/hicolor/22x22/apps
+%%VIEWER%%@dirrmtry share/icons/hicolor/22x22
+%%VIEWER%%@dirrmtry share/icons/hicolor/16x16/apps
+%%VIEWER%%@dirrmtry share/icons/hicolor/16x16
 %%VIEWER%%@dirrmtry share/icons/hicolor/scalable/apps
 %%VIEWER%%@dirrmtry share/icons/hicolor/scalable
 %%VIEWER%%@dirrmtry share/icons/hicolor


>Release-Note:
>Audit-Trail:

From: Koichiro IWAO <meta+ports@vmeta.jp>
To: bug-followup@freebsd.org, meta+ports@vmeta.jp, swills@freebsd.org
Cc:  
Subject: Re: misc/187007: [maintainer update] net/tigervnc:  Fix disabling
 VIEWER option didn't work, support stage, etc
Date: Tue, 25 Feb 2014 01:12:43 +0900

 Oops, ports PR.
 Steve, please take.
 
 -- 
 `whois vmeta.jp | nkf -w`
 meta <meta@vmeta.jp>

From: Koichiro IWAO <meta@vmeta.jp>
To: bug-followup@freebsd.org, meta+ports@vmeta.jp
Cc:  
Subject: Re: misc/187007: [maintainer update] net/tigervnc:  Fix disabling
 VIEWER option didn't work, support stage, etc
Date: Tue, 25 Feb 2014 01:35:54 +0900

 --=_0f069b64d4ff01bac4e35fb9bcc6f62f
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset=UTF-8;
  format=flowed
 
 The first patch misses the patch [1].
 Please take this.
 
 -- 
 `whois vmeta.jp | nkf -w`
 meta <meta@vmeta.jp>
 --=_0f069b64d4ff01bac4e35fb9bcc6f62f
 Content-Transfer-Encoding: base64
 Content-Type: text/plain;
  name=patch-tigervnc-1.3.0_4.txt
 Content-Disposition: attachment;
  filename=patch-tigervnc-1.3.0_4.txt;
  size=6183
 
 ZGlmZiAtcnVOIC91c3IvcG9ydHMvbmV0L3RpZ2Vydm5jL01ha2VmaWxlIG5ldC90aWdlcnZuYy9N
 YWtlZmlsZQotLS0gL3Vzci9wb3J0cy9uZXQvdGlnZXJ2bmMvTWFrZWZpbGUJMjAxMy0xMi0xNyAw
 MzozNToyMS40OTcyNjg5NzIgKzA5MDAKKysrIG5ldC90aWdlcnZuYy9NYWtlZmlsZQkyMDE0LTAy
 LTI0IDIzOjMwOjI5Ljc1OTg0ODU0MSArMDkwMApAQCAtMyw3ICszLDcgQEAKIAogUE9SVE5BTUU9
 CXRpZ2Vydm5jCiBQT1JUVkVSU0lPTj0JMS4zLjAKLVBPUlRSRVZJU0lPTj0JMworUE9SVFJFVklT
 SU9OPQk0CiBDQVRFR09SSUVTPQluZXQgeDExLXNlcnZlcnMKIE1BU1RFUl9TSVRFUz0JU0Y6dGln
 ZXJ2bmMKIE1BU1RFUl9TSVRFX1NVQkRJUj0JJHtQT1JUTkFNRX0vJHtQT1JUTkFNRX0vJHtQT1JU
 VkVSU0lPTn0vOnRpZ2Vydm5jCkBAIC0zOCwxMSArMzgsNiBAQAogCQlzY3Juc2F2ZXJwcm90byB2
 aWRlb3Byb3RvIHhhdSB4ZG1jcCB4ZXh0IHhrYmZpbGUgeGNtaXNjcHJvdG8geGV4dHByb3RvIFwK
 IAkJeGZvbnQgeHByb3RvIHhyYW5kciB4dHJhbnMgeHRzdCB4b3JnLW1hY3JvcwogCi1NQU4xKz0J
 CXZuY3Bhc3N3ZC4xIFwKLQkJeDB2bmNzZXJ2ZXIuMSBcCi0JCXZuY3NlcnZlci4xIFwKLQkJdm5j
 Y29uZmlnLjEgXAotCQlYdm5jLjEKIENGTEFHUys9CS1mUElDCiAKIE9QVElPTlNfREVGSU5FPQkJ
 R05VVExTIE5MUyBQQU0gVklFV0VSIEhQSlBHCkBAIC01MCwxMCArNDUsOSBAQAogVklFV0VSX0RF
 U0M9CQlCdWlsZCB2bmN2aWV3ZXIKIEhQSlBHX0RFU0M9CQlCdWlsZCB3aXRoIEhpZ2gtUGVyZm9y
 bWFuY2UgSlBFRyBzdXBwb3J0CiAKLU5PX1NUQUdFPQl5ZXMKIC5pbmNsdWRlIDxic2QucG9ydC5v
 cHRpb25zLm1rPgogCi1DTUFLRV9BUkdTPQktRyAiVW5peCBNYWtlZmlsZXMiIC1EQ01BS0VfSU5T
 VEFMTF9QUkVGSVg9JHtQUkVGSVh9CitDTUFLRV9BUkdTPQktRyAiVW5peCBNYWtlZmlsZXMiIC1E
 Q01BS0VfSU5TVEFMTF9QUkVGSVg9JHtTVEFHRX0ke1BSRUZJWH0KIAogLmlmICR7UE9SVF9PUFRJ
 T05TOk1HTlVUTFN9CiBMSUJfREVQRU5EUys9CWxpYnRhc24xLnNvOiR7UE9SVFNESVJ9L3NlY3Vy
 aXR5L2xpYnRhc24xIFwKQEAgLTgyLDE3ICs3NiwxOCBAQAogLmVuZGlmCiAKIC5pZiAke1BPUlRf
 T1BUSU9OUzpNVklFV0VSfQotQ01BS0VfQVJHUys9CS1ERU5BQkxFX1ZJRVdFUj0xCitDTUFLRV9B
 UkdTKz0JLURCVUlMRF9WSUVXRVI9MQogTElCX0RFUEVORFMrPQlsaWJwbmcxNS5zbzoke1BPUlRT
 RElSfS9ncmFwaGljcy9wbmcgXAogCQlsaWJmbHRrLnNvOiR7UE9SVFNESVJ9L3gxMS10b29sa2l0
 cy9mbHRrCisjIEltYWdlTWFnaWNrIGlzIHJlcXVpcmVkIHRvIGdlbmVyYXRlIGljb25zIGR1cmlu
 ZyBidWlsZCBwcm9jZXNzCitCVUlMRF9ERVBFTkRTKz0gJHtMT0NBTEJBU0V9L2Jpbi9jb252ZXJ0
 OiR7UE9SVFNESVJ9L2dyYXBoaWNzL0ltYWdlTWFnaWNrCiBVU0VfWE9SRys9CXhjdXJzb3IgeGZp
 eGVzIHhmdCB4aW5lcmFtYQotTUFOMSs9CQl2bmN2aWV3ZXIuMQogUExJU1RfU1VCKz0JVklFV0VS
 PSIiCiBJTlNUQUxMU19JQ09OUz0JeWVzCiBERVNLVE9QX0VOVFJJRVM9CSJUaWdlclZOQyB2aWV3
 ZXIiICJDb25uZWN0IHRvIFZOQyBzZXJ2ZXIgYW5kIGRpc3BsYXkgcmVtb3RlIGRlc2t0b3AiIFwK
 LQkJCSIke1BSRUZJWH0vc2hhcmUvaWNvbnMvaGljb2xvci9zY2FsYWJsZS9hcHBzLyR7UE9SVE5B
 TUV9LnN2ZyIgXAotCQkJInZuY3ZpZXdlciIgIk5ldHdvcms7IiBmYWxzZQorCQkJIiR7UE9SVE5B
 TUV9IiAidm5jdmlld2VyIiAiTmV0d29yazsiIGZhbHNlCiAuZWxzZQorQ01BS0VfQVJHUys9CS1E
 QlVJTERfVklFV0VSPTAKIFBMSVNUX1NVQis9CVZJRVdFUj0iQGNvbW1lbnQgIgogLmVuZGlmCiAK
 QEAgLTExMSwxNiArMTA2LDE1IEBACiAJCS0tZGlzYWJsZS1kbXggLS1kaXNhYmxlLXh3aW4gLS1k
 aXNhYmxlLXhlcGh5ciAtLWRpc2FibGUta2RyaXZlIFwKIAkJLS1kaXNhYmxlLWNvbmZpZy1kYnVz
 IC0tZGlzYWJsZS1jb25maWctaGFsIFwKIAkJLS1kaXNhYmxlLWRyaTIgLS1lbmFibGUtaW5zdGFs
 bC1saWJ4Zjg2Y29uZmlnIC0tZW5hYmxlLWdseCBcCi0JCS0td2l0aC1kZWZhdWx0LWZvbnQtcGF0
 aD0iY2F0YWxvZ3VlOiR7UFJFRklYfS9zaGFyZS9mb250cyxidWlsdC1pbnMiIFwKLQkJLS13aXRo
 LXhrYi1wYXRoPSR7UFJFRklYfS9zaGFyZS9YMTEveGtiIFwKLQkJLS13aXRoLXhrYi1vdXRwdXQ9
 L3Zhci9saWIveGtiIFwKLQkJLS13aXRoLXhrYi1iaW4tZGlyZWN0b3J5PSR7UFJFRklYfS9iaW4g
 XAotCQktLXdpdGgtc2VydmVyY29uZmlnLXBhdGg9JHtQUkVGSVh9L2xpYi9YMTEgXAorCQktLXdp
 dGgtZGVmYXVsdC1mb250LXBhdGg9ImNhdGFsb2d1ZToke0xPQ0FMQkFTRX0vc2hhcmUvZm9udHMs
 YnVpbHQtaW5zIiBcCisJCS0td2l0aC14a2ItcGF0aD0ke0xPQ0FMQkFTRX0vc2hhcmUvWDExL3hr
 YiBcCisJCS0td2l0aC14a2ItYmluLWRpcmVjdG9yeT0ke0xPQ0FMQkFTRX0vYmluIFwKKwkJLS13
 aXRoLXNlcnZlcmNvbmZpZy1wYXRoPSR7TE9DQUxCQVNFfS9saWIvWDExIFwKIAkJLS1kaXNhYmxl
 LXNlbGVjdGl2ZS13ZXJyb3IKIC5pZmRlZiBXSVRIX05FV19YT1JHCi1DT05GSUdVUkVfQVJHUys9
 CS0td2l0aC1mb250cm9vdGRpcj0ke1BSRUZJWH0vc2hhcmUvZm9udHMKK0NPTkZJR1VSRV9BUkdT
 Kz0JLS13aXRoLWZvbnRyb290ZGlyPSR7TE9DQUxCQVNFfS9zaGFyZS9mb250cwogLmVsc2UKLUNP
 TkZJR1VSRV9BUkdTKz0JLS13aXRoLWZvbnRkaXI9JHtQUkVGSVh9L3NoYXJlL2ZvbnRzCitDT05G
 SUdVUkVfQVJHUys9CS0td2l0aC1mb250ZGlyPSR7TE9DQUxCQVNFfS9zaGFyZS9mb250cwogLmVu
 ZGlmCiAKIC5pbmNsdWRlIDxic2QucG9ydC5wcmUubWs+CkBAIC0xNTYsOSArMTUwLDUgQEAKIAog
 cG9zdC1pbnN0YWxsOgogCUBjZCAke1dSS1NSQ30vdW5peC94c2VydmVyL2h3L3ZuYy8gJiYgJHtT
 RVRFTlZ9ICR7TUFLRV9FTlZ9ICR7R01BS0V9ICR7TUFLRV9BUkdTfSBpbnN0YWxsCi0uaWYgJHtQ
 T1JUX09QVElPTlM6TVZJRVdFUn0KLQlAJHtNS0RJUn0gJHtQUkVGSVh9L3NoYXJlL2ljb25zL2hp
 Y29sb3Ivc2NhbGFibGUvYXBwcy8KLQlAY2QgJHtXUktTUkN9L21lZGlhLyAmJiAke0lOU1RBTExf
 REFUQX0gaWNvbnMvdGlnZXJ2bmMuc3ZnICR7UFJFRklYfS9zaGFyZS9pY29ucy9oaWNvbG9yL3Nj
 YWxhYmxlL2FwcHMvCi0uZW5kaWYKIAogLmluY2x1ZGUgPGJzZC5wb3J0LnBvc3QubWs+CmRpZmYg
 LXJ1TiAvdXNyL3BvcnRzL25ldC90aWdlcnZuYy9maWxlcy9wYXRjaC12bmN2aWV3ZXItYWx3YXlz
 LWJ1aWx0IG5ldC90aWdlcnZuYy9maWxlcy9wYXRjaC12bmN2aWV3ZXItYWx3YXlzLWJ1aWx0Ci0t
 LSAvdXNyL3BvcnRzL25ldC90aWdlcnZuYy9maWxlcy9wYXRjaC12bmN2aWV3ZXItYWx3YXlzLWJ1
 aWx0CTE5NzAtMDEtMDEgMDk6MDA6MDAuMDAwMDAwMDAwICswOTAwCisrKyBuZXQvdGlnZXJ2bmMv
 ZmlsZXMvcGF0Y2gtdm5jdmlld2VyLWFsd2F5cy1idWlsdAkyMDE0LTAyLTI1IDAxOjMxOjUxLjI4
 MzM0NjQxNiArMDkwMApAQCAtMCwwICsxLDE5IEBACitJbmRleDogQ01ha2VMaXN0cy50eHQKKz09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT0KKy0tLSBDTWFrZUxpc3RzLnR4dAkocmV2aXNpb24gNTE1OSkKKysrKyBDTWFrZUxp
 c3RzLnR4dAkod29ya2luZyBjb3B5KQorQEAgLTM5MCw5ICszOTAsMTIgQEAKKyAgIGFkZF9zdWJk
 aXJlY3RvcnkocG8pCisgZW5kaWYoKQorIAorLWFkZF9zdWJkaXJlY3Rvcnkodm5jdmlld2VyKQor
 K29wdGlvbihCVUlMRF9WSUVXRVIgIkJ1aWxkIFRpZ2VyVk5DIHZpZXdlciIgT04pCisraWYoQlVJ
 TERfVklFV0VSKQorKyAgYWRkX3N1YmRpcmVjdG9yeSh2bmN2aWV3ZXIpCisrICBhZGRfc3ViZGly
 ZWN0b3J5KG1lZGlhKQorK2VuZGlmKCkKKyAKKy1hZGRfc3ViZGlyZWN0b3J5KG1lZGlhKQorIAor
 IGluY2x1ZGUoY21ha2UvQnVpbGRQYWNrYWdlcy5jbWFrZSkKKyAKZGlmZiAtcnVOIC91c3IvcG9y
 dHMvbmV0L3RpZ2Vydm5jL3BrZy1wbGlzdCBuZXQvdGlnZXJ2bmMvcGtnLXBsaXN0Ci0tLSAvdXNy
 L3BvcnRzL25ldC90aWdlcnZuYy9wa2ctcGxpc3QJMjAxMy0wNS0yMCAxMDo1NTozOS42OTY1NzQ1
 OTAgKzA5MDAKKysrIG5ldC90aWdlcnZuYy9wa2ctcGxpc3QJMjAxNC0wMi0yNSAwMDoyNToxMC4y
 Mzg2MjE3NDIgKzA5MDAKQEAgLTMsMjMgKzMsNDMgQEAKIGJpbi92bmNwYXNzd2QKIGJpbi92bmNz
 ZXJ2ZXIKICUlVklFV0VSJSViaW4vdm5jdmlld2VyCi0lJVZJRVdFUiUlc2hhcmUvaWNvbnMvaGlj
 b2xvci9zY2FsYWJsZS9hcHBzL3RpZ2Vydm5jLnN2ZwogYmluL3gwdm5jc2VydmVyCiBsaWIveG9y
 Zy9tb2R1bGVzL2V4dGVuc2lvbnMvbGlidm5jLmxhCiBsaWIveG9yZy9tb2R1bGVzL2V4dGVuc2lv
 bnMvbGlidm5jLnNvCittYW4vbWFuMS92bmNwYXNzd2QuMS5negorbWFuL21hbjEveDB2bmNzZXJ2
 ZXIuMS5negorbWFuL21hbjEvdm5jc2VydmVyLjEuZ3oKK21hbi9tYW4xL3ZuY2NvbmZpZy4xLmd6
 CittYW4vbWFuMS9Ydm5jLjEuZ3oKKyUlVklFV0VSJSVtYW4vbWFuMS92bmN2aWV3ZXIuMS5negog
 JSVOTFMlJXNoYXJlL2xvY2FsZS9kZS9MQ19NRVNTQUdFUy90aWdlcnZuYy5tbwogJSVOTFMlJXNo
 YXJlL2xvY2FsZS9mci9MQ19NRVNTQUdFUy90aWdlcnZuYy5tbwogJSVOTFMlJXNoYXJlL2xvY2Fs
 ZS9wbC9MQ19NRVNTQUdFUy90aWdlcnZuYy5tbwogJSVOTFMlJXNoYXJlL2xvY2FsZS9ydS9MQ19N
 RVNTQUdFUy90aWdlcnZuYy5tbwogJSVOTFMlJXNoYXJlL2xvY2FsZS9zay9MQ19NRVNTQUdFUy90
 aWdlcnZuYy5tbwogJSVOTFMlJXNoYXJlL2xvY2FsZS9zdi9MQ19NRVNTQUdFUy90aWdlcnZuYy5t
 bwotJSVET0NTRElSJSUvUkVBRE1FLnR4dAotJSVET0NTRElSJSUvTElDRU5DRS5UWFQKLUBkaXJy
 bSAlJURPQ1NESVIlJQotQHVuZXhlYyAlRC8lJURPQ1NESVIlJSAyPi9kZXYvbnVsbCB8fCB0cnVl
 CislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9SRUFETUUudHh0CislJVBPUlRET0NTJSUlJURPQ1NE
 SVIlJS9MSUNFTkNFLlRYVAorJSVQT1JURE9DUyUlQGRpcnJtICUlRE9DU0RJUiUlCiBAZGlycm10
 cnkgbGliL3hvcmcvbW9kdWxlcy9leHRlbnNpb25zCiBAZGlycm10cnkgbGliL3hvcmcvbW9kdWxl
 cwogQGRpcnJtdHJ5IGxpYi94b3JnCislJVZJRVdFUiUlc2hhcmUvaWNvbnMvaGljb2xvci8xNngx
 Ni9hcHBzL3RpZ2Vydm5jLnBuZworJSVWSUVXRVIlJXNoYXJlL2ljb25zL2hpY29sb3IvMjJ4MjIv
 YXBwcy90aWdlcnZuYy5wbmcKKyUlVklFV0VSJSVzaGFyZS9pY29ucy9oaWNvbG9yLzI0eDI0L2Fw
 cHMvdGlnZXJ2bmMucG5nCislJVZJRVdFUiUlc2hhcmUvaWNvbnMvaGljb2xvci8zMngzMi9hcHBz
 L3RpZ2Vydm5jLnBuZworJSVWSUVXRVIlJXNoYXJlL2ljb25zL2hpY29sb3IvNDh4NDgvYXBwcy90
 aWdlcnZuYy5wbmcKKyUlVklFV0VSJSVzaGFyZS9pY29ucy9oaWNvbG9yL3NjYWxhYmxlL2FwcHMv
 dGlnZXJ2bmMuc3ZnCislJVZJRVdFUiUlQGRpcnJtdHJ5IHNoYXJlL2ljb25zL2hpY29sb3IvNDh4
 NDgvYXBwcworJSVWSUVXRVIlJUBkaXJybXRyeSBzaGFyZS9pY29ucy9oaWNvbG9yLzQ4eDQ4Cisl
 JVZJRVdFUiUlQGRpcnJtdHJ5IHNoYXJlL2ljb25zL2hpY29sb3IvMzJ4MzIvYXBwcworJSVWSUVX
 RVIlJUBkaXJybXRyeSBzaGFyZS9pY29ucy9oaWNvbG9yLzMyeDMyCislJVZJRVdFUiUlQGRpcnJt
 dHJ5IHNoYXJlL2ljb25zL2hpY29sb3IvMjR4MjQvYXBwcworJSVWSUVXRVIlJUBkaXJybXRyeSBz
 aGFyZS9pY29ucy9oaWNvbG9yLzI0eDI0CislJVZJRVdFUiUlQGRpcnJtdHJ5IHNoYXJlL2ljb25z
 L2hpY29sb3IvMjJ4MjIvYXBwcworJSVWSUVXRVIlJUBkaXJybXRyeSBzaGFyZS9pY29ucy9oaWNv
 bG9yLzIyeDIyCislJVZJRVdFUiUlQGRpcnJtdHJ5IHNoYXJlL2ljb25zL2hpY29sb3IvMTZ4MTYv
 YXBwcworJSVWSUVXRVIlJUBkaXJybXRyeSBzaGFyZS9pY29ucy9oaWNvbG9yLzE2eDE2CiAlJVZJ
 RVdFUiUlQGRpcnJtdHJ5IHNoYXJlL2ljb25zL2hpY29sb3Ivc2NhbGFibGUvYXBwcwogJSVWSUVX
 RVIlJUBkaXJybXRyeSBzaGFyZS9pY29ucy9oaWNvbG9yL3NjYWxhYmxlCiAlJVZJRVdFUiUlQGRp
 cnJtdHJ5IHNoYXJlL2ljb25zL2hpY29sb3IK
 --=_0f069b64d4ff01bac4e35fb9bcc6f62f--
 
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Feb 24 22:09:43 UTC 2014 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187007 
Class-Changed-From-To: sw-bug->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Mon Feb 24 22:09:56 UTC 2014 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187007 
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Feb 24 22:09:58 UTC 2014 
Responsible-Changed-Why:  
swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187007 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187007: commit references a PR
Date: Wed, 12 Mar 2014 15:14:50 +0000 (UTC)

 Author: swills
 Date: Wed Mar 12 15:14:36 2014
 New Revision: 347981
 URL: http://svnweb.freebsd.org/changeset/ports/347981
 QAT: https://qat.redports.org/buildarchive/r347981/
 
 Log:
   - Fix disabling VIEWER option didn't work (obtained from upstream [1])
   - Add missing dependency on ImageMagick required to generate icons
     during the build and use these icons for DESKTOP_ENTRIES
   - Fix paths in CONFIGURE_ARGS which refer files from other ports
   - Support stage
   - Bump PORTREVISION for package change
   
   PR:		ports/187007
   Submitted by:	Koichiro IWAO <meta+ports@vmeta.jp> (maintainer)
   Obtained from:	http://sourceforge.net/p/tigervnc/code/5161/ [1]
 
 Added:
   head/net/tigervnc/files/patch-vncviewer-always-built   (contents, props changed)
 Modified:
   head/net/tigervnc/Makefile
   head/net/tigervnc/pkg-plist
 
 Modified: head/net/tigervnc/Makefile
 ==============================================================================
 --- head/net/tigervnc/Makefile	Wed Mar 12 15:01:49 2014	(r347980)
 +++ head/net/tigervnc/Makefile	Wed Mar 12 15:14:36 2014	(r347981)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	tigervnc
  PORTVERSION=	1.3.0
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	net x11-servers
  MASTER_SITES=	SF:tigervnc
  MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
 @@ -38,11 +38,6 @@ USE_XORG+=	bigreqsproto compositeproto d
  		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
  		xfont xproto xrandr xtrans xtst xorg-macros
  
 -MAN1+=		vncpasswd.1 \
 -		x0vncserver.1 \
 -		vncserver.1 \
 -		vncconfig.1 \
 -		Xvnc.1
  CFLAGS+=	-fPIC
  
  OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER HPJPG
 @@ -50,10 +45,9 @@ OPTIONS_DEFAULT=	GNUTLS NLS PAM VIEWER
  VIEWER_DESC=		Build vncviewer
  HPJPG_DESC=		Build with High-Performance JPEG support
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
 -CMAKE_ARGS=	-G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${PREFIX}
 +CMAKE_ARGS=	-G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX}
  
  .if ${PORT_OPTIONS:MGNUTLS}
  LIB_DEPENDS+=	libtasn1.so:${PORTSDIR}/security/libtasn1 \
 @@ -82,17 +76,18 @@ CMAKE_ARGS+=	-DENABLE_PAM=0
  .endif
  
  .if ${PORT_OPTIONS:MVIEWER}
 -CMAKE_ARGS+=	-DENABLE_VIEWER=1
 +CMAKE_ARGS+=	-DBUILD_VIEWER=1
  LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png \
  		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 +# ImageMagick is required to generate icons during build process
 +BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
  USE_XORG+=	xcursor xfixes xft xinerama
 -MAN1+=		vncviewer.1
  PLIST_SUB+=	VIEWER=""
  INSTALLS_ICONS=	yes
  DESKTOP_ENTRIES=	"TigerVNC viewer" "Connect to VNC server and display remote desktop" \
 -			"${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg" \
 -			"vncviewer" "Network;" false
 +			"${PORTNAME}" "vncviewer" "Network;" false
  .else
 +CMAKE_ARGS+=	-DBUILD_VIEWER=0
  PLIST_SUB+=	VIEWER="@comment "
  .endif
  
 @@ -111,16 +106,15 @@ CONFIGURE_ARGS+=	\
  		--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
  		--disable-config-dbus --disable-config-hal \
  		--disable-dri2 --enable-install-libxf86config --enable-glx \
 -		--with-default-font-path="catalogue:${PREFIX}/share/fonts,built-ins" \
 -		--with-xkb-path=${PREFIX}/share/X11/xkb \
 -		--with-xkb-output=/var/lib/xkb \
 -		--with-xkb-bin-directory=${PREFIX}/bin \
 -		--with-serverconfig-path=${PREFIX}/lib/X11 \
 +		--with-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \
 +		--with-xkb-path=${LOCALBASE}/share/X11/xkb \
 +		--with-xkb-bin-directory=${LOCALBASE}/bin \
 +		--with-serverconfig-path=${LOCALBASE}/lib/X11 \
  		--disable-selective-werror
  .ifdef WITH_NEW_XORG
 -CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
 +CONFIGURE_ARGS+=	--with-fontrootdir=${LOCALBASE}/share/fonts
  .else
 -CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/share/fonts
 +CONFIGURE_ARGS+=	--with-fontdir=${LOCALBASE}/share/fonts
  .endif
  
  .include <bsd.port.pre.mk>
 @@ -156,9 +150,5 @@ post-build:
  
  post-install:
  	@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install
 -.if ${PORT_OPTIONS:MVIEWER}
 -	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps/
 -	@cd ${WRKSRC}/media/ && ${INSTALL_DATA} icons/tigervnc.svg ${PREFIX}/share/icons/hicolor/scalable/apps/
 -.endif
  
  .include <bsd.port.post.mk>
 
 Added: head/net/tigervnc/files/patch-vncviewer-always-built
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/net/tigervnc/files/patch-vncviewer-always-built	Wed Mar 12 15:14:36 2014	(r347981)
 @@ -0,0 +1,19 @@
 +Index: CMakeLists.txt
 +===================================================================
 +--- CMakeLists.txt	(revision 5159)
 ++++ CMakeLists.txt	(working copy)
 +@@ -390,9 +390,12 @@
 +   add_subdirectory(po)
 + endif()
 + 
 +-add_subdirectory(vncviewer)
 ++option(BUILD_VIEWER "Build TigerVNC viewer" ON)
 ++if(BUILD_VIEWER)
 ++  add_subdirectory(vncviewer)
 ++  add_subdirectory(media)
 ++endif()
 + 
 +-add_subdirectory(media)
 + 
 + include(cmake/BuildPackages.cmake)
 + 
 
 Modified: head/net/tigervnc/pkg-plist
 ==============================================================================
 --- head/net/tigervnc/pkg-plist	Wed Mar 12 15:01:49 2014	(r347980)
 +++ head/net/tigervnc/pkg-plist	Wed Mar 12 15:14:36 2014	(r347981)
 @@ -3,23 +3,43 @@ bin/vncconfig
  bin/vncpasswd
  bin/vncserver
  %%VIEWER%%bin/vncviewer
 -%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg
  bin/x0vncserver
  lib/xorg/modules/extensions/libvnc.la
  lib/xorg/modules/extensions/libvnc.so
 +man/man1/vncpasswd.1.gz
 +man/man1/x0vncserver.1.gz
 +man/man1/vncserver.1.gz
 +man/man1/vncconfig.1.gz
 +man/man1/Xvnc.1.gz
 +%%VIEWER%%man/man1/vncviewer.1.gz
  %%NLS%%share/locale/de/LC_MESSAGES/tigervnc.mo
  %%NLS%%share/locale/fr/LC_MESSAGES/tigervnc.mo
  %%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo
  %%NLS%%share/locale/ru/LC_MESSAGES/tigervnc.mo
  %%NLS%%share/locale/sk/LC_MESSAGES/tigervnc.mo
  %%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo
 -%%DOCSDIR%%/README.txt
 -%%DOCSDIR%%/LICENCE.TXT
 -@dirrm %%DOCSDIR%%
 -@unexec %D/%%DOCSDIR%% 2>/dev/null || true
 +%%PORTDOCS%%%%DOCSDIR%%/README.txt
 +%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrmtry lib/xorg/modules/extensions
  @dirrmtry lib/xorg/modules
  @dirrmtry lib/xorg
 +%%VIEWER%%share/icons/hicolor/16x16/apps/tigervnc.png
 +%%VIEWER%%share/icons/hicolor/22x22/apps/tigervnc.png
 +%%VIEWER%%share/icons/hicolor/24x24/apps/tigervnc.png
 +%%VIEWER%%share/icons/hicolor/32x32/apps/tigervnc.png
 +%%VIEWER%%share/icons/hicolor/48x48/apps/tigervnc.png
 +%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg
 +%%VIEWER%%@dirrmtry share/icons/hicolor/48x48/apps
 +%%VIEWER%%@dirrmtry share/icons/hicolor/48x48
 +%%VIEWER%%@dirrmtry share/icons/hicolor/32x32/apps
 +%%VIEWER%%@dirrmtry share/icons/hicolor/32x32
 +%%VIEWER%%@dirrmtry share/icons/hicolor/24x24/apps
 +%%VIEWER%%@dirrmtry share/icons/hicolor/24x24
 +%%VIEWER%%@dirrmtry share/icons/hicolor/22x22/apps
 +%%VIEWER%%@dirrmtry share/icons/hicolor/22x22
 +%%VIEWER%%@dirrmtry share/icons/hicolor/16x16/apps
 +%%VIEWER%%@dirrmtry share/icons/hicolor/16x16
  %%VIEWER%%@dirrmtry share/icons/hicolor/scalable/apps
  %%VIEWER%%@dirrmtry share/icons/hicolor/scalable
  %%VIEWER%%@dirrmtry share/icons/hicolor
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Wed Mar 12 15:25:46 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187007 
>Unformatted:
