summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcjep <cjep>2002-06-10 06:49:08 +0000
committercjep <cjep>2002-06-10 06:49:08 +0000
commit7def1f69c64bcfa7f3f06fbab2b536fa7b18f811 (patch)
treeeea37dd4248df208d5c88af8d1aeaa533679f53d
parent8bddc9439683c7436071a5ac4da48a11010fbdda (diff)
downloadpkgsrc-7def1f69c64bcfa7f3f06fbab2b536fa7b18f811.tar.gz
Fix readline.h problem on 1.6 (tested with 1.5.3 also). Looked at by
hubertf.
-rw-r--r--net/sftp/Makefile3
-rw-r--r--net/sftp/distinfo5
-rw-r--r--net/sftp/patches/patch-aa6
-rw-r--r--net/sftp/patches/patch-ab19
4 files changed, 7 insertions, 26 deletions
diff --git a/net/sftp/Makefile b/net/sftp/Makefile
index cb0052143ba..7e020320bd1 100644
--- a/net/sftp/Makefile
+++ b/net/sftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:31 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/06/10 06:49:08 cjep Exp $
#
DISTNAME= sftp-0.5
@@ -20,4 +20,5 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/sftp.1 ${PREFIX}/man/man1/sftp.1
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.sftp
+.include "../../devel/readline/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/sftp/distinfo b/net/sftp/distinfo
index e251d109428..fa228ce76d5 100644
--- a/net/sftp/distinfo
+++ b/net/sftp/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:32 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/06/10 06:49:08 cjep Exp $
SHA1 (sftp-0.5.tar.gz) = e75571e46eda19da1b42fdd5d642822b3e302b84
Size (sftp-0.5.tar.gz) = 26072 bytes
-SHA1 (patch-aa) = ae15d542a80aa1715027db38c248bcec94017901
-SHA1 (patch-ab) = 59750348382485ed043e2a0738bb4553bf31b812
+SHA1 (patch-aa) = 1806fd8d4ddbf34d67aa139689aadf41b3e1bb3d
diff --git a/net/sftp/patches/patch-aa b/net/sftp/patches/patch-aa
index 1df0a6a7c67..6afd608e9c9 100644
--- a/net/sftp/patches/patch-aa
+++ b/net/sftp/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 1999/12/27 23:53:44 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/10 06:49:09 cjep Exp $
---- Makefile.in.orig Tue Dec 28 00:40:39 1999
-+++ Makefile.in Tue Dec 28 00:42:39 1999
+--- Makefile.in.orig Thu Nov 18 01:14:12 1999
++++ Makefile.in
@@ -1,6 +1,6 @@
CC = @CC@
CFLAGS = @CFLAGS@
diff --git a/net/sftp/patches/patch-ab b/net/sftp/patches/patch-ab
deleted file mode 100644
index d3d04d3ee11..00000000000
--- a/net/sftp/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/12/27 23:53:45 hubertf Exp $
-
---- sftp.c.orig Tue Dec 28 00:36:29 1999
-+++ sftp.c Tue Dec 28 00:39:46 1999
-@@ -19,10 +19,14 @@
- #include <sys/socket.h>
- #include <sys/wait.h>
-
-+#ifdef __NetBSD__
-+#include <readline.h>
-+#else /* __NetBSD__ */
- #ifdef HAVE_LIBREADLINE
- #include <readline/readline.h>
- #include <readline/history.h>
- #endif
-+#endif /* __NetBSD__ */
-
- #include "sftp.h"
-