diff options
| author | nia <nia@pkgsrc.org> | 2021-10-01 11:42:23 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-10-01 11:42:23 +0000 |
| commit | 42384882e12002bab3abe6d131ed809154d32dde (patch) | |
| tree | cc9c14d503c508e1c74a31ef1522e07a6e44c327 /net | |
| parent | be0f54f5ed78acb9cadfb7b219b2a338e3c3e86f (diff) | |
| download | pkgsrc-42384882e12002bab3abe6d131ed809154d32dde.tar.gz | |
tigervnc: Avoid hardcoding X11BASE
Diffstat (limited to 'net')
| -rw-r--r-- | net/tigervnc/Makefile | 5 | ||||
| -rw-r--r-- | net/tigervnc/files/vncserver.pl | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index 4e9d62ec0a8..92fca25cfa6 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2021/09/30 21:38:23 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2021/10/01 11:42:23 nia Exp $ DISTNAME= tigervnc-1.11.0 PKGNAME= ${DISTNAME}.1.20.11 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} GITHUB_TAG= v1.11.0 @@ -48,6 +48,7 @@ SUBST_CLASSES+= hpath SUBST_STAGE.hpath= pre-configure SUBST_MESSAGE.hpath= fixing hardcoded paths SUBST_FILES.hpath= unix/vncserver/vncserver.in +SUBST_FILES.hpath= vncserver.pl SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' SUBST_VARS.hpath+= PREFIX X11BASE diff --git a/net/tigervnc/files/vncserver.pl b/net/tigervnc/files/vncserver.pl index fb98b5bc9b3..c8f98102468 100644 --- a/net/tigervnc/files/vncserver.pl +++ b/net/tigervnc/files/vncserver.pl @@ -97,12 +97,8 @@ if (-d "/etc/X11/fontpath.d") { $fontPath = "catalogue:/etc/X11/fontpath.d"; } -@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/'); -if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');} -if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');} -if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');} -if (! -l "/usr/X11R7") {push(@fontpaths, '/usr/X11R7/lib/X11/fonts');} -push(@fontpaths, '/usr/share/fonts/default'); +@fontpaths = ('@PREFIX@/share/fonts', '@PREFIX@/share/fonts/X11/'); +if (! -l "@X11BASE@") {push(@fontpaths, '@X11BASE@/lib/X11/fonts');} @fonttypes = ('misc', '75dpi', |