PKG_DESTDIR_SUPPORTdiff -r1.24 -r1.25 pkgsrc/comms/snooper/Makefile
(abs)
@@ -1,23 +1,25 @@ | @@ -1,23 +1,25 @@ | |||
1 | # $NetBSD: Makefile,v 1.24 2007/11/17 13:40:16 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.25 2009/12/17 21:43:16 abs Exp $ | |
2 | 2 | |||
3 | DISTNAME= snooper-19991202 | 3 | DISTNAME= snooper-19991202 | |
4 | PKGREVISION= 1 | 4 | PKGREVISION= 1 | |
5 | CATEGORIES= comms | 5 | CATEGORIES= comms | |
6 | MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/snooper/ | 6 | MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/snooper/ | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | COMMENT= Serial line protocol analyzer (need two serial interfaces) | 9 | COMMENT= Serial line protocol analyzer (need two serial interfaces) | |
10 | 10 | |||
11 | WRKSRC= ${WRKDIR}/snooper | 11 | WRKSRC= ${WRKDIR}/snooper | |
12 | GNU_CONFIGURE= yes | 12 | GNU_CONFIGURE= yes | |
13 | CONFIGURE_DIRS= build | 13 | CONFIGURE_DIRS= build | |
14 | BUILD_DIRS= build | 14 | BUILD_DIRS= build | |
15 | 15 | |||
16 | INSTALLATION_DIRS+= share/doc/snooper | |||
17 | PKG_DESTDIR_SUPPORT= destdir | |||
18 | ||||
16 | post-extract: | 19 | post-extract: | |
17 | ${RM} ${WRKSRC}/build/.depend | 20 | ${RM} ${WRKSRC}/build/.depend | |
18 | 21 | |||
19 | post-install: | 22 | post-install: | |
20 | ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snooper | 23 | ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/snooper | |
21 | ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/snooper | |||
22 | 24 | |||
23 | .include "../../mk/bsd.pkg.mk" | 25 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,8 @@ | @@ -1,7 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.6 2005/12/27 13:51:27 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.7 2009/12/17 21:43:16 abs Exp $ | |
2 | 2 | |||
3 | SHA1 (snooper-19991202.tar.gz) = d6aba20cd14449d7b126f393cdb219fd627b7777 | 3 | SHA1 (snooper-19991202.tar.gz) = d6aba20cd14449d7b126f393cdb219fd627b7777 | |
4 | RMD160 (snooper-19991202.tar.gz) = 52d61dea95cac246afd5815bc32f31448f9c757b | 4 | RMD160 (snooper-19991202.tar.gz) = 52d61dea95cac246afd5815bc32f31448f9c757b | |
5 | Size (snooper-19991202.tar.gz) = 38239 bytes | 5 | Size (snooper-19991202.tar.gz) = 38239 bytes | |
6 | SHA1 (patch-aa) = c7acf77a2c47bed8eb228f136457bfeb82eceb1f | 6 | SHA1 (patch-aa) = eb458977300b991f100b2f48a87add2a3dd4d7cb | |
7 | SHA1 (patch-ab) = c3f0980adedd02d723dc2d4636460f6edd7c0538 | 7 | SHA1 (patch-ab) = 4c6fb6ec3825b8c47006fc0817c13caf9a817091 | |
8 | SHA1 (patch-ac) = b8d9af5de5fb5b73a2f3a6a5679028c5145048a5 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2005/11/03 20:01:20 rillig Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2009/12/17 21:43:17 abs Exp $ | |
2 | 2 | |||
3 | --- src/scrn.c.orig 1998-08-12 16:32:02.000000000 +0200 | 3 | --- src/scrn.c.orig 1998-08-12 14:32:02.000000000 +0000 | |
4 | +++ src/scrn.c 2004-06-30 01:38:04.000000000 +0200 | 4 | +++ src/scrn.c | |
5 | @@ -33,7 +33,7 @@ | 5 | @@ -33,7 +33,7 @@ hdl_sigwinch(sig) | |
6 | #ifdef TIOCGWINSZ | 6 | #ifdef TIOCGWINSZ | |
7 | struct winsize win; | 7 | struct winsize win; | |
8 | 8 | |||
9 | - if (ioctl(STDERR_FILENO, TIOCGWINSZ, &win) == -1) { | 9 | - if (ioctl(STDERR_FILENO, TIOCGWINSZ, &win) == -1) { | |
10 | + if (ioctl(STDERR_FILENO, TIOCGWINSZ, &win) != -1) { | 10 | + if (ioctl(STDERR_FILENO, TIOCGWINSZ, &win) != -1) { | |
11 | rows = win.ws_row; | 11 | rows = win.ws_row; | |
12 | cols = win.ws_col; | 12 | cols = win.ws_col; | |
13 | } | 13 | } |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-ab,v 1.1 2005/12/27 13:51:27 joerg Exp $ | 1 | $NetBSD: patch-ab,v 1.2 2009/12/17 21:43:17 abs Exp $ | |
2 | 2 | |||
3 | --- src/uucplock.c.orig 2005-12-23 16:22:29.000000000 +0000 | 3 | --- src/uucplock.c.orig 1999-12-02 03:12:46.000000000 +0000 | |
4 | +++ src/uucplock.c | 4 | +++ src/uucplock.c | |
5 | @@ -38,8 +38,9 @@ static char sccsid[] = "@(#)uucplock.c 5 | 5 | @@ -38,8 +38,9 @@ static char sccsid[] = "@(#)uucplock.c 5 | |
6 | #include "config.h" | 6 | #include "config.h" | |
7 | 7 | |||
8 | #include <sys/file.h> | 8 | #include <sys/file.h> | |
9 | -#include <sys/dir.h> | 9 | -#include <sys/dir.h> | |
10 | +#include <dirent.h> | 10 | +#include <dirent.h> | |
11 | #include <errno.h> | 11 | #include <errno.h> | |
12 | +#include <limits.h> | 12 | +#include <limits.h> | |
13 | 13 | |||
14 | #include "pathnames.h" | 14 | #include "pathnames.h" | |
15 | 15 | |||
16 | @@ -52,9 +53,12 @@ static char sccsid[] = "@(#)uucplock.c 5 | 16 | @@ -52,9 +53,12 @@ static char sccsid[] = "@(#)uucplock.c 5 |
$NetBSD: patch-ac,v 1.1 2009/12/17 21:43:17 abs Exp $
--- build/Makefile.in.orig 1998-08-12 14:31:56.000000000 +0000
+++ build/Makefile.in
@@ -29,8 +29,8 @@ depend:
mkdep ${CFLAGS:M-[ID]*} $(srcdir)/src/*.c
install:
- [ -d $(bindir) ] || (mkdir $(bindir))
- $(INSTALL) -s -o uucp -g bin -m 4555 snooper $(bindir)
+ [ -d $(DESTDIR)$(bindir) ] || (mkdir $(DESTDIR)$(bindir))
+ $(INSTALL) -s -o uucp -g bin -m 4555 snooper $(DESTDIR)$(bindir)
clean:
-rm -f *.o *.core