svn commit: r470725 - in head/textproc/tkdiff: . files

[Tobias Kortkamp]

On Wed, May 23, 2018, at 23:59, Fernando Apesteguía wrote:
> Author: fernape
> Date: Wed May 23 21:59:34 2018
> New Revision: 470725
> URL: https://svnweb.freebsd.org/changeset/ports/470725
> 
> Log:
>   textproc/tkdiff: port improvements
>   
>   * add DESKTOP_ENTRY
>   * add converters/base64 as BUILD_DEPENDS
>   * add icons
>   
>   Also give maintainership to portmaster at bsdforge.com
>   
>   PR:	228176
>   Submitted by:	portmaster at bsdforge.com
>   Approved by:	tcberner (mentor)
>   Differential Revision:	https://reviews.freebsd.org/D15480
> 
> Added:
>   head/textproc/tkdiff/files/
>   head/textproc/tkdiff/files/icon128.base64   (contents, props changed)
>   head/textproc/tkdiff/files/icon256.base64   (contents, props changed)
>   head/textproc/tkdiff/files/icon32.base64   (contents, props changed)
>   head/textproc/tkdiff/files/icon64.base64   (contents, props changed)
> Modified:
>   head/textproc/tkdiff/Makefile
> 
> Modified: head/textproc/tkdiff/Makefile
> ==============================================================================
> --- head/textproc/tkdiff/Makefile	Wed May 23 21:45:50 2018	(r470724)
> +++ head/textproc/tkdiff/Makefile	Wed May 23 21:59:34 2018	(r470725)
> @@ -3,28 +3,42 @@
>  
>  PORTNAME=	tkdiff
>  PORTVERSION=	4.2
> -PORTREVISION=	1
> +PORTREVISION=	2
>  CATEGORIES=	textproc tk
>  MASTER_SITES=	SF
>  
> -MAINTAINER=	ports at FreeBSD.org
> +MAINTAINER=	portmaster at BSDforge.com
>  COMMENT=	Tk frontend for diff(1)
>  
>  LICENSE=	GPLv2
>  LICENSE_FILE=	${WRKSRC}/LICENSE.txt
>  
> +BUILD_DEPENDS=	base64>0:converters/base64
> +
>  WRKSRC=		${WRKDIR}/${PORTNAME}-unix
>  
>  USES=		tk:wrapper
>  NO_BUILD=	yes
>  
> -PLIST_FILES=	bin/tkdiff
> +DESKTOP_ENTRIES=	"Tkdiff" "Tk frontend for the diff command" \
> +			"tkdiff" \
> +			"tkdiff" "GNOME;GTK;Development;System;" \
> +			false
>  
> +UNPACK=	base64 -d
> +
> +PLIST_FILES=	bin/tkdiff share/pixmaps/tkdiff.png share/pixmaps/
> tkdiff-256.png \
> +		share/pixmaps/tkdiff-128.png share/pixmaps/tkdiff-64.png
> +
>  post-patch:
>  	${FIND} ${WRKSRC} -type f | ${XARGS} \
>  		${REINPLACE_CMD} -e '/^exec wish/s|wish|${WISH}|g' -e '/^exec tclsh/s|
> tclsh|${TCLSH}|g'
>  
>  do-install:
> -	@${INSTALL_SCRIPT} ${WRKSRC}/tkdiff ${STAGEDIR}${PREFIX}/bin
> +	${INSTALL_SCRIPT} ${WRKSRC}/tkdiff ${STAGEDIR}${PREFIX}/bin
> +	${UNPACK} ${FILESDIR}/icon256.base64 > ${STAGEDIR}${PREFIX}/share/
> pixmaps/tkdiff-256.png
> +	${UNPACK} ${FILESDIR}/icon128.base64 > ${STAGEDIR}${PREFIX}/share/
> pixmaps/tkdiff-128.png
> +	${UNPACK} ${FILESDIR}/icon64.base64 > ${STAGEDIR}${PREFIX}/share/
> pixmaps/tkdiff-64.png
> +	${UNPACK} ${FILESDIR}/icon32.base64 > ${STAGEDIR}${PREFIX}/share/
> pixmaps/tkdiff.png
>  
>  .include <bsd.port.mk>

Hi,

I have two questions.

1. Why not use base's `b64decode -r` instead of converters/base64?

And this one goes to everyone:

2. print/jabref, misc/mc, editors/openoffice-devel, etc. seem to have
   binary files in files/*.png. Can we add new ones or is it forbidden now?
   It seems weird to have to base64 encode icons and decode them during the
   build.