>Number: 178602 >Category: ports >Synopsis: [maintainer update] net/tigervnc: Add missing dependency on x11/xkeyboard-config etc >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 13 20:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Koichiro IWAO >Release: 9.1-STABLE >Organization: >Environment: FreeBSD ports-dev.vmeta.jp 9.1-STABLE FreeBSD 9.1-STABLE #3: Thu Apr 4 02:45:29 JST 2013 root@icepick.vmeta.jp:/usr/obj/usr/src/sys/GENERIC amd64 >Description: - Add missing dependency on x11/xkeyboard-config and x11/xkbcomp - Move xorg-macros from BUILD_DEPENDS to USE_XORG - Install desktop entry file with vncviewer - Add LICENSE - Cleanup CONFIGURE_ARGS Almost tested on redports: https://redports.org/buildarchive/20130513192400-49445/ >How-To-Repeat: >Fix: diff -ruN /usr/ports/net/tigervnc/Makefile net/tigervnc/Makefile --- /usr/ports/net/tigervnc/Makefile 2013-05-05 13:31:35.245235112 +0000 +++ net/tigervnc/Makefile 2013-05-13 19:19:46.924574646 +0000 @@ -3,7 +3,7 @@ PORTNAME= tigervnc PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net x11-servers MASTER_SITES= SF:tigervnc MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc @@ -12,9 +12,13 @@ MAINTAINER= meta+ports@vmeta.jp COMMENT= TigerVNC is an advanced VNC implementation +LISENCE= GPLv2 +LISENCE_FILE= ${WRKSRC}/LICENCE.TXT + PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch -BUILD_DEPENDS+= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \ - ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri +# almost equivalent to x11-servers/xorg-server's +RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ + xkbcomp:${PORTSDIR}/x11/xkbcomp CONFLICTS= tridiavnc-[0-9]* \ tightvnc-[0-9]* \ @@ -33,7 +37,7 @@ USE_XORG+= bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \ inputproto kbproto pixman randrproto renderproto resourceproto \ scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \ - xfont xproto xrandr xtrans xtst + xfont xproto xrandr xtrans xtst xorg-macros MAN1+= vncpasswd.1 \ x0vncserver.1 \ @@ -84,6 +88,10 @@ 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 .else PLIST_SUB+= VIEWER="@comment " .endif @@ -109,7 +117,6 @@ --with-xkb-output=/var/lib/xkb \ --with-xkb-bin-directory=${PREFIX}/bin \ --with-serverconfig-path=${PREFIX}/lib/X11 \ - --with-dri-driver-path=${PREFIX}/lib/dri \ --disable-selective-werror .include <bsd.port.pre.mk> @@ -145,5 +152,9 @@ 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-03-24 15:34:16.198627621 +0000 +++ net/tigervnc/pkg-plist 2013-04-02 15:24:20.349734886 +0000 @@ -3,6 +3,7 @@ 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 @@ -19,3 +20,7 @@ @dirrmtry lib/xorg/modules/extensions @dirrmtry lib/xorg/modules @dirrmtry lib/xorg +%%VIEWER%%@dirrmtry share/icons/hicolor/scalable/apps +%%VIEWER%%@dirrmtry share/icons/hicolor/scalable +%%VIEWER%%@dirrmtry share/icons/hicolor +%%VIEWER%%@dirrmtry share/icons >Release-Note: >Audit-Trail: >Unformatted: _______________________________________________ freebsd-ports-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org"
- Add missing dependency on x11/xkeyboard-config and x11/xkbcomp - Move xorg-macros from BUILD_DEPENDS to USE_XORG - Install desktop entry file with vncviewer - Add LICENSE - Cleanup CONFIGURE_ARGS Almost tested on redports: https://redports.org/buildarchive/20130513192400-49445/ Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->swills swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
State Changed From-To: open->closed Committed. Thanks!
Author: swills Date: Sun May 19 21:28:12 2013 New Revision: 318549 URL: http://svnweb.freebsd.org/changeset/ports/318549 Log: - Add missing dependency on x11/xkeyboard-config and x11/xkbcomp - Move xorg-macros from BUILD_DEPENDS to USE_XORG - Install desktop entry file with vncviewer - Add LICENSE - Cleanup CONFIGURE_ARGS PR: ports/178602 Submitted by: Koichiro IWAO <meta+ports@vmeta.jp> (maintainer) Modified: head/net/tigervnc/Makefile head/net/tigervnc/pkg-plist (contents, props changed) Modified: head/net/tigervnc/Makefile ============================================================================== --- head/net/tigervnc/Makefile Sun May 19 20:34:30 2013 (r318548) +++ head/net/tigervnc/Makefile Sun May 19 21:28:12 2013 (r318549) @@ -3,7 +3,7 @@ PORTNAME= tigervnc PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net x11-servers MASTER_SITES= SF:tigervnc MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc @@ -12,9 +12,13 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.ta MAINTAINER= meta+ports@vmeta.jp COMMENT= TigerVNC is an advanced VNC implementation +LISENCE= GPLv2 +LISENCE_FILE= ${WRKSRC}/LICENCE.TXT + PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch -BUILD_DEPENDS+= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \ - ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri +# almost equivalent to x11-servers/xorg-server's +RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ + xkbcomp:${PORTSDIR}/x11/xkbcomp CONFLICTS= tridiavnc-[0-9]* \ tightvnc-[0-9]* \ @@ -33,7 +37,7 @@ USE_OPENSSL= yes USE_XORG+= bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \ inputproto kbproto pixman randrproto renderproto resourceproto \ scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \ - xfont xproto xrandr xtrans xtst + xfont xproto xrandr xtrans xtst xorg-macros MAN1+= vncpasswd.1 \ x0vncserver.1 \ @@ -84,6 +88,10 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics 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 .else PLIST_SUB+= VIEWER="@comment " .endif @@ -109,7 +117,6 @@ CONFIGURE_ARGS+= \ --with-xkb-output=/var/lib/xkb \ --with-xkb-bin-directory=${PREFIX}/bin \ --with-serverconfig-path=${PREFIX}/lib/X11 \ - --with-dri-driver-path=${PREFIX}/lib/dri \ --disable-selective-werror .include <bsd.port.pre.mk> @@ -145,5 +152,9 @@ 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> Modified: head/net/tigervnc/pkg-plist ============================================================================== --- head/net/tigervnc/pkg-plist Sun May 19 20:34:30 2013 (r318548) +++ head/net/tigervnc/pkg-plist Sun May 19 21:28:12 2013 (r318549) @@ -3,6 +3,7 @@ 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 @@ -19,3 +20,7 @@ lib/xorg/modules/extensions/libvnc.so @dirrmtry lib/xorg/modules/extensions @dirrmtry lib/xorg/modules @dirrmtry lib/xorg +%%VIEWER%%@dirrmtry share/icons/hicolor/scalable/apps +%%VIEWER%%@dirrmtry share/icons/hicolor/scalable +%%VIEWER%%@dirrmtry share/icons/hicolor +%%VIEWER%%@dirrmtry share/icons _______________________________________________ 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"