Fri Aug 19 22:01:02 2022 UTC ()
Add desktopdb.mk depends for share/applications/vncviewer.desktop

Bump PKGREVISION


(abs)
diff -r1.52 -r1.53 pkgsrc/net/tigervnc/Makefile
cvs diff -r1.52 -r1.53 pkgsrc/net/tigervnc/Makefile (switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2022/08/08 16:47:34 1.52
+++ pkgsrc/net/tigervnc/Makefile 2022/08/19 22:01:02 1.53
@@ -1,147 +1,148 @@ @@ -1,147 +1,148 @@
1# $NetBSD: Makefile,v 1.52 2022/08/08 16:47:34 adam Exp $ 1# $NetBSD: Makefile,v 1.53 2022/08/19 22:01:02 abs Exp $
2 2
3DISTNAME= tigervnc-1.12.0 3DISTNAME= tigervnc-1.12.0
4PKGNAME= ${DISTNAME}.1.20.13 4PKGNAME= ${DISTNAME}.1.20.13
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
8GITHUB_TAG= v1.12.0 8GITHUB_TAG= v1.12.0
9XORG_SERVER_FILE= xorg-server-1.20.13 9XORG_SERVER_FILE= xorg-server-1.20.13
10SITES.${XORG_SERVER_FILE}.tar.xz= ${MASTER_SITE_XORG:=xserver/} 10SITES.${XORG_SERVER_FILE}.tar.xz= ${MASTER_SITE_XORG:=xserver/}
11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.xz 11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.xz
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://tigervnc.org/ 14HOMEPAGE= https://tigervnc.org/
15COMMENT= High-performance, platform-neutral VNC client/server 15COMMENT= High-performance, platform-neutral VNC client/server
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros 18BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros
19BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util 19BUILD_DEPENDS+= font-util-[0-9]*:../../fonts/font-util
20BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 20BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
21 21
22DEPENDS+= mcookie-[0-9]*:../../x11/mcookie 22DEPENDS+= mcookie-[0-9]*:../../x11/mcookie
23DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 23DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
24 24
25REPLACE_BASH+= unix/vncserver/vncsession-start.in 25REPLACE_BASH+= unix/vncserver/vncsession-start.in
26REPLACE_PERL+= unix/vncserver/vncserver.in 26REPLACE_PERL+= unix/vncserver/vncserver.in
27 27
28WRKSRC= ${WRKDIR}/${DISTNAME} 28WRKSRC= ${WRKDIR}/${DISTNAME}
29 29
30USE_CMAKE= yes 30USE_CMAKE= yes
31USE_LIBTOOL= yes 31USE_LIBTOOL= yes
32USE_LANGUAGES= c c++ 32USE_LANGUAGES= c c++
33USE_TOOLS+= intltool msgfmt msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash:run 33USE_TOOLS+= intltool msgfmt msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash:run
34BUILD_DIRS= . unix/xserver 34BUILD_DIRS= . unix/xserver
35INSTALL_DIRS= . unix/xserver/hw/vnc 35INSTALL_DIRS= . unix/xserver/hw/vnc
36INSTALL_TARGET= install 36INSTALL_TARGET= install
37 37
38CMAKE_ARGS+= CMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR} 38CMAKE_ARGS+= CMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
39# for reallocarray() 39# for reallocarray()
40CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE 40CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
41 41
42LDFLAGS+= ${BUILDLINK_LDADD.gettext} 42LDFLAGS+= ${BUILDLINK_LDADD.gettext}
43LDFLAGS.SunOS+= -lsocket -lnsl 43LDFLAGS.SunOS+= -lsocket -lnsl
44 44
45CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 45CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
46OVERRIDE_GNU_CONFIG_SCRIPTS= yes 46OVERRIDE_GNU_CONFIG_SCRIPTS= yes
47LIBTOOL_OVERRIDE= unix/xserver/libtool 47LIBTOOL_OVERRIDE= unix/xserver/libtool
48 48
49SUBST_CLASSES+= hpath 49SUBST_CLASSES+= hpath
50SUBST_STAGE.hpath= pre-configure 50SUBST_STAGE.hpath= pre-configure
51SUBST_MESSAGE.hpath= fixing hardcoded paths 51SUBST_MESSAGE.hpath= fixing hardcoded paths
52SUBST_FILES.hpath= unix/vncserver/vncserver.in 52SUBST_FILES.hpath= unix/vncserver/vncserver.in
53SUBST_FILES.hpath+= vncserver.pl 53SUBST_FILES.hpath+= vncserver.pl
54SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 54SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
55SUBST_VARS.hpath+= PREFIX X11BASE 55SUBST_VARS.hpath+= PREFIX X11BASE
56 56
57REPLACE_PERL+= unix/vncserver 57REPLACE_PERL+= unix/vncserver
58REPLACE_PERL+= vncserver.pl 58REPLACE_PERL+= vncserver.pl
59 59
60post-extract: 60post-extract:
61 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.xz 61 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.xz
62 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver 62 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
63 cp ${FILESDIR}/vncserver.pl ${WRKSRC} 63 cp ${FILESDIR}/vncserver.pl ${WRKSRC}
64 64
65post-patch: 65post-patch:
66 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch 66 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch
67 67
68# suggested by BUILDING.txt: 68# suggested by BUILDING.txt:
69#./configure --with-pic --without-dtrace --disable-static --disable-dri \ 69#./configure --with-pic --without-dtrace --disable-static --disable-dri \
70# --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ 70# --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
71# --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ 71# --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
72# --disable-config-dbus --disable-config-hal --disable-config-udev \ 72# --disable-config-dbus --disable-config-hal --disable-config-udev \
73# --disable-dri2 --enable-install-libxf86config --enable-glx \ 73# --disable-dri2 --enable-install-libxf86config --enable-glx \
74# --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ 74# --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
75# --with-fontdir=/usr/share/X11/fonts \ 75# --with-fontdir=/usr/share/X11/fonts \
76# --with-xkb-path=/usr/share/X11/xkb \ 76# --with-xkb-path=/usr/share/X11/xkb \
77# --with-xkb-output=/var/lib/xkb \ 77# --with-xkb-output=/var/lib/xkb \
78# --with-xkb-bin-directory=/usr/bin \ 78# --with-xkb-bin-directory=/usr/bin \
79# --with-serverconfig-path=/usr/lib[64]/xorg \ 79# --with-serverconfig-path=/usr/lib[64]/xorg \
80# --with-dri-driver-path=/usr/lib[64]/dri \ 80# --with-dri-driver-path=/usr/lib[64]/dri \
81# {additional configure options} 81# {additional configure options}
82 82
83XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR} 83XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
84XORG_CONFIGURE_ARGS+= --disable-xwayland --disable-kdrive --disable-xephyr 84XORG_CONFIGURE_ARGS+= --disable-xwayland --disable-kdrive --disable-xephyr
85XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace 85XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace
86XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx 86XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx
87XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic 87XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic
88XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror 88XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror
89XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls 89XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
90 90
91EGDIR= share/examples/tigervnc 91EGDIR= share/examples/tigervnc
92INSTALLATION_DIRS+= ${EGDIR} 92INSTALLATION_DIRS+= ${EGDIR}
93MAKE_DIRS+= ${PKG_SYSCONFDIR}/pam.d 93MAKE_DIRS+= ${PKG_SYSCONFDIR}/pam.d
94MAKE_DIRS+= ${PKG_SYSCONFDIR}/tigervnc 94MAKE_DIRS+= ${PKG_SYSCONFDIR}/tigervnc
95CONF_FILES+= ${EGDIR}/tigervnc ${PKG_SYSCONFDIR}/pam.d/tigervnc 95CONF_FILES+= ${EGDIR}/tigervnc ${PKG_SYSCONFDIR}/pam.d/tigervnc
96CONF_FILES+= ${EGDIR}/vncserver-config-defaults ${PKG_SYSCONFDIR}/tigervnc/vncserver-config-defaults 96CONF_FILES+= ${EGDIR}/vncserver-config-defaults ${PKG_SYSCONFDIR}/tigervnc/vncserver-config-defaults
97CONF_FILES+= ${EGDIR}/vncserver-config-mandatory ${PKG_SYSCONFDIR}/tigervnc/vncserver-config-mandatory 97CONF_FILES+= ${EGDIR}/vncserver-config-mandatory ${PKG_SYSCONFDIR}/tigervnc/vncserver-config-mandatory
98CONF_FILES+= ${EGDIR}/vncserver.users ${PKG_SYSCONFDIR}/tigervnc/vncserver.users 98CONF_FILES+= ${EGDIR}/vncserver.users ${PKG_SYSCONFDIR}/tigervnc/vncserver.users
99 99
100post-install: 100post-install:
101 ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.pl ${DESTDIR}${PREFIX}/bin/vncserver 101 ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.pl ${DESTDIR}${PREFIX}/bin/vncserver
102 ${MV} ${DESTDIR}${PREFIX}/etc/pam.d/tigervnc ${DESTDIR}${PREFIX}/${EGDIR} 102 ${MV} ${DESTDIR}${PREFIX}/etc/pam.d/tigervnc ${DESTDIR}${PREFIX}/${EGDIR}
103 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver-config-defaults ${DESTDIR}${PREFIX}/${EGDIR} 103 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver-config-defaults ${DESTDIR}${PREFIX}/${EGDIR}
104 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver-config-mandatory ${DESTDIR}${PREFIX}/${EGDIR} 104 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver-config-mandatory ${DESTDIR}${PREFIX}/${EGDIR}
105 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver.users ${DESTDIR}${PREFIX}/${EGDIR} 105 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver.users ${DESTDIR}${PREFIX}/${EGDIR}
106 106
107.include "../../mk/bsd.prefs.mk" 107.include "../../mk/bsd.prefs.mk"
108 108
109.if ${X11_TYPE} != "modular" 109.if ${X11_TYPE} != "modular"
110# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following: 110# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following:
111XORG_CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/lib/X11/xkb 111XORG_CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/lib/X11/xkb
112XORG_CONFIGURE_ARGS+= --with-xkb-bin-directory=${X11BASE}/bin 112XORG_CONFIGURE_ARGS+= --with-xkb-bin-directory=${X11BASE}/bin
113.else 113.else
114DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 114DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
115.endif 115.endif
116 116
117pre-configure: 117pre-configure:
118 cd ${WRKSRC}/unix/xserver && \ 118 cd ${WRKSRC}/unix/xserver && \
119 ${PKGSRC_SETENV} ACLOCAL_PATH=${X11BASE}/share/aclocal \ 119 ${PKGSRC_SETENV} ACLOCAL_PATH=${X11BASE}/share/aclocal \
120 autoreconf -fvi && \ 120 autoreconf -fvi && \
121 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \ 121 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \
122 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 122 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
123 ./configure ${XORG_CONFIGURE_ARGS} 123 ./configure ${XORG_CONFIGURE_ARGS}
124 124
125.include "../../mk/jpeg.buildlink3.mk" 125.include "../../mk/jpeg.buildlink3.mk"
126.include "../../converters/libiconv/buildlink3.mk" 126.include "../../converters/libiconv/buildlink3.mk"
127.include "../../devel/gettext-lib/buildlink3.mk" 127.include "../../devel/gettext-lib/buildlink3.mk"
128.include "../../devel/zlib/buildlink3.mk" 128.include "../../devel/zlib/buildlink3.mk"
129.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 129.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
130.include "../../security/gnutls/buildlink3.mk" 130.include "../../security/gnutls/buildlink3.mk"
131.include "../../security/libgcrypt/buildlink3.mk" 131.include "../../security/libgcrypt/buildlink3.mk"
 132.include "../../sysutils/desktop-file-utils/desktopdb.mk"
132.include "../../x11/libXft/buildlink3.mk" 133.include "../../x11/libXft/buildlink3.mk"
133.include "../../x11/libX11/buildlink3.mk" 134.include "../../x11/libX11/buildlink3.mk"
134.include "../../x11/libXcursor/buildlink3.mk" 135.include "../../x11/libXcursor/buildlink3.mk"
135.include "../../x11/libXinerama/buildlink3.mk" 136.include "../../x11/libXinerama/buildlink3.mk"
136.include "../../x11/libXtst/buildlink3.mk" 137.include "../../x11/libXtst/buildlink3.mk"
137.include "../../x11/libdrm/buildlink3.mk" 138.include "../../x11/libdrm/buildlink3.mk"
138BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.3 139BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.3
139.include "../../x11/fltk13/buildlink3.mk" 140.include "../../x11/fltk13/buildlink3.mk"
140.include "../../x11/pixman/buildlink3.mk" 141.include "../../x11/pixman/buildlink3.mk"
141.include "../../x11/xorgproto/buildlink3.mk" 142.include "../../x11/xorgproto/buildlink3.mk"
142.include "../../x11/xtrans/buildlink3.mk" 143.include "../../x11/xtrans/buildlink3.mk"
143.include "../../x11/libXfont2/buildlink3.mk" 144.include "../../x11/libXfont2/buildlink3.mk"
144.include "../../x11/libXrandr/buildlink3.mk" 145.include "../../x11/libXrandr/buildlink3.mk"
145.include "../../x11/libxkbfile/buildlink3.mk" 146.include "../../x11/libxkbfile/buildlink3.mk"
146.include "../../mk/pthread.buildlink3.mk" 147.include "../../mk/pthread.buildlink3.mk"
147.include "../../mk/bsd.pkg.mk" 148.include "../../mk/bsd.pkg.mk"