Date: Thu, 5 Nov 2009 18:55:08 -0500 (EST) From: Sahil Tandon <sahil@tandon.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: wen@FreeBSD.org Subject: ports/140323: [PATCH] sysutils/tmux: update to 1.1 and slightly refactor port Message-ID: <20091105235508.702F017093@spartan.hamla.org> Resent-Message-ID: <200911060000.nA600CFQ052563@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140323
>Category: ports
>Synopsis: [PATCH] sysutils/tmux: update to 1.1 and slightly refactor port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 06 00:00:12 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Sahil Tandon
>Release: FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to 1.1
- Reduce "noise" (textual output) during install
- Replace files/patch-configure with ${REINPLACE_CMD} in Makefile
- Replace pkg-plist with definition of PLIST_FILES, PORTDOCS and PORTEXAMPLES in Makefile
>How-To-Repeat:
>Fix:
--- tmux.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/tmux/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 16 Oct 2009 14:06:41 -0000 1.12
+++ Makefile 5 Nov 2009 23:49:17 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= tmux
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -18,23 +17,30 @@
MAN1= tmux.1
+PLIST_FILES= bin/tmux
+
+PORTDOCS= CHANGES FAQ NOTES
+PORTEXAMPLES= *
+
+post-patch:
+ @${REINPLACE_CMD} -e '/^#define HAVE_TREE_H/d' \
+ ${WRKSRC}/configure
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/tmux ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/tmux.1 ${MANPREFIX}/man/man1
+ @${INSTALL_PROGRAM} ${WRKSRC}/tmux ${PREFIX}/bin
+ @${INSTALL_MAN} ${WRKSRC}/tmux.1 ${MANPREFIX}/man/man1
post-install:
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
-.for i in CHANGES FAQ NOTES
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
.if !defined(NOPORTEXAMPLES)
- ${MKDIR} ${EXAMPLESDIR}
-.for i in h-boetes.conf n-marriott.sh n-marriott.conf screen-keys.conf tmux.vim
- ${INSTALL_DATA} ${WRKSRC}/examples/${i} ${EXAMPLESDIR}
-.endfor
+ @${MKDIR} ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/tmux/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 14 Oct 2009 14:01:00 -0000 1.10
+++ distinfo 5 Nov 2009 23:49:17 -0000
@@ -1,3 +1,3 @@
-MD5 (tmux-1.0.tar.gz) = 716b12d9ea052f57d917bf2869d419df
-SHA256 (tmux-1.0.tar.gz) = f260fef8293b3eec795b21d3b561049b758c482dc6a04dba09fdce10ef8d3a6b
-SIZE (tmux-1.0.tar.gz) = 215329
+MD5 (tmux-1.1.tar.gz) = faf2fc52ac3ae63d899f6fece2c112cd
+SHA256 (tmux-1.1.tar.gz) = b3626ecb74185c5764be658fd359c3fe29ffbe5d1936de81d6628b686558436a
+SIZE (tmux-1.1.tar.gz) = 230955
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist 16 Oct 2009 14:06:41 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-bin/tmux
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h-boetes.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/n-marriott.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/n-marriott.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/screen-keys.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tmux.vim
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure 14 Oct 2009 14:01:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- configure.orig 2009-10-11 09:21:43.000000000 +0800
-+++ configure 2009-10-11 09:22:11.000000000 +0800
-@@ -212,7 +212,6 @@
- #define HAVE_STRLCPY
- #define HAVE_STRTONUM
- #define HAVE_STRSEP
--#define HAVE_TREE_H
- #define HAVE_U_INT
- EOF
- cat <<EOF >>$CONFIG_MK
--- tmux.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091105235508.702F017093>