Attachment #140427 for bug #187007

View | Details | Raw Unified | Return to bug 187007 | Differences between
Collapse All | Expand All





PORTNAME=	tigervnc
PORTVERSION=	1.3.0
PORTREVISION=	4
CATEGORIES=	net x11-servers
MASTER_SITES=	SF:tigervnc
MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc

		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

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=${STAGE}${PREFIX}

.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+=	libtasn1.so:${PORTSDIR}/security/libtasn1 \

.endif

.if ${PORT_OPTIONS:MVIEWER}
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" \
			"${PORTNAME}" "vncviewer" "Network;" false
			"vncviewer" "Network;" false
.else
CMAKE_ARGS+=	-DBUILD_VIEWER=0
PLIST_SUB+=	VIEWER="@comment "
.endif


		--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:${LOCALBASE}/share/fonts,built-ins" \
		--with-xkb-path=${LOCALBASE}/share/X11/xkb \
		--with-xkb-bin-directory=${LOCALBASE}/bin \
		--with-serverconfig-path=${LOCALBASE}/lib/X11 \
		--with-serverconfig-path=${PREFIX}/lib/X11 \
		--disable-selective-werror
.ifdef WITH_NEW_XORG
CONFIGURE_ARGS+=	--with-fontrootdir=${LOCALBASE}/share/fonts
.else
CONFIGURE_ARGS+=	--with-fontdir=${LOCALBASE}/share/fonts
.endif

.include <bsd.port.pre.mk>


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>




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)
 




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
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@unexec %D/%%DOCSDIR%% 2>/dev/null || true
@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

Return to bug 187007

Lines 3-9 Link Here

(-)net/tigervnc/Makefile (-23 / +13 lines)
3		3
4	PORTNAME= tigervnc	4	PORTNAME= tigervnc
5	PORTVERSION= 1.3.0	5	PORTVERSION= 1.3.0
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= net x11-servers	7	CATEGORIES= net x11-servers
8	MASTER_SITES= SF:tigervnc	8	MASTER_SITES= SF:tigervnc
9	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc	9	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
Lines 38-48 Link Here
38	scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \	38	scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
39	xfont xproto xrandr xtrans xtst xorg-macros	39	xfont xproto xrandr xtrans xtst xorg-macros
40		40
41	MAN1+= vncpasswd.1 \
42	x0vncserver.1 \
43	vncserver.1 \
44	vncconfig.1 \
45	Xvnc.1
46	CFLAGS+= -fPIC	41	CFLAGS+= -fPIC
47		42
48	OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER HPJPG	43	OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER HPJPG
Lines 50-59 Link Here
50	VIEWER_DESC= Build vncviewer	45	VIEWER_DESC= Build vncviewer
51	HPJPG_DESC= Build with High-Performance JPEG support	46	HPJPG_DESC= Build with High-Performance JPEG support
52		47
53	NO_STAGE= yes
54	.include <bsd.port.options.mk>	48	.include <bsd.port.options.mk>
55		49
56	CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${PREFIX}	50	CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX}
57		51
58	.if ${PORT_OPTIONS:MGNUTLS}	52	.if ${PORT_OPTIONS:MGNUTLS}
59	LIB_DEPENDS+= libtasn1.so:${PORTSDIR}/security/libtasn1 \	53	LIB_DEPENDS+= libtasn1.so:${PORTSDIR}/security/libtasn1 \
Lines 82-98 Link Here
82	.endif	76	.endif
83		77
84	.if ${PORT_OPTIONS:MVIEWER}	78	.if ${PORT_OPTIONS:MVIEWER}
85	CMAKE_ARGS+= -DENABLE_VIEWER=1	79	CMAKE_ARGS+= -DBUILD_VIEWER=1
86	LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \	80	LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \
87	libfltk.so:${PORTSDIR}/x11-toolkits/fltk	81	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
		82	# ImageMagick is required to generate icons during build process
		83	BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
88	USE_XORG+= xcursor xfixes xft xinerama	84	USE_XORG+= xcursor xfixes xft xinerama
89	MAN1+= vncviewer.1
90	PLIST_SUB+= VIEWER=""	85	PLIST_SUB+= VIEWER=""
91	INSTALLS_ICONS= yes	86	INSTALLS_ICONS= yes
92	DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \	87	DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \
93	"${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg" \	88	"${PORTNAME}" "vncviewer" "Network;" false
94	"vncviewer" "Network;" false
95	.else	89	.else
		90	CMAKE_ARGS+= -DBUILD_VIEWER=0
96	PLIST_SUB+= VIEWER="@comment "	91	PLIST_SUB+= VIEWER="@comment "
97	.endif	92	.endif
98		93
Lines 111-126 Link Here
111	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \	106	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
112	--disable-config-dbus --disable-config-hal \	107	--disable-config-dbus --disable-config-hal \
113	--disable-dri2 --enable-install-libxf86config --enable-glx \	108	--disable-dri2 --enable-install-libxf86config --enable-glx \
114	--with-default-font-path="catalogue:${PREFIX}/share/fonts,built-ins" \	109	--with-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \
115	--with-xkb-path=${PREFIX}/share/X11/xkb \	110	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
116	--with-xkb-output=/var/lib/xkb \	111	--with-xkb-bin-directory=${LOCALBASE}/bin \
117	--with-xkb-bin-directory=${PREFIX}/bin \	112	--with-serverconfig-path=${LOCALBASE}/lib/X11 \
118	--with-serverconfig-path=${PREFIX}/lib/X11 \
119	--disable-selective-werror	113	--disable-selective-werror
120	.ifdef WITH_NEW_XORG	114	.ifdef WITH_NEW_XORG
121	CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts	115	CONFIGURE_ARGS+= --with-fontrootdir=${LOCALBASE}/share/fonts
122	.else	116	.else
123	CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts	117	CONFIGURE_ARGS+= --with-fontdir=${LOCALBASE}/share/fonts
124	.endif	118	.endif
125		119
126	.include <bsd.port.pre.mk>	120	.include <bsd.port.pre.mk>
Lines 156-164 Link Here
156		150
157	post-install:	151	post-install:
158	@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install	152	@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install
159	.if ${PORT_OPTIONS:MVIEWER}
160	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps/
161	@cd ${WRKSRC}/media/ && ${INSTALL_DATA} icons/tigervnc.svg ${PREFIX}/share/icons/hicolor/scalable/apps/
162	.endif
163		153
164	.include <bsd.port.post.mk>	154	.include <bsd.port.post.mk>

Line 0 Link Here

(-)net/tigervnc/files/patch-vncviewer-always-built (+19 lines)
	1	Index: CMakeLists.txt
	2	===================================================================
	3	--- CMakeLists.txt (revision 5159)
	4	+++ CMakeLists.txt (working copy)
	5	@@ -390,9 +390,12 @@
	6	add_subdirectory(po)
	7	endif()
	8
	9	-add_subdirectory(vncviewer)
	10	+option(BUILD_VIEWER "Build TigerVNC viewer" ON)
	11	+if(BUILD_VIEWER)
	12	+ add_subdirectory(vncviewer)
	13	+ add_subdirectory(media)
	14	+endif()
	15
	16	-add_subdirectory(media)
	17
	18	include(cmake/BuildPackages.cmake)
	19

Lines 3-25 Link Here

(-)net/tigervnc/pkg-plist (-5 / +25 lines)
3	bin/vncpasswd	3	bin/vncpasswd
4	bin/vncserver	4	bin/vncserver
5	%%VIEWER%%bin/vncviewer	5	%%VIEWER%%bin/vncviewer
6	%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg
7	bin/x0vncserver	6	bin/x0vncserver
8	lib/xorg/modules/extensions/libvnc.la	7	lib/xorg/modules/extensions/libvnc.la
9	lib/xorg/modules/extensions/libvnc.so	8	lib/xorg/modules/extensions/libvnc.so
		9	man/man1/vncpasswd.1.gz
		10	man/man1/x0vncserver.1.gz
		11	man/man1/vncserver.1.gz
		12	man/man1/vncconfig.1.gz
		13	man/man1/Xvnc.1.gz
		14	%%VIEWER%%man/man1/vncviewer.1.gz
10	%%NLS%%share/locale/de/LC_MESSAGES/tigervnc.mo	15	%%NLS%%share/locale/de/LC_MESSAGES/tigervnc.mo
11	%%NLS%%share/locale/fr/LC_MESSAGES/tigervnc.mo	16	%%NLS%%share/locale/fr/LC_MESSAGES/tigervnc.mo
12	%%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo	17	%%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo
13	%%NLS%%share/locale/ru/LC_MESSAGES/tigervnc.mo	18	%%NLS%%share/locale/ru/LC_MESSAGES/tigervnc.mo
14	%%NLS%%share/locale/sk/LC_MESSAGES/tigervnc.mo	19	%%NLS%%share/locale/sk/LC_MESSAGES/tigervnc.mo
15	%%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo	20	%%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo
16	%%DOCSDIR%%/README.txt	21	%%PORTDOCS%%%%DOCSDIR%%/README.txt
17	%%DOCSDIR%%/LICENCE.TXT	22	%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
18	@dirrm %%DOCSDIR%%	23	%%PORTDOCS%%@dirrm %%DOCSDIR%%
19	@unexec %D/%%DOCSDIR%% 2>/dev/null \|\| true
20	@dirrmtry lib/xorg/modules/extensions	24	@dirrmtry lib/xorg/modules/extensions
21	@dirrmtry lib/xorg/modules	25	@dirrmtry lib/xorg/modules
22	@dirrmtry lib/xorg	26	@dirrmtry lib/xorg
		27	%%VIEWER%%share/icons/hicolor/16x16/apps/tigervnc.png
		28	%%VIEWER%%share/icons/hicolor/22x22/apps/tigervnc.png
		29	%%VIEWER%%share/icons/hicolor/24x24/apps/tigervnc.png
		30	%%VIEWER%%share/icons/hicolor/32x32/apps/tigervnc.png
		31	%%VIEWER%%share/icons/hicolor/48x48/apps/tigervnc.png
		32	%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg
		33	%%VIEWER%%@dirrmtry share/icons/hicolor/48x48/apps
		34	%%VIEWER%%@dirrmtry share/icons/hicolor/48x48
		35	%%VIEWER%%@dirrmtry share/icons/hicolor/32x32/apps
		36	%%VIEWER%%@dirrmtry share/icons/hicolor/32x32
		37	%%VIEWER%%@dirrmtry share/icons/hicolor/24x24/apps
		38	%%VIEWER%%@dirrmtry share/icons/hicolor/24x24
		39	%%VIEWER%%@dirrmtry share/icons/hicolor/22x22/apps
		40	%%VIEWER%%@dirrmtry share/icons/hicolor/22x22
		41	%%VIEWER%%@dirrmtry share/icons/hicolor/16x16/apps
		42	%%VIEWER%%@dirrmtry share/icons/hicolor/16x16
23	%%VIEWER%%@dirrmtry share/icons/hicolor/scalable/apps	43	%%VIEWER%%@dirrmtry share/icons/hicolor/scalable/apps
24	%%VIEWER%%@dirrmtry share/icons/hicolor/scalable	44	%%VIEWER%%@dirrmtry share/icons/hicolor/scalable
25	%%VIEWER%%@dirrmtry share/icons/hicolor	45	%%VIEWER%%@dirrmtry share/icons/hicolor