svn commit: r361958 - head/chinese/opendesktop-fonts

[Boris Samorodov]

15.07.2014 19:45, Yen-Ming Lee пишет:
> Author: leeym
> Date: Tue Jul 15 15:45:39 2014
> New Revision: 361958
> URL: http://svnweb.freebsd.org/changeset/ports/361958
> QAT: https://qat.redports.org/buildarchive/r361958/
> 
> Log:
>   - fix improper stage

Also was done:
. change at CONFLICTS;
. change at pkg-plist.

I'd say that a PORTREVISION bump is warranted.

> Modified:
>   head/chinese/opendesktop-fonts/Makefile
>   head/chinese/opendesktop-fonts/pkg-plist
> 
> Modified: head/chinese/opendesktop-fonts/Makefile
> ==============================================================================
> --- head/chinese/opendesktop-fonts/Makefile	Tue Jul 15 15:45:35 2014	(r361957)
> +++ head/chinese/opendesktop-fonts/Makefile	Tue Jul 15 15:45:39 2014	(r361958)
> @@ -11,7 +11,7 @@ MASTER_SITES?=	ftp://ftp.opendesktop.org
>  MAINTAINER=	ports at FreeBSD.org
>  COMMENT=	Ming and Kai face of OpenDesktop fonts
>  
> -CONFLICTS=	zh-fireflyttf-*
> +CONFLICTS=	zh-fireflyttf-[0-9]*
>  DIST_SUBDIR=	OpenFonts
>  NO_BUILD=	yes
>  
> @@ -41,7 +41,8 @@ do-install:
>  .endfor
>  	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR}
>  .if !defined(WITHOUT_X11)
> -	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${LOCALBASE}/etc/fonts/local.conf
> +	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts
> +	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${PREFIX}/etc/fonts/local.conf
>  .endif
>  
>  .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
> 
> Modified: head/chinese/opendesktop-fonts/pkg-plist
> ==============================================================================
> --- head/chinese/opendesktop-fonts/pkg-plist	Tue Jul 15 15:45:35 2014	(r361957)
> +++ head/chinese/opendesktop-fonts/pkg-plist	Tue Jul 15 15:45:39 2014	(r361958)
> @@ -1,3 +1,5 @@
> +etc/fonts/local.conf
>  %%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi
>  %%FONTSDIR%%/local.conf-odo
>  %%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%LOCALBASE%%/etc/fonts/local.conf
> + at dirrmtry etc/fonts
> 

-- 
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve