Bug 183176 - [PATCH] sysutils/tmux: Convert to staging.
Summary: [PATCH] sysutils/tmux: Convert to staging.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pietro Cerutti
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-22 09:20 UTC by Mathieu Arnold
Modified: 2013-10-22 10:10 UTC (History)
1 user (show)

See Also:


Attachments
tmux-1.8_1.patch (3.41 KB, patch)
2013-10-22 09:20 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer freebsd_triage 2013-10-22 09:20:00 UTC
- 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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-22 09:20:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->gahr

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Pietro Cerutti freebsd_committer freebsd_triage 2013-10-22 09:29:32 UTC
I trust you. Go ahead, thanks!

-- 
Pietro Cerutti
The FreeBSD Project
gahr@FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
Comment 3 Mathieu Arnold freebsd_committer freebsd_triage 2013-10-22 10:07:01 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-10-22 10:07:06 UTC
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
 
 .include <bsd.port.mk>
_______________________________________________
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"