Mon Jun 5 08:29:59 2023 UTC ()
Teach package the wonders of PKG_SYSCONFDIR and friends, unbreaking it
for a non-default PKG_SYSCONFBASE

We do not at this point install pam files automatically.
And PKG_SYSCONFBASE/pam.d is not being looked at, so don't
bother installing anything there.


(hauke)
diff -r1.61 -r1.62 pkgsrc/net/tigervnc/Makefile
diff -r1.10 -r1.11 pkgsrc/net/tigervnc/PLIST
cvs diff -r1.61 -r1.62 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2023/04/19 08:11:13 1.61
+++ pkgsrc/net/tigervnc/Makefile 2023/06/05 08:29:59 1.62
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.61 2023/04/19 08:11:13 adam Exp $ 1# $NetBSD: Makefile,v 1.62 2023/06/05 08:29:59 hauke Exp $
2 2
3DISTNAME= tigervnc-1.13.1 3DISTNAME= tigervnc-1.13.1
4PKGNAME= ${DISTNAME}.1.20.13 4PKGNAME= ${DISTNAME}.1.20.13
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
8GITHUB_TAG= v1.13.1 8GITHUB_TAG= v1.13.1
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
@@ -20,101 +20,108 @@ BUILD_DEPENDS+= font-util-[0-9]*:../../f @@ -20,101 +20,108 @@ BUILD_DEPENDS+= font-util-[0-9]*:../../f
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 33
 34USE_TOOLS+= intltool msgfmt msgmerge patch
 35USE_TOOLS+= autoconf automake autoreconf pkg-config gmake
 36USE_TOOLS+= perl:run bash:run
 37
34BUILD_DIRS= . unix/xserver 38BUILD_DIRS= . unix/xserver
35INSTALL_DIRS= . unix/xserver/hw/vnc 39INSTALL_DIRS= . unix/xserver/hw/vnc
36INSTALL_TARGET= install 40INSTALL_TARGET= install
37 41
38CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR} 42# CMake build appends 'tigervnc', so this is not PKG_SYSCONFDIR
 43CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE}
39 44
40# for reallocarray() 45# for reallocarray()
41CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE 46CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
42 47
43CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no 48CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no
44LDFLAGS+= ${BUILDLINK_LDADD.gettext} 49LDFLAGS+= ${BUILDLINK_LDADD.gettext}
45LDFLAGS.SunOS+= -lsocket -lnsl 50LDFLAGS.SunOS+= -lsocket -lnsl
46 51
47CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 52CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
48OVERRIDE_GNU_CONFIG_SCRIPTS= yes 53OVERRIDE_GNU_CONFIG_SCRIPTS= yes
49LIBTOOL_OVERRIDE= unix/xserver/libtool 54LIBTOOL_OVERRIDE= unix/xserver/libtool
50 55
51SUBST_CLASSES+= hpath 56SUBST_CLASSES+= hpath
52SUBST_STAGE.hpath= pre-configure 57SUBST_STAGE.hpath= pre-configure
53SUBST_MESSAGE.hpath= fixing hardcoded paths 58SUBST_MESSAGE.hpath= fixing hardcoded paths
54SUBST_FILES.hpath= unix/vncserver/vncserver.in 59SUBST_FILES.hpath= unix/vncserver/vncserver.in
55SUBST_FILES.hpath+= vncserver.pl 60SUBST_FILES.hpath+= vncserver.pl
56SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 61SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
57SUBST_VARS.hpath+= PREFIX X11BASE 62SUBST_VARS.hpath+= PREFIX X11BASE
58 63
59REPLACE_PERL+= unix/vncserver 64REPLACE_PERL+= unix/vncserver
60REPLACE_PERL+= vncserver.pl 65REPLACE_PERL+= vncserver.pl
61 66
62post-extract: 67post-extract:
63 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.xz 68 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.xz
64 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver 69 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
65 cp ${FILESDIR}/vncserver.pl ${WRKSRC} 70 cp ${FILESDIR}/vncserver.pl ${WRKSRC}
66 71
67post-patch: 72post-patch:
68 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch 73 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch
69 74
70# suggested by BUILDING.txt: 75# suggested by BUILDING.txt:
71#./configure --with-pic --without-dtrace --disable-static --disable-dri \ 76#./configure --with-pic --without-dtrace --disable-static --disable-dri \
72# --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ 77# --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
73# --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ 78# --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
74# --disable-config-dbus --disable-config-hal --disable-config-udev \ 79# --disable-config-dbus --disable-config-hal --disable-config-udev \
75# --disable-dri2 --enable-install-libxf86config --enable-glx \ 80# --disable-dri2 --enable-install-libxf86config --enable-glx \
76# --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ 81# --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
77# --with-fontdir=/usr/share/X11/fonts \ 82# --with-fontdir=/usr/share/X11/fonts \
78# --with-xkb-path=/usr/share/X11/xkb \ 83# --with-xkb-path=/usr/share/X11/xkb \
79# --with-xkb-output=/var/lib/xkb \ 84# --with-xkb-output=/var/lib/xkb \
80# --with-xkb-bin-directory=/usr/bin \ 85# --with-xkb-bin-directory=/usr/bin \
81# --with-serverconfig-path=/usr/lib[64]/xorg \ 86# --with-serverconfig-path=/usr/lib[64]/xorg \
82# --with-dri-driver-path=/usr/lib[64]/dri \ 87# --with-dri-driver-path=/usr/lib[64]/dri \
83# {additional configure options} 88# {additional configure options}
84 89
85XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR} 90XORG_CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
 91# PKG_SYSCONFDIR will be tigervnc-specifiv
 92XORG_CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
86XORG_CONFIGURE_ARGS+= --disable-xwayland --disable-kdrive --disable-xephyr 93XORG_CONFIGURE_ARGS+= --disable-xwayland --disable-kdrive --disable-xephyr
87XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace 94XORG_CONFIGURE_ARGS+= --disable-static --disable-xinerama --without-dtrace
88XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx 95XORG_CONFIGURE_ARGS+= --disable-xorg --disable-xnest --disable-xvfb --disable-dmx
89XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic 96XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic
90XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror 97XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror
91XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls 98XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
92 99
93EGDIR= share/examples/tigervnc 100EGDIR= share/examples/tigervnc
94INSTALLATION_DIRS+= ${EGDIR} 101INSTALLATION_DIRS+= ${EGDIR}
95MAKE_DIRS+= ${PKG_SYSCONFDIR}/pam.d 102
96MAKE_DIRS+= ${PKG_SYSCONFDIR}/tigervnc 103PKG_SYSCONFSUBDIR= tigervnc
97CONF_FILES+= ${EGDIR}/tigervnc ${PKG_SYSCONFDIR}/pam.d/tigervnc 104
98CONF_FILES+= ${EGDIR}/vncserver-config-defaults ${PKG_SYSCONFDIR}/tigervnc/vncserver-config-defaults 105CONF_FILES+= ${EGDIR}/vncserver-config-defaults ${PKG_SYSCONFDIR}/vncserver-config-defaults
99CONF_FILES+= ${EGDIR}/vncserver-config-mandatory ${PKG_SYSCONFDIR}/tigervnc/vncserver-config-mandatory 106CONF_FILES+= ${EGDIR}/vncserver-config-mandatory ${PKG_SYSCONFDIR}/vncserver-config-mandatory
100CONF_FILES+= ${EGDIR}/vncserver.users ${PKG_SYSCONFDIR}/tigervnc/vncserver.users 107CONF_FILES+= ${EGDIR}/vncserver.users ${PKG_SYSCONFDIR}/vncserver.users
101 108
102post-install: 109post-install:
103 ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.pl ${DESTDIR}${PREFIX}/bin/vncserver 110 ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.pl ${DESTDIR}${PREFIX}/bin/vncserver
104 ${MV} ${DESTDIR}${PREFIX}/etc/pam.d/tigervnc ${DESTDIR}${PREFIX}/${EGDIR} 111 ${INSTALL_DATA} ${WRKSRC}/unix/vncserver/tigervnc.pam ${DESTDIR}${PREFIX}/${EGDIR}
105 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver-config-defaults ${DESTDIR}${PREFIX}/${EGDIR} 112 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/vncserver-config-defaults ${DESTDIR}${PREFIX}/${EGDIR}
106 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver-config-mandatory ${DESTDIR}${PREFIX}/${EGDIR} 113 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/vncserver-config-mandatory ${DESTDIR}${PREFIX}/${EGDIR}
107 ${MV} ${DESTDIR}${PREFIX}/etc/tigervnc/vncserver.users ${DESTDIR}${PREFIX}/${EGDIR} 114 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/vncserver.users ${DESTDIR}${PREFIX}/${EGDIR}
108 115
109.include "../../mk/bsd.prefs.mk" 116.include "../../mk/bsd.prefs.mk"
110 117
111.if ${X11_TYPE} != "modular" 118.if ${X11_TYPE} != "modular"
112# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following: 119# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following:
113XORG_CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/lib/X11/xkb 120XORG_CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/lib/X11/xkb
114XORG_CONFIGURE_ARGS+= --with-xkb-bin-directory=${X11BASE}/bin 121XORG_CONFIGURE_ARGS+= --with-xkb-bin-directory=${X11BASE}/bin
115.else 122.else
116DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 123DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
117.endif 124.endif
118 125
119pre-configure: 126pre-configure:
120 cd ${WRKSRC}/unix/xserver && \ 127 cd ${WRKSRC}/unix/xserver && \
cvs diff -r1.10 -r1.11 pkgsrc/net/tigervnc/PLIST (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/PLIST 2023/04/18 18:48:14 1.10
+++ pkgsrc/net/tigervnc/PLIST 2023/06/05 08:29:59 1.11
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1@comment $NetBSD: PLIST,v 1.10 2023/04/18 18:48:14 abs Exp $ 1@comment $NetBSD: PLIST,v 1.11 2023/06/05 08:29:59 hauke Exp $
2bin/Xvnc 2bin/Xvnc
3bin/vncconfig 3bin/vncconfig
4bin/vncpasswd 4bin/vncpasswd
5bin/vncserver 5bin/vncserver
6bin/vncviewer 6bin/vncviewer
7bin/x0vncserver 7bin/x0vncserver
8lib/systemd/system/vncserver@.service 8lib/systemd/system/vncserver@.service
9lib/xorg/modules/extensions/libvnc.la 9lib/xorg/modules/extensions/libvnc.la
10libexec/vncserver 10libexec/vncserver
11libexec/vncsession-start 11libexec/vncsession-start
12man/man1/Xvnc.1 12man/man1/Xvnc.1
13man/man1/vncconfig.1 13man/man1/vncconfig.1
14man/man1/vncpasswd.1 14man/man1/vncpasswd.1
15man/man1/vncviewer.1 15man/man1/vncviewer.1
16man/man1/x0vncserver.1 16man/man1/x0vncserver.1
17man/man8/vncserver.8 17man/man8/vncserver.8
18man/man8/vncsession.8 18man/man8/vncsession.8
19sbin/vncsession 19sbin/vncsession
20share/applications/vncviewer.desktop 20share/applications/vncviewer.desktop
21share/doc/tigervnc/HOWTO.md 21share/doc/tigervnc/HOWTO.md
22share/doc/tigervnc/LICENCE.TXT 22share/doc/tigervnc/LICENCE.TXT
23share/doc/tigervnc/README.rst 23share/doc/tigervnc/README.rst
24share/examples/tigervnc/tigervnc 24share/examples/tigervnc/tigervnc.pam
25share/examples/tigervnc/vncserver-config-defaults 25share/examples/tigervnc/vncserver-config-defaults
26share/examples/tigervnc/vncserver-config-mandatory 26share/examples/tigervnc/vncserver-config-mandatory
27share/examples/tigervnc/vncserver.users 27share/examples/tigervnc/vncserver.users
28share/icons/hicolor/128x128/apps/tigervnc.png 28share/icons/hicolor/128x128/apps/tigervnc.png
29share/icons/hicolor/16x16/apps/tigervnc.png 29share/icons/hicolor/16x16/apps/tigervnc.png
30share/icons/hicolor/22x22/apps/tigervnc.png 30share/icons/hicolor/22x22/apps/tigervnc.png
31share/icons/hicolor/24x24/apps/tigervnc.png 31share/icons/hicolor/24x24/apps/tigervnc.png
32share/icons/hicolor/32x32/apps/tigervnc.png 32share/icons/hicolor/32x32/apps/tigervnc.png
33share/icons/hicolor/48x48/apps/tigervnc.png 33share/icons/hicolor/48x48/apps/tigervnc.png
34share/icons/hicolor/64x64/apps/tigervnc.png 34share/icons/hicolor/64x64/apps/tigervnc.png
35share/icons/hicolor/scalable/apps/tigervnc.svg 35share/icons/hicolor/scalable/apps/tigervnc.svg
36share/locale/bg/LC_MESSAGES/tigervnc.mo 36share/locale/bg/LC_MESSAGES/tigervnc.mo
37share/locale/cs/LC_MESSAGES/tigervnc.mo 37share/locale/cs/LC_MESSAGES/tigervnc.mo