diff options
| -rw-r--r-- | security/libssh/distinfo | 4 | ||||
| -rw-r--r-- | security/libssh/patches/patch-aa | 8 | ||||
| -rw-r--r-- | shells/scsh/distinfo | 6 | ||||
| -rw-r--r-- | shells/scsh/patches/patch-ab | 20 | ||||
| -rw-r--r-- | shells/scsh/patches/patch-ac | 45 |
5 files changed, 64 insertions, 19 deletions
diff --git a/security/libssh/distinfo b/security/libssh/distinfo index 8ec418b2c75..91f5d212205 100644 --- a/security/libssh/distinfo +++ b/security/libssh/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2006/02/17 14:43:49 joerg Exp $ +$NetBSD: distinfo,v 1.4 2007/02/25 00:57:54 yyamano Exp $ SHA1 (libssh-0.11.tgz) = 307430249ded90332c4ec77a264913b3bc93a648 RMD160 (libssh-0.11.tgz) = 69c2cc00becb84a62555fe884345398f155815a4 Size (libssh-0.11.tgz) = 303761 bytes -SHA1 (patch-aa) = 6e72fcfe9ee9bcc6fd7c21baf66d09b15923a7f1 +SHA1 (patch-aa) = d2e082d87643c80add1b4ff0f0f467ea09be851b diff --git a/security/libssh/patches/patch-aa b/security/libssh/patches/patch-aa index 62bd283c0c6..2c2a56f8323 100644 --- a/security/libssh/patches/patch-aa +++ b/security/libssh/patches/patch-aa @@ -1,14 +1,14 @@ -$NetBSD: patch-aa,v 1.2 2006/02/17 14:43:49 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2007/02/25 00:57:54 yyamano Exp $ ---- sample.c.orig 2005-03-04 19:54:59.000000000 +0000 +--- sample.c.orig 2005-03-05 04:54:59.000000000 +0900 +++ sample.c @@ -20,7 +20,14 @@ clients must be made or how a client sho #include <sys/select.h> #include <sys/time.h> -+#if defined(__NetBSD__) ++#if defined(__NetBSD__) || defined(__APPLE__) +#include <sys/types.h> -+#include <util.h> /* openpty() on NetBSD */ ++#include <util.h> /* openpty() on NetBSD and Darwin */ +#elif defined(__DragonFly__) +#include <libutil.h> +#else diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo index d5da7035f50..f3f24cbaafc 100644 --- a/shells/scsh/distinfo +++ b/shells/scsh/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.11 2006/09/03 11:39:08 kristerw Exp $ +$NetBSD: distinfo,v 1.12 2007/02/25 01:38:30 yyamano Exp $ SHA1 (scsh-0.6.7.tar.gz) = a1eaf0d0593e14914824898a0c3ec166429affd7 RMD160 (scsh-0.6.7.tar.gz) = f017c5a157cd1a3ad5daeaecba43ce84784c7e51 Size (scsh-0.6.7.tar.gz) = 4367439 bytes SHA1 (patch-aa) = 2826391983edc5e1dc2720426bf75e1f37921092 -SHA1 (patch-ab) = 5a8ba9cfe463c791f8478366933c335683e38c3b -SHA1 (patch-ac) = 05371f266d8993e6bba0e34502fe31006fd07567 +SHA1 (patch-ab) = e796b61e4cc1c6e29f8fa0bf78a1204cb0e79cfc +SHA1 (patch-ac) = c436620e407d2bab6ecdb11393aa7d9da1ebc1bc SHA1 (patch-ad) = 46825c2742f8c3f41ce6300411841fde6fa63de0 SHA1 (patch-ae) = 3838934816cf23f1975d15f3dfd3ce8fae10ee40 SHA1 (patch-af) = faddb025c3bada2d321b693217104dc986a8a90f diff --git a/shells/scsh/patches/patch-ab b/shells/scsh/patches/patch-ab index 5ebe9c5314e..33d0f62fea7 100644 --- a/shells/scsh/patches/patch-ab +++ b/shells/scsh/patches/patch-ab @@ -1,12 +1,22 @@ -$NetBSD: patch-ab,v 1.5 2004/04/21 12:08:10 dillo Exp $ +$NetBSD: patch-ab,v 1.6 2007/02/25 01:39:00 yyamano Exp $ ---- configure.in.orig Mon Mar 15 16:53:48 2004 +--- configure.in.orig 2006-03-29 22:22:28.000000000 +0900 +++ configure.in -@@ -269,6 +269,7 @@ AC_INIT(c/scheme48vm.c) +@@ -276,8 +276,15 @@ AC_INIT(c/scheme48vm.c) + SCSH_ELF + ;; - ## NetBSD and FreeBSD ( and maybe 386BSD also) - *-*-*bsd*|*-*-darwin* ) +- ## NetBSD and FreeBSD ( and maybe 386BSD also) +- *-*-*bsd*|*-*-darwin* ) ++ ## NetBSD, FreeBSD and DragonFly ( and maybe 386BSD also) ++ *-*-*bsd*|*-*-dragonfly* ) + LDFLAGS="-Wl,--export-dynamic" ++ dir=bsd ++ SCSH_ELF ++ ;; ++ ++ ## Mac OS X and Darwin ++ *-*-darwin* ) dir=bsd SCSH_ELF ;; diff --git a/shells/scsh/patches/patch-ac b/shells/scsh/patches/patch-ac index eabafbb1ce6..e9427ca25c9 100644 --- a/shells/scsh/patches/patch-ac +++ b/shells/scsh/patches/patch-ac @@ -1,14 +1,49 @@ -$NetBSD: patch-ac,v 1.6 2005/11/10 22:48:07 joerg Exp $ +$NetBSD: patch-ac,v 1.7 2007/02/25 01:39:01 yyamano Exp $ ---- configure.orig 2004-03-11 15:53:58.000000000 +0000 +--- configure.orig 2006-04-20 17:17:03.000000000 +0900 +++ configure -@@ -3128,7 +3128,8 @@ echo "${ECHO_T}$scsh_cv_elf" >&6 +@@ -3294,8 +3294,33 @@ echo "${ECHO_T}$scsh_cv_elf" >&6 + ;; - ## NetBSD and FreeBSD ( and maybe 386BSD also) +- ## NetBSD and FreeBSD ( and maybe 386BSD also) - *-*-*bsd*|*-*-darwin* ) -+ *-*-*bsd*|*-*-darwin*|*-*-dragonfly* ) ++ ## NetBSD, FreeBSD and DragonFly ( and maybe 386BSD also) ++ *-*-*bsd*|*-*-dragonfly* ) + LDFLAGS="-Wl,--export-dynamic" ++ dir=bsd ++ ++ echo "$as_me:$LINENO: checking for ELF" >&5 ++echo $ECHO_N "checking for ELF... $ECHO_C" >&6 ++ if test "${scsh_cv_elf+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ touch conftest.c ++ if ${CC} -v -o a.out conftest.c 2>&1 | grep -q __ELF__ ; then ++ scsh_cv_elf=yes ++ else ++ scsh_cv_elf=no ++ fi ++fi ++ ++ echo "$as_me:$LINENO: result: $scsh_cv_elf" >&5 ++echo "${ECHO_T}$scsh_cv_elf" >&6 ++ rm -f conftest.c a.out ++ ++ ;; ++ ++ ## Mac OS X and Darwin ++ *-*-darwin* ) dir=bsd echo "$as_me:$LINENO: checking for ELF" >&5 +@@ -8601,6 +8626,8 @@ do + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + ac_cs_recheck=: ;; + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; |