svn commit: r331243 - head/sysutils/tmux

[Bryan Drewery]

On 10/22/2013 4:06 AM, Mathieu Arnold wrote:
> Author: mat
> Date: Tue Oct 22 09:06:59 2013
> New Revision: 331243
> URL: http://svnweb.freebsd.org/changeset/ports/331243
> 
> Log:
>   - Convert to staging
>   - Use new LIB_DEPENDS format
>   - Fixup some DEVELOPER errors
>   - Make more silent, no reason to have some commands echoed and not all.
>   
>   PR:		ports/183176
>   Submitted by:	mat
>   Approved by:	gahr (maintainer)
> 
> Modified:
>   head/sysutils/tmux/Makefile
> 
> Modified: head/sysutils/tmux/Makefile
> ==============================================================================
> --- head/sysutils/tmux/Makefile	Tue Oct 22 09:06:15 2013	(r331242)
> +++ head/sysutils/tmux/Makefile	Tue Oct 22 09:06:59 2013	(r331243)
> @@ -13,11 +13,12 @@ COMMENT=	A Terminal Multiplexer
>  LICENSE=	BSD
>  
>  GNU_CONFIGURE=	yes
> -USES=		pkgconfig
> +USES=		pkgconfig shebangfix
>  
> -MAN1=		tmux.1
> +SHEBANG_FILES=	examples/tmux_backup.sh
>  
>  PLIST_FILES=	bin/tmux \
> +		man/man1/tmux.1.gz \
>  		etc/bash_completion.d/tmux
>  PLIST_DIRSTRY=	etc/bash_completion.d
>  
> @@ -30,7 +31,6 @@ LIBEVENT2_DESC=	Use libevent version 2
>  LIBEVENT_STATIC_DESC=	Build with static libevent
>  BACKSPACE_DESC=	Build with tty/keys patch
>  
> -NO_STAGE=	yes
>  .include <bsd.port.options.mk>
>  
>  .if ${PORT_OPTIONS:MLIBEVENT2}
> @@ -40,7 +40,7 @@ CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOC
>  BUILD_DEPENDS+=	${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
>  LESTATIC=	${LOCALBASE}/lib/event2/libevent.a
>  . else
> -LIB_DEPENDS=	event-2:${PORTSDIR}/devel/libevent2
> +LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
>  . endif
>  .else
>  CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
> @@ -49,7 +49,7 @@ CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOC
>  BUILD_DEPENDS+=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
>  LESTATIC=	${LOCALBASE}/lib/libevent.a
>  . else
> -LIB_DEPENDS=	event-1:${PORTSDIR}/devel/libevent
> +LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
>  . endif
>  .endif
>  
> @@ -60,7 +60,7 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-t
>  post-patch:
>  	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
>  		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
> -	${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
> +	@${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
>  
>  post-configure:
>  .if defined(WITH_LIBEVENT_STATIC)
> @@ -69,21 +69,17 @@ post-configure:
>  .endif
>  
>  do-install:
> -	@${INSTALL_PROGRAM} ${WRKSRC}/tmux ${PREFIX}/bin
> -	@${INSTALL_MAN} ${WRKSRC}/tmux.1 ${MANPREFIX}/man/man1
> -
> -post-install:
> -	${MKDIR} ${PREFIX}/etc/bash_completion.d
> -	@${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${PREFIX}/etc/bash_completion.d/tmux
> +	@${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin
> +	@${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1
> +	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
> +	@${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
>  .if ${PORT_OPTIONS:MDOCS}
> -	@${MKDIR} ${DOCSDIR}
> -.for i in ${PORTDOCS}
> -	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
> -.endfor
> +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> +	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>  .endif
>  .if ${PORT_OPTIONS:MEXAMPLES}
> -	@${MKDIR} ${EXAMPLESDIR}
> -	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
> +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> +	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
>  .endif

I think the general trend is to not hide any install commands since it
is touching the user's system, and is good for debugging build logs.

It's subtle, but all porters handbook examples for post-install are not
silenced with @ either.


>  
>  .include <bsd.port.mk>
> 


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20131022/a8e0279e/attachment.sig>