Fri Oct 1 11:42:23 2021 UTC ()
tigervnc: Avoid hardcoding X11BASE


(nia)
diff -r1.43 -r1.44 pkgsrc/net/tigervnc/Makefile
diff -r1.2 -r1.3 pkgsrc/net/tigervnc/files/vncserver.pl
cvs diff -r1.43 -r1.44 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2021/09/30 21:38:23 1.43
+++ pkgsrc/net/tigervnc/Makefile 2021/10/01 11:42:23 1.44
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.43 2021/09/30 21:38:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2021/10/01 11:42:23 nia Exp $
2 2
3DISTNAME= tigervnc-1.11.0 3DISTNAME= tigervnc-1.11.0
4PKGNAME= ${DISTNAME}.1.20.11 4PKGNAME= ${DISTNAME}.1.20.11
5PKGREVISION= 5 5PKGREVISION= 6
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
8GITHUB_TAG= v1.11.0 8GITHUB_TAG= v1.11.0
9XORG_SERVER_FILE= xorg-server-1.20.11 9XORG_SERVER_FILE= xorg-server-1.20.11
10SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} 10SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/}
11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
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
@@ -38,26 +38,27 @@ CMAKE_ARGS+= CMAKE_INSTALL_SYSCONFDIR=$ @@ -38,26 +38,27 @@ CMAKE_ARGS+= CMAKE_INSTALL_SYSCONFDIR=$
38# for reallocarray() 38# for reallocarray()
39CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE 39CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
40 40
41LDFLAGS+= ${BUILDLINK_LDADD.gettext} 41LDFLAGS+= ${BUILDLINK_LDADD.gettext}
42 42
43CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 43CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
44OVERRIDE_GNU_CONFIG_SCRIPTS= yes 44OVERRIDE_GNU_CONFIG_SCRIPTS= yes
45LIBTOOL_OVERRIDE= unix/xserver/libtool 45LIBTOOL_OVERRIDE= unix/xserver/libtool
46 46
47SUBST_CLASSES+= hpath 47SUBST_CLASSES+= hpath
48SUBST_STAGE.hpath= pre-configure 48SUBST_STAGE.hpath= pre-configure
49SUBST_MESSAGE.hpath= fixing hardcoded paths 49SUBST_MESSAGE.hpath= fixing hardcoded paths
50SUBST_FILES.hpath= unix/vncserver/vncserver.in 50SUBST_FILES.hpath= unix/vncserver/vncserver.in
 51SUBST_FILES.hpath= vncserver.pl
51SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' 52SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
52SUBST_VARS.hpath+= PREFIX X11BASE 53SUBST_VARS.hpath+= PREFIX X11BASE
53 54
54REPLACE_PERL+= unix/vncserver 55REPLACE_PERL+= unix/vncserver
55REPLACE_PERL+= vncserver.pl 56REPLACE_PERL+= vncserver.pl
56 57
57post-extract: 58post-extract:
58 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.bz2 59 cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.bz2
59 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver 60 cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
60 cp ${FILESDIR}/vncserver.pl ${WRKSRC} 61 cp ${FILESDIR}/vncserver.pl ${WRKSRC}
61 62
62post-patch: 63post-patch:
63 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch 64 cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch
cvs diff -r1.2 -r1.3 pkgsrc/net/tigervnc/files/vncserver.pl (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/files/vncserver.pl 2021/09/30 21:38:23 1.2
+++ pkgsrc/net/tigervnc/files/vncserver.pl 2021/10/01 11:42:23 1.3
@@ -87,32 +87,28 @@ $defaultConfig @@ -87,32 +87,28 @@ $defaultConfig
87 "##\n". 87 "##\n".
88 "# securitytypes=vncauth,tlsvnc\n". 88 "# securitytypes=vncauth,tlsvnc\n".
89 "# desktop=sandbox\n". 89 "# desktop=sandbox\n".
90 "# geometry=2000x1200\n". 90 "# geometry=2000x1200\n".
91 "# localhost\n". 91 "# localhost\n".
92 "# alwaysshared\n"); 92 "# alwaysshared\n");
93 93
94chop($host = `uname -n`); 94chop($host = `uname -n`);
95 95
96if (-d "/etc/X11/fontpath.d") { 96if (-d "/etc/X11/fontpath.d") {
97 $fontPath = "catalogue:/etc/X11/fontpath.d"; 97 $fontPath = "catalogue:/etc/X11/fontpath.d";
98} 98}
99 99
100@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/'); 100@fontpaths = ('@PREFIX@/share/fonts', '@PREFIX@/share/fonts/X11/');
101if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');} 101if (! -l "@X11BASE@") {push(@fontpaths, '@X11BASE@/lib/X11/fonts');}
102if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');} 
103if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');} 
104if (! -l "/usr/X11R7") {push(@fontpaths, '/usr/X11R7/lib/X11/fonts');} 
105push(@fontpaths, '/usr/share/fonts/default'); 
106 102
107@fonttypes = ('misc', 103@fonttypes = ('misc',
108 '75dpi', 104 '75dpi',
109 '100dpi', 105 '100dpi',
110 'Speedo', 106 'Speedo',
111 'Type1'); 107 'Type1');
112 108
113foreach $_fpath (@fontpaths) { 109foreach $_fpath (@fontpaths) {
114 foreach $_ftype (@fonttypes) { 110 foreach $_ftype (@fonttypes) {
115 if (-f "$_fpath/$_ftype/fonts.dir") { 111 if (-f "$_fpath/$_ftype/fonts.dir") {
116 if (! -l "$_fpath/$_ftype") { 112 if (! -l "$_fpath/$_ftype") {
117 $defFontPath .= "$_fpath/$_ftype,"; 113 $defFontPath .= "$_fpath/$_ftype,";
118 } 114 }