Attachment #150743 for bug #196118




%%RICTY%%%%DATADIR%%/Ricty-Regular.ttf
%%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf
%%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf
@dirrm %%DATADIR%%
%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf
%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf
%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
@dirrmtry %%LOCAL_FONTSDIR%%/TTF
@dirrmtry %%LOCAL_FONTSDIR%%
%%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf
%%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf
%%RICTY%%etc/fonts/conf.d/20-unhint-ricty.conf

@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true
@unexec rm -f %D/%%X_FONTSDIR%%/OTF/fonts.cache-1
@dirrmtry %%X_FONTSDIR%%/TTF
@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TTF || true; fi





PORTNAME=	tigervnc
PORTVERSION=	1.3.1
PORTREVISION=	7
CATEGORIES=	net x11-servers
MASTER_SITES=	https://github.com/TigerVNC/tigervnc/archive/v${PORTVERSION}${EXTRACT_SUFX}?dummy=/

MAINTAINER=	meta+ports@vmeta.jp
COMMENT=	High-performance, platform-neutral implementation of VNC

LICENSE=	GPLv2

USE_GITHUB=	yes
GH_ACCOUNT=	TigerVNC
GH_PROJECT=	tigervnc
GH_TAGNAME=	v${PORTVERSION}
GH_COMMIT=	604648d

PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
BUILD_DEPENDS=	${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri \
		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util \

	@${CP} -R `${XORG_WRKDIR}`/ ${WRKSRC}/unix/xserver/

post-patch:
	# workaround to fix the build after xorg-server security advisory (r374489)
	@cd ${WRKSRC}/unix/xserver/ && ${CP} include/regionstr.h.orig include/regionstr.h
	# apply tigervnc patches to xorg-server source
	@cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch

post-configure:

Lines 1-2 Link Here

(-)net/tigervnc/distinfo (-2 / +2 lines)
1	SHA256 (tigervnc-1.3.1.tar.gz) = e6d3a62c4a1a560a82184f23c4138717bd8596232f133010f0520130f039ff1f	1	SHA256 (tigervnc-1.3.1.tar.gz) = e36f70177b008f1a75e239fd5e7feebfcd09e5b6edc9450f79e71c1657842b98
2	SIZE (tigervnc-1.3.1.tar.gz) = 6827182	2	SIZE (tigervnc-1.3.1.tar.gz) = 6827102

Return to bug 196118

Lines 2-14 Link Here

(-)japanese/font-ricty/pkg-plist (-4 lines)
2	%%RICTY%%%%DATADIR%%/Ricty-Regular.ttf	2	%%RICTY%%%%DATADIR%%/Ricty-Regular.ttf
3	%%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf	3	%%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf
4	%%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf	4	%%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf
5	@dirrm %%DATADIR%%
6	%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf	5	%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf
7	%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf	6	%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf
8	%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf	7	%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
9	%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf	8	%%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
10	@dirrmtry %%LOCAL_FONTSDIR%%/TTF
11	@dirrmtry %%LOCAL_FONTSDIR%%
12	%%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf	9	%%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf
13	%%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf	10	%%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf
14	%%RICTY%%etc/fonts/conf.d/20-unhint-ricty.conf	11	%%RICTY%%etc/fonts/conf.d/20-unhint-ricty.conf
Lines 24-28 Link Here
24	@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF \|\| true	21	@exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF \|\| true
25	@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF \|\| true	22	@unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF \|\| true
26	@unexec rm -f %D/%%X_FONTSDIR%%/OTF/fonts.cache-1	23	@unexec rm -f %D/%%X_FONTSDIR%%/OTF/fonts.cache-1
27	@dirrmtry %%X_FONTSDIR%%/TTF
28	@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TTF \|\| true; fi	24	@unexec if [ -d %D/%%X_FONTSDIR%%/TTF ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TTF \|\| true; fi

Lines 3-22 Link Here

(-)net/tigervnc/Makefile (-7 / +5 lines)
3		3
4	PORTNAME= tigervnc	4	PORTNAME= tigervnc
5	PORTVERSION= 1.3.1	5	PORTVERSION= 1.3.1
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= net x11-servers	7	CATEGORIES= net x11-servers
		8	MASTER_SITES= https://github.com/TigerVNC/tigervnc/archive/v${PORTVERSION}${EXTRACT_SUFX}?dummy=/
8		9
9	MAINTAINER= meta+ports@vmeta.jp	10	MAINTAINER= meta+ports@vmeta.jp
10	COMMENT= High-performance, platform-neutral implementation of VNC	11	COMMENT= High-performance, platform-neutral implementation of VNC
11		12
12	LICENSE= GPLv2	13	LICENSE= GPLv2
13		14
14	USE_GITHUB= yes
15	GH_ACCOUNT= TigerVNC
16	GH_PROJECT= tigervnc
17	GH_TAGNAME= v${PORTVERSION}
18	GH_COMMIT= 604648d
19
20	PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch	15	PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch
21	BUILD_DEPENDS= ${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri \	16	BUILD_DEPENDS= ${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri \
22	${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util \	17	${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util \
Lines 141-146 pre-patch: Link Here
141	@${CP} -R `${XORG_WRKDIR}`/ ${WRKSRC}/unix/xserver/	136	@${CP} -R `${XORG_WRKDIR}`/ ${WRKSRC}/unix/xserver/
142		137
143	post-patch:	138	post-patch:
		139	# workaround to fix the build after xorg-server security advisory (r374489)
		140	@cd ${WRKSRC}/unix/xserver/ && ${CP} include/regionstr.h.orig include/regionstr.h
		141	# apply tigervnc patches to xorg-server source
144	@cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch	142	@cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch
145		143
146	post-configure:	144	post-configure: