The attached patch updates to tmux 1.9, and uses the OPTIONS helpers to shorten the Makefile quite a bit. It also unmutes install commands. I *think* the files/patch-tty.c is no longer necessary. I can't reproduce the underline problem in OSX's Terminal.app.
Responsible Changed From-To: freebsd-ports-bugs->gahr Over to maintainer (via the GNATS Auto Assign Tool)
Author: gahr Date: Mon Mar 3 09:13:39 2014 New Revision: 346869 URL: http://svnweb.freebsd.org/changeset/ports/346869 QAT: https://qat.redports.org/buildarchive/r346869/ Log: - Update to 1.9a PR: 187210 (based on) Submitted by: adamw Deleted: head/sysutils/tmux/files/patch-tty.c Modified: head/sysutils/tmux/Makefile head/sysutils/tmux/distinfo Modified: head/sysutils/tmux/Makefile ============================================================================== --- head/sysutils/tmux/Makefile Mon Mar 3 09:08:08 2014 (r346868) +++ head/sysutils/tmux/Makefile Mon Mar 3 09:13:39 2014 (r346869) @@ -2,15 +2,14 @@ # $FreeBSD$ PORTNAME= tmux -PORTVERSION= 1.8 -PORTREVISION= 1 +DISTVERSION= 1.9a CATEGORIES= sysutils -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER= gahr@FreeBSD.org -COMMENT= A Terminal Multiplexer +COMMENT= Terminal Multiplexer -LICENSE= BSD +LICENSE= BSD2CLAUSE GNU_CONFIGURE= yes USES= pkgconfig shebangfix @@ -25,7 +24,7 @@ PLIST_DIRSTRY= etc/bash_completion.d PORTDOCS= CHANGES FAQ README TODO PORTEXAMPLES= * -OPTIONS_DEFINE= LIBEVENT2 LIBEVENT_STATIC BACKSPACE +OPTIONS_DEFINE= DOCS LIBEVENT2 LIBEVENT_STATIC BACKSPACE LIBEVENT2_DESC= Use libevent version 2 LIBEVENT_STATIC_DESC= Build with static libevent @@ -33,55 +32,40 @@ BACKSPACE_DESC= Build with tty/keys patc CFLAGS+= -Wno-pointer-sign -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MLIBEVENT2} -CONFIGURE_ENV+= LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \ - LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent" -. if ${PORT_OPTIONS:MLIBEVENT_STATIC} -BUILD_DEPENDS+= ${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2 -LESTATIC= ${LOCALBASE}/lib/event2/libevent.a -. else -LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 -. endif -.else -CONFIGURE_ENV+= LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \ - LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent" -. if ${PORT_OPTIONS:MLIBEVENT_STATIC} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent -LESTATIC= ${LOCALBASE}/lib/libevent.a -. else -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent -. endif -.endif +BACKSPACE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c +LIBEVENT2_CONFIGURE_ENV= LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \ + LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent" +LIBEVENT2_CONFIGURE_ENV_OFF= LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \ + LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent" +LIBEVENT2_LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 +LIBEVENT2_LIB_DEPENDS_OFF= libevent-1.4.so:${PORTSDIR}/devel/libevent -.if ${PORT_OPTIONS:MBACKSPACE} -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c -.endif +.include <bsd.port.options.mk> 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} +.if ${PORT_OPTIONS:MLIBEVENT_STATIC} +.if ${PORT_OPTIONS:MLIBEVENT2} +LESTATIC= ${LOCALBASE}/lib/event2/libevent.a +.else +LESTATIC= ${LOCALBASE}/lib/libevent.a +.endif post-configure: -.if defined(WITH_LIBEVENT_STATIC) ${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \ ${WRKSRC}/${MAKEFILE} .endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${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} + ${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} -.endif + ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/sysutils/tmux/distinfo ============================================================================== --- head/sysutils/tmux/distinfo Mon Mar 3 09:08:08 2014 (r346868) +++ head/sysutils/tmux/distinfo Mon Mar 3 09:13:39 2014 (r346869) @@ -1,2 +1,2 @@ -SHA256 (tmux-1.8.tar.gz) = f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44 -SIZE (tmux-1.8.tar.gz) = 417537 +SHA256 (tmux-1.9a.tar.gz) = c5e3b22b901cf109b20dab54a4a651f0471abd1f79f6039d79b250d21c2733f5 +SIZE (tmux-1.9a.tar.gz) = 447938 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!