Tue May 28 19:03:49 2013 UTC ()
Pick output name that is going to work. Make signal handler test more
resilient.


(joerg)
diff -r1.14 -r1.15 pkgsrc/net/tinyfugue/distinfo
diff -r1.5 -r1.6 pkgsrc/net/tinyfugue/patches/patch-ac
cvs diff -r1.14 -r1.15 pkgsrc/net/tinyfugue/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tinyfugue/distinfo 2011/11/26 23:53:10 1.14
+++ pkgsrc/net/tinyfugue/distinfo 2013/05/28 19:03:49 1.15
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.14 2011/11/26 23:53:10 sbd Exp $ 1$NetBSD: distinfo,v 1.15 2013/05/28 19:03:49 joerg Exp $
2 2
3SHA1 (tf-40s1-mccp-patch.gz) = 9a8d12ef8a6e0b6c315e6ae83efcbd179a930a6a 3SHA1 (tf-40s1-mccp-patch.gz) = 9a8d12ef8a6e0b6c315e6ae83efcbd179a930a6a
4RMD160 (tf-40s1-mccp-patch.gz) = af0d27a8b3585c8cc61669c79f26a8382c272424 4RMD160 (tf-40s1-mccp-patch.gz) = af0d27a8b3585c8cc61669c79f26a8382c272424
5Size (tf-40s1-mccp-patch.gz) = 7182 bytes 5Size (tf-40s1-mccp-patch.gz) = 7182 bytes
6SHA1 (tf-40s1.tar.gz) = 89ee75d0d8501dd7fe5440c81cf9b294e5ccf746 6SHA1 (tf-40s1.tar.gz) = 89ee75d0d8501dd7fe5440c81cf9b294e5ccf746
7RMD160 (tf-40s1.tar.gz) = 2852daa3363bb134f29cc25d3177e9599ecacc1f 7RMD160 (tf-40s1.tar.gz) = 2852daa3363bb134f29cc25d3177e9599ecacc1f
8Size (tf-40s1.tar.gz) = 349239 bytes 8Size (tf-40s1.tar.gz) = 349239 bytes
9SHA1 (patch-aa) = 8e6d68c7017ab4f4294451bd0d808f48e413f9b6 9SHA1 (patch-aa) = 8e6d68c7017ab4f4294451bd0d808f48e413f9b6
10SHA1 (patch-ab) = 7716f7cb3bd352824ff77e8f678416561e68bacf 10SHA1 (patch-ab) = 7716f7cb3bd352824ff77e8f678416561e68bacf
11SHA1 (patch-ac) = d6cba3c8b7ce7e43759983d70cefd2358ad919a0 11SHA1 (patch-ac) = 01dd3c54d7246b3769ceb1976f0e2272fb15d750
12SHA1 (patch-ad) = 4ff9f85b0b05857560b00e354496a9ed2a01e6e2 12SHA1 (patch-ad) = 4ff9f85b0b05857560b00e354496a9ed2a01e6e2
13SHA1 (patch-ae) = 4c85ea1953f24548d0dee107b645c32c91e5bc5d 13SHA1 (patch-ae) = 4c85ea1953f24548d0dee107b645c32c91e5bc5d
cvs diff -r1.5 -r1.6 pkgsrc/net/tinyfugue/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/tinyfugue/patches/patch-ac 2011/08/18 05:03:10 1.5
+++ pkgsrc/net/tinyfugue/patches/patch-ac 2013/05/28 19:03:49 1.6
@@ -1,21 +1,30 @@ @@ -1,21 +1,30 @@
1$NetBSD: patch-ac,v 1.5 2011/08/18 05:03:10 dholland Exp $ 1$NetBSD: patch-ac,v 1.6 2013/05/28 19:03:49 joerg Exp $
2 2
3Config for pkgsrc. 3Config for pkgsrc.
4DESTDIR support. 4DESTDIR support.
5Make the SYMLINK relative. 5Make the SYMLINK relative.
6 6
7--- unix/tfconfig.orig 2011-08-18 04:45:11.000000000 +0000 7--- unix/tfconfig.orig 2013-05-28 16:51:21.000000000 +0000
8+++ unix/tfconfig 8+++ unix/tfconfig
 9@@ -35,7 +35,7 @@ echo "Configuring $TFVERSION"; echo
 10
 11 ### Initialize variables, just in case they're already defined.
 12
 13-AOUT=tfconfig.out
 14+AOUT=`pwd`/tfconfig.out
 15 BINDIR=''
 16 # CC='' ;# Use the value from the environment if there is one.
 17 CCFLAGS=${TFDEV_CCFLAGS-'-O'}
9@@ -168,18 +168,18 @@ fi 18@@ -168,18 +168,18 @@ fi
10 # The cd;pwd is needed to normalize the directory name in case of links, etc. 19 # The cd;pwd is needed to normalize the directory name in case of links, etc.
11  20
12 DIR1=`echo $TF | sed 's;/[^/]*$;;'` 21 DIR1=`echo $TF | sed 's;/[^/]*$;;'`
13-DIR1=`cd $DIR1 && pwd` 22-DIR1=`cd $DIR1 && pwd`
14+#DIR1=`cd $DIR1 && pwd` 23+#DIR1=`cd $DIR1 && pwd`
15 DIR2=`echo $LIBDIR | sed 's;/[^/]*$;;'` 24 DIR2=`echo $LIBDIR | sed 's;/[^/]*$;;'`
16-DIR2=`cd $DIR2 && pwd` 25-DIR2=`cd $DIR2 && pwd`
17+#DIR2=`cd $DIR2 && pwd` 26+#DIR2=`cd $DIR2 && pwd`
18 DIR3=`echo $SYMLINK | sed 's;/[^/]*$;;'` 27 DIR3=`echo $SYMLINK | sed 's;/[^/]*$;;'`
19-DIR3=`cd $DIR3 && pwd` 28-DIR3=`cd $DIR3 && pwd`
20+#DIR3=`cd $DIR3 && pwd` 29+#DIR3=`cd $DIR3 && pwd`
21  30
@@ -59,13 +68,29 @@ Make the SYMLINK relative. @@ -59,13 +68,29 @@ Make the SYMLINK relative.
59  68
60 rm -f ../src/Makefile ${AOUT} 69 rm -f ../src/Makefile ${AOUT}
61@@ -246,8 +246,10 @@ else 70@@ -246,8 +246,10 @@ else
62 fi 71 fi
63  72
64 echo "MAKE = ${MAKE}" >&5 73 echo "MAKE = ${MAKE}" >&5
65+echo "DESTDIR = ${DESTDIR}" >&5 74+echo "DESTDIR = ${DESTDIR}" >&5
66 echo "TF = ${TF}" >&5 75 echo "TF = ${TF}" >&5
67 echo "SYMLINK = ${SYMLINK}" >&5 76 echo "SYMLINK = ${SYMLINK}" >&5
68+echo "SYMLINKTARGET = ${SYMLINKTARGET}" >&5 77+echo "SYMLINKTARGET = ${SYMLINKTARGET}" >&5
69 echo "LIBDIR = ${LIBDIR}" >&5 78 echo "LIBDIR = ${LIBDIR}" >&5
70 echo "MAILDIR = ${MAILDIR}" >&5 79 echo "MAILDIR = ${MAILDIR}" >&5
71 echo "MANPAGE = ${MANPAGE}" >&5 80 echo "MANPAGE = ${MANPAGE}" >&5
 81@@ -654,11 +656,13 @@ echo "Testing type of signal handlers...
 82 cat >test.c <<EOF
 83 #include <sys/types.h>
 84 #include <signal.h>
 85+#include <stdlib.h>
 86 #undef signal
 87-extern void (*signal())();
 88+typedef void (*my_sighandler_t)(int);
 89+extern my_sighandler_t signal(int, my_sighandler_t);
 90 main() { exit(0); }
 91 EOF
 92-if ${CC} ${CCFLAGS} -c test.c -o ${AOUT}>/dev/null 2>&1; then
 93+if ${CC} ${CCFLAGS} -c test.c -o ${AOUT}; then
 94 echo "Signal handlers return void, as they should."
 95 echo '#define RETSIG void' >&4
 96 else