svn commit: r360235 - in head/x11-fonts: doulos doulos-compact

[Boris Samorodov]

Hi, Brendan,

02.07.2014 22:10, Brendan Fabeny пишет:
> Author: bf
> Date: Wed Jul  2 18:10:06 2014
> New Revision: 360235
> URL: http://svnweb.freebsd.org/changeset/ports/360235
> QAT: https://qat.redports.org/buildarchive/r360235/
> 
> Log:
>   Use options and staging
> 
> Modified:
>   head/x11-fonts/doulos-compact/Makefile
>   head/x11-fonts/doulos/Makefile
> 
> Modified: head/x11-fonts/doulos-compact/Makefile
> ==============================================================================
> --- head/x11-fonts/doulos-compact/Makefile	Wed Jul  2 18:03:51 2014	(r360234)
> +++ head/x11-fonts/doulos-compact/Makefile	Wed Jul  2 18:10:06 2014	(r360235)
> @@ -13,7 +13,7 @@ MASTER_SITES=	LOCAL/bf
>  .endif
>  MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
>  
> -MAINTAINER=	ports at FreeBSD.org
> +MAINTAINER=	bf at FreeBSD.org
>  COMMENT=	Doulos SIL TrueType font collection, compact variant
>  
>  LICENSE=	OFL11
> @@ -26,6 +26,10 @@ INSTALLS_TTF=	yes
>  NO_BUILD=	yes
>  
>  PLIST_FILES=	${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf
> +
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MDOCS}
>  PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml
>  
>  SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
> @@ -36,8 +40,10 @@ do-configure:
>  
>  do-install:
>  	@${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
> -	(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR})
> +	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR})

I'm mostly irrelevant here. However it seems to me that we mostly mute
only mkdir, but not other file manipulation.

> +.if ${PORT_OPTIONS:MDOCS}

While with this I'd say that this is totally redundant (i.e. current
ports tree infrastructure does the right thing itself). So ".include
<bsd.port.options.mk>" and ".if ${PORT_OPTIONS:MDOCS}" become unneeded
over complication.

>  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> -	(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
> +	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
> +.endif
>  
>  .include <bsd.port.mk>
> 
> Modified: head/x11-fonts/doulos/Makefile
> ==============================================================================
> --- head/x11-fonts/doulos/Makefile	Wed Jul  2 18:03:51 2014	(r360234)
> +++ head/x11-fonts/doulos/Makefile	Wed Jul  2 18:10:06 2014	(r360235)
> @@ -8,7 +8,7 @@ MASTER_SITES=	http://scripts.sil.org/cms
>  		LOCAL/bf
>  MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
>  
> -MAINTAINER=	ports at FreeBSD.org
> +MAINTAINER=	bf at FreeBSD.org
>  COMMENT=	Doulos SIL TrueType font collection
>  
>  LICENSE=	OFL11
> @@ -22,6 +22,10 @@ MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
>  NO_BUILD=	yes
>  
>  PLIST_FILES=	${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf
> +
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MDOCS}
>  PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
>  
>  SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
> @@ -32,8 +36,10 @@ do-configure:
>  
>  do-install:
>  	@${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
> -	(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR})
> +	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR})
> +.if ${PORT_OPTIONS:MDOCS}
>  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> -	(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
> +	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
> +.endif
>  
>  .include <bsd.port.mk>
> 


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