svn commit: r327935 - head/sysutils/fusefs-libs

[Baptiste Daroussin]

On Mon, Sep 23, 2013 at 02:08:34PM +0200, Guido Falsi wrote:
> On 09/23/13 08:18, Baptiste Daroussin wrote:
> > Author: bapt
> > Date: Mon Sep 23 06:18:37 2013
> > New Revision: 327935
> > URL: http://svnweb.freebsd.org/changeset/ports/327935
> >
> > Log:
> >    Use stage, convert TEXT_DOCS to PORTDOCS
> >
> > Modified:
> >    head/sysutils/fusefs-libs/Makefile
> >    head/sysutils/fusefs-libs/pkg-plist
> >
> > Modified: head/sysutils/fusefs-libs/Makefile
> > ==============================================================================
> > --- head/sysutils/fusefs-libs/Makefile	Mon Sep 23 06:17:32 2013	(r327934)
> > +++ head/sysutils/fusefs-libs/Makefile	Mon Sep 23 06:18:37 2013	(r327935)
> > @@ -19,24 +19,16 @@ USE_LDCONFIG=	yes
> >   USES=		iconv
> >   CONFIGURE_ARGS=	--prefix=${PREFIX} \
> >   		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
> > -TXT_DOCS=	how-fuse-works \
> > +PORTDOCS=	how-fuse-works \
> >   		kernel.txt
> 
> [...]
> 
> >
> >   post-install:
> > -	${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${PREFIX}/include/fuse
> > +	${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${STAGEDIR}${PREFIX}/include/fuse
> >   .if ${PORT_OPTIONS:MDOCS}
> > -	@${MKDIR} ${DOCSDIR}/libs
> > -.for i in ${TXT_DOCS}
> > -	@${INSTALL_DATA} ${WRKSRC}/doc/$i ${DOCSDIR}/libs
> > -.endfor
> > +	@${MKDIR} ${STAGEDIR}${DOCSDIR}/libs
> > +	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/libs
> >   .endif
> 
> [...]
> 
> > -%%PORTDOCS%%%%DOCSDIR%%/libs/how-fuse-works
> > -%%PORTDOCS%%%%DOCSDIR%%/libs/kernel.txt
> 
> This part is creating a problem. the pkg tools look for these two files 
> in DOCSDIR, not in DOCSDIR/libs, packaging fails on head.
> 
> Attached patch fixes it.
> 
> -- 
> Guido Falsi <madpilot at FreeBSD.org>


> Index: Makefile
> ===================================================================
> --- Makefile	(revision 327982)
> +++ Makefile	(working copy)
> @@ -19,8 +19,8 @@
>  USES=		iconv
>  CONFIGURE_ARGS=	--prefix=${PREFIX} \
>  		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
> -PORTDOCS=	how-fuse-works \
> -		kernel.txt
> +PORTDOCS=	libs/how-fuse-works \
> +		libs/kernel.txt
>  
>  .include <bsd.port.options.mk>
>  
> @@ -28,7 +28,7 @@
>  	${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${STAGEDIR}${PREFIX}/include/fuse
>  .if ${PORT_OPTIONS:MDOCS}
>  	@${MKDIR} ${STAGEDIR}${DOCSDIR}/libs
> -	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/libs
> +	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS:S/libs\///} ${STAGEDIR}${DOCSDIR}/libs
>  .endif
>  
>  


Approved thanks

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20130923/f2b8df2f/attachment.sig>