Date: Tue, 22 Oct 2013 10:10:53 +0200 (CEST) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: gahr@FreeBSD.org Subject: ports/183176: [PATCH] sysutils/tmux: Convert to staging. Message-ID: <20131022081053.617F314269C@aragorn.in.absolight.net> Resent-Message-ID: <201310220820.r9M8K0Xu028151@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183176
>Category: ports
>Synopsis: [PATCH] sysutils/tmux: Convert to staging.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 22 08:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
- 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.
Port maintainer (gahr@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- tmux-1.8_1.patch begins here ---
diff -ruN /usr/ports/sysutils/tmux/Makefile ./Makefile
--- /usr/ports/sysutils/tmux/Makefile 2013-09-21 01:05:58.000000000 +0200
+++ ./Makefile 2013-10-22 10:07:01.000000000 +0200
@@ -1,5 +1,5 @@
# Created by: Wen Heping <wenheping@gmail.com>
-# $FreeBSD: sysutils/tmux/Makefile 327772 2013-09-20 23:05:58Z bapt $
+# $FreeBSD: head/sysutils/tmux/Makefile 327772 2013-09-20 23:05:58Z bapt $
PORTNAME= tmux
PORTVERSION= 1.8
@@ -13,11 +13,12 @@
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 @@
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 @@
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 @@
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 @@
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 @@
.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
.include <bsd.port.mk>
diff -ruN /usr/ports/sysutils/tmux/files/patch-tty.c ./files/patch-tty.c
--- /usr/ports/sysutils/tmux/files/patch-tty.c 2013-07-29 10:30:06.000000000 +0200
+++ ./files/patch-tty.c 2013-10-22 09:45:45.000000000 +0200
@@ -1,4 +1,4 @@
-$FreeBSD: sysutils/tmux/files/patch-tty.c 323874 2013-07-29 08:30:06Z gahr $
+$FreeBSD: head/sysutils/tmux/files/patch-tty.c 323874 2013-07-29 08:30:06Z gahr $
Apply upstream commit cbee283c26968304b473e2191d2bb5f52208b58d to prevent
OS X's Terminal.app turning on underlining when the status bar contains
--- tmux-1.8_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131022081053.617F314269C>