>Number: 187007 >Category: misc >Synopsis: [maintainer update] net/tigervnc: Fix disabling VIEWER option >didn't work, support stage, etc >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Feb 24 16:00:00 UTC 2014 >Closed-Date: >Last-Modified: >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: >Unformatted: _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "[email protected]"
