Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Oct 2014 15:57:57 +0200
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        John Marino <marino@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r371438 - head/x11-fm/ultracopier
Message-ID:  <20141024155757.788a2e60@kalimero.tijl.coosemans.org>
In-Reply-To: <201410241332.s9ODWkqS026639@svn.freebsd.org>
References:  <201410241332.s9ODWkqS026639@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 24 Oct 2014 13:32:46 +0000 (UTC) John Marino <marino@FreeBSD.org> wrote:
> Author: marino
> Date: Fri Oct 24 13:32:45 2014
> New Revision: 371438
> URL: https://svnweb.freebsd.org/changeset/ports/371438
> QAT: https://qat.redports.org/buildarchive/r371438/
> 
> Log:
>   x11-fm/ultracopier: Work around PLIST_FILES limitation
>   
>   PLIST_FILES won't support keywords, forcing this port to have a two-line
>   pkg-plist to work around this limitation.

In this case you can just remove the @exec/@unexec because
USES=desktop-file-utils already deals with it.


> Added:
>   head/x11-fm/ultracopier/pkg-plist   (contents, props changed)
> Modified:
>   head/x11-fm/ultracopier/Makefile
> 
> Modified: head/x11-fm/ultracopier/Makefile
> ==============================================================================
> --- head/x11-fm/ultracopier/Makefile	Fri Oct 24 13:06:45 2014	(r371437)
> +++ head/x11-fm/ultracopier/Makefile	Fri Oct 24 13:32:45 2014	(r371438)
> @@ -3,7 +3,7 @@
>  
>  PORTNAME=	ultracopier
>  PORTVERSION=	0.2.0.16
> -PORTREVISION=	6
> +PORTREVISION=	7
>  CATEGORIES=	x11-fm kde
>  MASTER_SITES=	http://files.first-world.info/ultracopier/${PORTVERSION}/
>  DISTNAME=	${PORTNAME}-src-${PORTVERSION}
> @@ -21,14 +21,11 @@ USE_QT4=	corelib dbus gui moc_build netw
>  USES=		cmake desktop-file-utils tar:bzip2
>  CMAKE_ARGS+=	-DCMAKE_BUILD_KDE4:bool=true
>  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> -UDDATABASE=	${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true
>  
>  PLIST_FILES=	${DESKTOPDIR:Q}/ultracopier.desktop \
>  		bin/ultracopier \
>  		share/icons/hicolor/16x16/apps/ultracopier.png \
> -		share/icons/hicolor/128x128/apps/ultracopier.png \
> -		"@exec ${UDDATABASE}" \
> -		"@unexec ${UDDATABASE}" 
> +		share/icons/hicolor/128x128/apps/ultracopier.png
>  		
>  post-patch:
>  	@${REINPLACE_CMD} -E \
> 
> Added: head/x11-fm/ultracopier/pkg-plist
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/x11-fm/ultracopier/pkg-plist	Fri Oct 24 13:32:45 2014	(r371438)
> @@ -0,0 +1,2 @@
> +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
> +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141024155757.788a2e60>