Wed Jun 3 06:09:11 2009 UTC ()
Use BSD_INSTALL_* so that a non-root user can install misc/tmux.


(minskim)
diff -r1.2 -r1.3 pkgsrc/misc/tmux/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/tmux/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/tmux/patches/patch-aa
cvs diff -r1.2 -r1.3 pkgsrc/misc/tmux/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/tmux/Makefile 2009/05/02 10:50:57 1.2
+++ pkgsrc/misc/tmux/Makefile 2009/06/03 06:09:11 1.3
@@ -1,23 +1,17 @@ @@ -1,23 +1,17 @@
1# $NetBSD: Makefile,v 1.2 2009/05/02 10:50:57 hasso Exp $ 1# $NetBSD: Makefile,v 1.3 2009/06/03 06:09:11 minskim Exp $
2 2
3DISTNAME= tmux-0.8 3DISTNAME= tmux-0.8
4CATEGORIES= misc 4CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/}
6 6
7MAINTAINER= hasso@NetBSD.org 7MAINTAINER= hasso@NetBSD.org
8HOMEPAGE= http://tmux.sourceforge.net/ 8HOMEPAGE= http://tmux.sourceforge.net/
9COMMENT= BSD-licensed terminal multiplexer (GNU Screen alternative) 9COMMENT= BSD-licensed terminal multiplexer (GNU Screen alternative)
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
13NO_CONFIGURE= yes 13NO_CONFIGURE= yes
14USE_NCURSES= yes 14USE_NCURSES= yes
15 15
16INSTALL_MAKE_FLAGS+= \ 
17 INSTALL_MAN=${INSTALL_MAN:Q} \ 
18 INSTALL_MAN_DIR=${INSTALL_PROGRAM_DIR:Q} \ 
19 INSTALL_PROGRAM_DIR=${INSTALL_PROGRAM_DIR:Q} \ 
20 INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} 
21 
22.include "../../devel/ncurses/buildlink3.mk" 16.include "../../devel/ncurses/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/misc/tmux/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/tmux/distinfo 2009/05/27 06:11:23 1.3
+++ pkgsrc/misc/tmux/distinfo 2009/06/03 06:09:11 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2009/05/27 06:11:23 minskim Exp $ 1$NetBSD: distinfo,v 1.4 2009/06/03 06:09:11 minskim Exp $
2 2
3SHA1 (tmux-0.8.tar.gz) = 87a9db829ff36cc432114672f7354a74d673832b 3SHA1 (tmux-0.8.tar.gz) = 87a9db829ff36cc432114672f7354a74d673832b
4RMD160 (tmux-0.8.tar.gz) = 81f828e0af59a994e0b4ba86ab17421ffd7d7e98 4RMD160 (tmux-0.8.tar.gz) = 81f828e0af59a994e0b4ba86ab17421ffd7d7e98
5Size (tmux-0.8.tar.gz) = 175515 bytes 5Size (tmux-0.8.tar.gz) = 175515 bytes
6SHA1 (patch-aa) = 75b6b54aff322f8aa4c76e6720067f2b69cfd474 6SHA1 (patch-aa) = 74bbf3eb3a70e54645d3d0eb31cbcdfa7e1f0781
cvs diff -r1.3 -r1.4 pkgsrc/misc/tmux/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/tmux/patches/Attic/patch-aa 2009/05/27 06:11:23 1.3
+++ pkgsrc/misc/tmux/patches/Attic/patch-aa 2009/06/03 06:09:11 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2009/05/27 06:11:23 minskim Exp $ 1$NetBSD: patch-aa,v 1.4 2009/06/03 06:09:11 minskim Exp $
2 2
3--- Makefile.orig 2009-04-27 17:38:18.000000000 +0200 3--- Makefile.orig 2009-04-27 17:38:18.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -81,6 +81,12 @@ LDFLAGS+= -pg 5@@ -81,6 +81,12 @@ LDFLAGS+= -pg
6 .endif 6 .endif
7 LIBS+= -lutil -lncurses 7 LIBS+= -lutil -lncurses
8  8
9+# Darwin 9+# Darwin
10+.if ${OS} == "Darwin" 10+.if ${OS} == "Darwin"
11+SRCS+= compat/strtonum.c compat/vis.c 11+SRCS+= compat/strtonum.c compat/vis.c
12+CFLAGS+= -DNO_SETPROCTITLE -DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H 12+CFLAGS+= -DNO_SETPROCTITLE -DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H
13+.endif 13+.endif
14+ 14+
@@ -18,13 +18,25 @@ $NetBSD: patch-aa,v 1.3 2009/05/27 06:11 @@ -18,13 +18,25 @@ $NetBSD: patch-aa,v 1.3 2009/05/27 06:11
18@@ -91,10 +97,10 @@ LIBS+= -lcrypt 18@@ -91,10 +97,10 @@ LIBS+= -lcrypt
19  19
20 # NetBSD 20 # NetBSD
21 .if ${OS} == "NetBSD" 21 .if ${OS} == "NetBSD"
22-INCDIRS= -Icompat 22-INCDIRS= -Icompat
23+INCDIRS+= -Icompat 23+INCDIRS+= -Icompat
24 SRCS+= compat/strtonum.c compat/vis.c 24 SRCS+= compat/strtonum.c compat/vis.c
25 LIBS+= -lcrypt 25 LIBS+= -lcrypt
26-CFLAGS+=-DNO_STRTONUM 26-CFLAGS+=-DNO_STRTONUM
27+CFLAGS+=-DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H 27+CFLAGS+=-DNO_STRTONUM -DNO_QUEUE_H -DNO_TREE_H
28 .endif 28 .endif
29  29
30 OBJS= ${SRCS:S/.c/.o/:S/.y/.o/} 30 OBJS= ${SRCS:S/.c/.o/:S/.y/.o/}
 31@@ -152,7 +158,7 @@ update-index.html:
 32 sed "s/%%VERSION%%/${VERSION}/g" index.html.in >index.html
 33
 34 install: all
 35- ${INSTALLDIR} ${DESTDIR}${PREFIX}/bin
 36- ${INSTALLBIN} ${PROG} ${DESTDIR}${PREFIX}/bin/
 37- ${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1
 38- ${INSTALLMAN} ${PROG}.1 ${DESTDIR}${PREFIX}/man/man1/
 39+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
 40+ ${BSD_INSTALL_PROGRAM} ${PROG} ${DESTDIR}${PREFIX}/bin/
 41+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/man/man1
 42+ ${BSD_INSTALL_MAN} ${PROG}.1 ${DESTDIR}${PREFIX}/man/man1/