diff options
author | jschauma <jschauma> | 2005-02-27 22:06:10 +0000 |
---|---|---|
committer | jschauma <jschauma> | 2005-02-27 22:06:10 +0000 |
commit | 1730495b1696e6ef772a9f5f1d9d9df00903f991 (patch) | |
tree | dccd6cbb639623a2cc69b91077e81d59207ac4a4 /net | |
parent | cb202b7c7b4c1107739982b88c56443bb55b4967 (diff) | |
download | pkgsrc-1730495b1696e6ef772a9f5f1d9d9df00903f991.tar.gz |
make this work on IRIX
ok jmmv@
Diffstat (limited to 'net')
-rw-r--r-- | net/tsocks/distinfo | 6 | ||||
-rw-r--r-- | net/tsocks/patches/patch-aa | 16 | ||||
-rw-r--r-- | net/tsocks/patches/patch-ab | 74 |
3 files changed, 79 insertions, 17 deletions
diff --git a/net/tsocks/distinfo b/net/tsocks/distinfo index 7a330c53e47..5762c211f75 100644 --- a/net/tsocks/distinfo +++ b/net/tsocks/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 12:14:06 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/02/27 22:06:10 jschauma Exp $ SHA1 (tsocks-1.7.tar.gz) = b375215b63d93f4f317973f21cbcf4f9bd34720e RMD160 (tsocks-1.7.tar.gz) = e174c002ab2aa231b7c3a1aa98c5e6b7cdce34e6 Size (tsocks-1.7.tar.gz) = 70992 bytes -SHA1 (patch-aa) = 3037e70481db197831f85fde0095629d5cfcc538 -SHA1 (patch-ab) = dbb8df3763f3176af0f58d7d63644183b33f51eb +SHA1 (patch-aa) = c520bff0b0fad4629c5d1cc295f68fa0b4c29096 +SHA1 (patch-ab) = 17e169a25f5a8d53870251463e14538cccbd1473 diff --git a/net/tsocks/patches/patch-aa b/net/tsocks/patches/patch-aa index e8ae16d5a10..559b60a0960 100644 --- a/net/tsocks/patches/patch-aa +++ b/net/tsocks/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2005/02/27 22:06:10 jschauma Exp $ ---- Makefile.in.orig 2001-03-13 23:59:42.000000000 +0100 -+++ Makefile.in -@@ -38,19 +38,19 @@ TARGETS= ${SHLIB} ${UTIL_LIB} ${SAVE} ${ +--- Makefile.in.orig Tue Mar 13 17:59:42 2001 ++++ Makefile.in Sun Feb 27 16:18:25 2005 +@@ -38,22 +38,22 @@ all: ${TARGETS} ${COMMON}.o: ${COMMON}.c @@ -26,8 +26,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ + ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c ${SHLIB}: ${SHOBJS} ${COMMON}.o ${PARSER}.o - ${SHCC} ${CFLAGS} ${SPECIALLIBS} ${LIBS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${SHOBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} -@@ -65,19 +65,19 @@ ${SHLIB}: ${SHOBJS} ${COMMON}.o ${PARSER +- ${SHCC} ${CFLAGS} ${SPECIALLIBS} ${LIBS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${SHOBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ++ ${LD} ${LDFLAGS} ${SPECIALLIBS} ${LIBS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${SHOBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} + ln -sf ${SHLIB} ${LIB_NAME}.so + + %.so: %.c +@@ -65,19 +65,19 @@ install: ${TARGETS} installlib installman installlib: diff --git a/net/tsocks/patches/patch-ab b/net/tsocks/patches/patch-ab index 2c9fa8eda0d..01c0912a947 100644 --- a/net/tsocks/patches/patch-ab +++ b/net/tsocks/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ +$NetBSD: patch-ab,v 1.2 2005/02/27 22:06:10 jschauma Exp $ ---- configure.orig 2001-03-12 13:47:41.000000000 +0100 -+++ configure -@@ -536,7 +536,6 @@ fi +--- configure.orig Mon Mar 12 07:47:41 2001 ++++ configure Sun Feb 27 16:08:19 2005 +@@ -536,7 +536,6 @@ @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ # Check whether --enable-socksdns or --disable-socksdns was given. if test "${enable_socksdns+set}" = set; then -@@ -1272,7 +1271,7 @@ fi +@@ -1272,7 +1271,7 @@ done @@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:1279: checking for $ac_func" >&5 -@@ -1323,9 +1322,11 @@ if eval "test \"`echo '$ac_cv_func_'$ac_ +@@ -1323,9 +1322,11 @@ EOF else @@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ done -@@ -1733,6 +1734,7 @@ fi +@@ -1733,6 +1734,7 @@ SIMPLELIBS=${LIBS} LIBS= @@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6 echo "configure:1738: checking for dlsym in -ldl" >&5 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'` -@@ -1780,6 +1782,7 @@ else +@@ -1780,6 +1782,7 @@ echo "$ac_t""no" 1>&6 { echo "configure: error: "libdl is required"" 1>&2; exit 1; } fi @@ -47,3 +47,61 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $ echo $ac_n "checking for RTLD_NEXT from dlfcn.h""... $ac_c" 1>&6 +@@ -1977,7 +1980,11 @@ + + echo $ac_n "checking location of libc""... $ac_c" 1>&6 + echo "configure:1980: checking location of libc" >&5 ++ if test "$OPSYS" != "IRIX"; then + LIBC=`$LDD /bin/ls | $GREP "libc" | $AWK ' { print $3 } '` ++ else ++ LIBC=/usr/lib$ABI/libc.so ++ fi + + cat >> confdefs.h <<EOF + #define LIBC "${LIBC}" +@@ -1992,6 +1999,8 @@ + imp2='(int __fd, struct sockaddr * __addr, int __len) {' + proto3='(int, const struct sockaddr *, socklen_t);' + imp3='(int __fd, const struct sockaddr * __addr, socklen_t __len) {' ++proto4='(int, const void *, socklen_t);' ++imp4='(int __fd, const void * __addr, socklen_t __len) {' + echo $ac_n "checking for correct connect prototype""... $ac_c" 1>&6 + echo "configure:1997: checking for correct connect prototype" >&5 + if test "$cross_compiling" = yes; then +@@ -2056,6 +2065,26 @@ + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ++ ++ if test "$cross_compiling" = yes; then ++ PROTO="" ++else ++ cat > conftest.$ac_ext <<EOF ++#line 2045 "configure" ++#include "confdefs.h" ++ ++ #include <sys/socket.h> ++ int connect$proto4 ++ int main() {return(0);} ++ ++EOF ++if { (eval echo configure:2053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ PROTO="$proto4"; IMP="$imp4" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + PROTO="" + fi + rm -fr conftest* +@@ -2066,6 +2095,9 @@ + rm -fr conftest* + fi + ++fi ++rm -fr conftest* ++fi + + fi + rm -fr conftest* |