Date: Tue, 22 Oct 2013 05:30:35 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Mathieu Arnold <mat@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r331243 - head/sysutils/tmux Message-ID: <526653CB.3080106@FreeBSD.org> In-Reply-To: <201310220906.r9M96xBM055204@svn.freebsd.org> References: <201310220906.r9M96xBM055204@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --XqxGgIPu8xAVXivTTqCAIeLV6T4Tjoaq4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 >=20 > 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 al= l. > =20 > PR: ports/183176 > Submitted by: mat > Approved by: gahr (maintainer) >=20 > Modified: > head/sysutils/tmux/Makefile >=20 > Modified: head/sysutils/tmux/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D A Terminal Multiplexer > LICENSE=3D BSD > =20 > GNU_CONFIGURE=3D yes > -USES=3D pkgconfig > +USES=3D pkgconfig shebangfix > =20 > -MAN1=3D tmux.1 > +SHEBANG_FILES=3D examples/tmux_backup.sh > =20 > PLIST_FILES=3D bin/tmux \ > + man/man1/tmux.1.gz \ > etc/bash_completion.d/tmux > PLIST_DIRSTRY=3D etc/bash_completion.d > =20 > @@ -30,7 +31,6 @@ LIBEVENT2_DESC=3D Use libevent version 2 > LIBEVENT_STATIC_DESC=3D Build with static libevent > BACKSPACE_DESC=3D Build with tty/keys patch > =20 > -NO_STAGE=3D yes > .include <bsd.port.options.mk> > =20 > .if ${PORT_OPTIONS:MLIBEVENT2} > @@ -40,7 +40,7 @@ CONFIGURE_ENV+=3D LIBEVENT_CFLAGS=3D"-I${LOC > BUILD_DEPENDS+=3D ${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel= /libevent2 > LESTATIC=3D ${LOCALBASE}/lib/event2/libevent.a > . else > -LIB_DEPENDS=3D event-2:${PORTSDIR}/devel/libevent2 > +LIB_DEPENDS=3D libevent-2.0.so:${PORTSDIR}/devel/libevent2 > . endif > .else > CONFIGURE_ENV+=3D LIBEVENT_CFLAGS=3D"-I${LOCALBASE}/include" \ > @@ -49,7 +49,7 @@ CONFIGURE_ENV+=3D LIBEVENT_CFLAGS=3D"-I${LOC > BUILD_DEPENDS+=3D ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libeve= nt > LESTATIC=3D ${LOCALBASE}/lib/libevent.a > . else > -LIB_DEPENDS=3D event-1:${PORTSDIR}/devel/libevent > +LIB_DEPENDS=3D libevent-1.4.so:${PORTSDIR}/devel/libevent > . endif > .endif > =20 > @@ -60,7 +60,7 @@ EXTRA_PATCHES=3D ${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=3D/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}= > + @${REINPLACE_CMD} -e '/LIBS=3D/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT= } > =20 > post-configure: > .if defined(WITH_LIBEVENT_STATIC) > @@ -69,21 +69,17 @@ post-configure: > .endif > =20 > 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 ${STAGEDI= R}${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. > =20 > .include <bsd.port.mk> >=20 --=20 Regards, Bryan Drewery --XqxGgIPu8xAVXivTTqCAIeLV6T4Tjoaq4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSZlPLAAoJEG54KsA8mwz52pEP/2Enfi0M9cC3dW6tgM3AmKKN MvBdrLVeUKrdLYKpHAeSwaIAyjGgfyMqsv4XQDNUXUi/W1VakPDYsmM5Qjo8widz Lay5DtJfpUDsH1x0tsFQbPeb4DXm6aMehw2n3BQ2j7pqGKKOkX7ZINFqyuWrcuwl BGubIQ+ib2/9+B+E1UsOfLBq5+Xg9D+DO3d3MRxbbAGOSKNEKJ+Ttk2+Sau0ezMz Ka+5XB3EDcHnqmjxn9leY3rH0J5DXt/QTtTU0tEYkVVdWhKpHJvlVrpbI17kmfOm jpZu6bhtIjKrtMvc4iiPcMpLvmJRBkwZFF7yQXbcXDV++3NqmE9ZD7vL6FOnGQSu netp1HlyPDkyfIWEe7uX8aka4mi33bnPUi550Ulw8L9FF/OGqnB8ffJMGYuGT2rx ECEfE+0WZTPsMyfvfCLfeB4m228/C/CJQMWp/4c6lAJaS74/CSPki5YgRuR5y5XJ Cvufdmpo2GQBQr7VEh+CBlXoZuXIMH7WbZL4OVYm3X8iN4rxlLmTCKElWYQM5of3 b81q0PrjthBM0zlu1bhS3oCZYHTylHdeuK4NZVt7jVuZuWLGy+xBbpadPiXnhVVT slPOgNYgFsXCutESpI5GTdI9jnWSykT//rU+WBsFRw3or5JWjFxlCL5dzzRbfqX7 VCcyAM7gzI7YlaDPCVAz =DLXG -----END PGP SIGNATURE----- --XqxGgIPu8xAVXivTTqCAIeLV6T4Tjoaq4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?526653CB.3080106>