Attachment 152417 Details for Bug 195845 – merge jan's stagedir fixup

[patch] merge jan's stagedir fixup

patch-ja-font-ricty-3.2.4.txt (text/plain), 3.21 KB, created by Koichiro Iwao on 2015-01-31 16:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2015-01-31 16:10:12 UTC

Size: 3.21 KB

patch

obsolete

>diff --git japanese/font-ricty/Makefile japanese/font-ricty/Makefile
>index b740b81..0668c7f 100644
>--- japanese/font-ricty/Makefile
>+++ japanese/font-ricty/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ricty
>-PORTVERSION=	3.2.3
>+PORTVERSION=	3.2.4
> CATEGORIES=	japanese x11-fonts
> PKGNAMEPREFIX=	ja-font-
> 
>@@ -17,9 +17,9 @@ BUILD_DEPENDS=	${LOCALBASE}/${X_FONTSDIR}/OTF/Inconsolata.otf:${PORTSDIR}/x11-fo
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	yascentur
>-GH_COMMIT=	${GH_TAGNAME}
> GH_PROJECT=	Ricty
>-GH_TAGNAME=	0fd7047
>+GH_TAGNAME=	${PORTVERSION}
>+GH_COMMIT=	c22daa9
> 
> NO_PACKAGE=	redistribution is not allowed
> PKGINSTALL=	${WRKDIR}/pkg-install
>@@ -54,7 +54,7 @@ RUN_DEPENDS+=	${DATADIR}/RictyDiscord-Regular.ttf:${PORTSDIR}/japanese/font-rict
> .endif
> 
> do-build:
>-	cd ${WRKSRC} &&\
>+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
> 		${SH} ${WRKSRC}/ricty_generator.sh \
> 			${PREFIX}/${X_FONTSDIR}/OTF/Inconsolata.otf \
> 			${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-regular.ttf \
>@@ -98,8 +98,4 @@ do-install:
> 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> .endif
> 
>-post-install:
>-	${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF
>-	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>-
> .include <bsd.port.mk>
>diff --git japanese/font-ricty/distinfo japanese/font-ricty/distinfo
>index e9809f7..96cdd31 100644
>--- japanese/font-ricty/distinfo
>+++ japanese/font-ricty/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (ricty-3.2.3.tar.gz) = cd51e941c59a13a5b42302e5b135db7fead06ddf69ca700453bf16a4eeadb95d
>-SIZE (ricty-3.2.3.tar.gz) = 14708
>+SHA256 (ricty-3.2.4.tar.gz) = c226ace2933bdf15b31318298486c494e0e53f422b91feb09ae5ec56d51ed9b4
>+SIZE (ricty-3.2.4.tar.gz) = 256833
>diff --git japanese/font-ricty/files/pkg-install.in japanese/font-ricty/files/pkg-install.in
>index 735b741..69d6bb1 100644
>--- japanese/font-ricty/files/pkg-install.in
>+++ japanese/font-ricty/files/pkg-install.in
>@@ -7,7 +7,8 @@ catfontsdir ()
>     while read _IN
>     do
>       case "${_IN}" in
>-      *-Ricty*) ;;
>+%%RICTY%%   *-Ricty-*) ;;
>+%%DISCORD%% *-Ricty\ Discord-*) ;;
>       *)       echo ${_IN} ;;
>       esac
>     done
>diff --git japanese/font-ricty/pkg-plist japanese/font-ricty/pkg-plist
>index 4dd56a2..7191540 100644
>--- japanese/font-ricty/pkg-plist
>+++ japanese/font-ricty/pkg-plist
>@@ -2,13 +2,10 @@
> %%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
>@@ -24,5 +21,4 @@
> @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

Actions: View | Diff

Attachments on bug 195845: 150423 | 150730 | 152414 | 152417