diff options
| -rw-r--r-- | comms/hylafax/distinfo | 4 | ||||
| -rw-r--r-- | comms/hylafax/patches/patch-ae | 110 |
2 files changed, 110 insertions, 4 deletions
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo index b14249e39d6..aaf88530da1 100644 --- a/comms/hylafax/distinfo +++ b/comms/hylafax/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2012/04/08 03:25:03 dholland Exp $ +$NetBSD: distinfo,v 1.24 2013/05/21 18:36:52 joerg Exp $ SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 94de7c7fb55c9c95c6a774fb732e2d47ec818152 SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7 SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72 -SHA1 (patch-ae) = 3623d9f41cfef85b0e079e6698cf974829451151 +SHA1 (patch-ae) = 75b243c618a197bacd97e4292b123e97ffe178cd SHA1 (patch-af) = cb76c429c01e05ceeee7664a09344dc9d27f972d SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f SHA1 (patch-ah) = 084a99cfe21d7090fca33d9e068036e19707f441 diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae index 45401b5f21e..7a74ee1adef 100644 --- a/comms/hylafax/patches/patch-ae +++ b/comms/hylafax/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.16 2012/04/08 03:25:03 dholland Exp $ +$NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $ - Configure for pkgsrc. - Recognize libtiff 4.x. @@ -80,6 +80,24 @@ $NetBSD: patch-ae,v 1.16 2012/04/08 03:25:03 dholland Exp $ PATH=$PATH:$OPATH POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions +@@ -809,7 +809,7 @@ checkGCCVersion() + # NB: use ANSI C prototype to weed out non-ANSI compilers. + # + cat>dummy.c<<EOF +-main(int argc, char* argv) { exit(0); } ++int main(int argc, char** argv) { exit(0); } + EOF + + checkCompiler() +@@ -958,7 +958,7 @@ fi + # Make dependency information. + # + cat>dummy.c<<EOF +-main(int argc, char* argv) { exit(0); } ++int main(int argc, char** argv) { exit(0); } + EOF + capture cat dummy.c + if capture "$CCOMPILER -c -M $MKDEPCOPTS dummy.c | grep '^dummy.o[ ]*:[ ]*dummy.c'"; then @@ -1418,12 +1418,22 @@ runMake() CheckForCXXRuntime() { @@ -105,6 +123,60 @@ $NetBSD: patch-ae,v 1.16 2012/04/08 03:25:03 dholland Exp $ cat 1>&2 <<EOF Missing C++ runtime support for $CXX ($CXXCOMPILER). +@@ -1591,7 +1601,7 @@ pamconv(int num_msg, const struct pam_me + { + return(0); + } +-main() ++int main() + { + struct pam_conv conv = { pamconv }; + } +@@ -2062,7 +2072,7 @@ EmitConfigurationDefinitions() + # + CheckForFunc() + { +- echo "extern int $1(); main(){$1();exit(0);}" >t.c ++ echo "extern int $1(); int main(){$1();exit(0);}" >t.c + capture cat t.c + runMake t "t:; \${CC} t.c ${MACHDEPLIBS}" + } +@@ -2315,7 +2325,7 @@ CheckForStructExitStatus() + echo "$i" + done + cat<<EOF +-main() ++int main() + { + struct $decl x; + x.ut_exit.e_exit = 0; +@@ -2332,7 +2342,7 @@ CheckForTimeZoneHandling() + { + (echo '#include <time.h>' + cat<<EOF +-main() ++int main() + { + struct tm x; + char* cp; +@@ -2351,7 +2361,7 @@ CheckForTXCD() + { + cat>t.c<<EOF + #include <sys/ioctl.h> +-main() ++int main() + { + ioctl(0, TXADDCD, "rts"); + ioctl(0, TXDELCD, "rts"); +@@ -2400,7 +2410,7 @@ CheckLibtiff() + cat>t.c<<EOF + #include <stdio.h> + #include "tiffio.h" +-main() ++int main() + { + printf( "header_ver=%d lib_ver=%s", TIFFLIB_VERSION, TIFFGetVersion() ); + exit(0); @@ -2418,7 +2428,7 @@ EOF if [ ${header_ver} -ge 19960307 ]; then case ${lib_ver} in @@ -114,7 +186,32 @@ $NetBSD: patch-ae,v 1.16 2012/04/08 03:25:03 dholland Exp $ esac fi else -@@ -3145,13 +3155,7 @@ main() +@@ -3102,7 +3112,7 @@ CheckForSyslog() + { + (echo '#include <syslog.h>'; + echo '#include "port.h"'; +- echo 'main(){syslog(0,"foo");exit(0);}') >t.c ++ echo 'int main(){syslog(0,"foo");exit(0);}') >t.c + capture cat t.c + runMake t "t:; \${CC} t.c ${MACHDEPLIBS}" + } +@@ -3111,7 +3121,7 @@ CheckForVSyslog() + (echo '#include <syslog.h>'; + echo '#include <stdarg.h>'; + echo '#include "port.h"'; +- echo 'main(){va_list ap; vsyslog(0,"foo", ap);exit(0);}') >t.c ++ echo 'int main(){va_list ap; vsyslog(0,"foo", ap);exit(0);}') >t.c + capture cat t.c + runMake t "t:; \${CC} t.c ${MACHDEPLIBS}" + } +@@ -3139,19 +3149,13 @@ Note "Checking ZLIB support." + # + cat>t.c<<EOF + #include "zlib.h" +-main() ++int main() + { + if (strcmp(ZLIB_VERSION, "0.95") < 0) { /* include file version */ printf("old include files: version %u\n", ZLIB_VERSION); exit(-1); } @@ -137,6 +234,15 @@ $NetBSD: patch-ae,v 1.16 2012/04/08 03:25:03 dholland Exp $ for i in $DIRS; do test -x $i/tiff2ps && { TIFFBIN=$i; break; } done +@@ -3245,7 +3249,7 @@ if [ -f $SRCDIR/MLA/VERSION -a $DBLIB = + #include <stdio.h> + #include <string.h> + #include "db.h" +-main() ++int main() + { + DBT key, data; + const char d[] = "some random string"; @@ -3722,6 +3726,7 @@ if [ -z "$FAXGID" ]; then *-bsdi*) FAXGID=uucp;; *freebsd2.1*) FAXGID=uucp; break;; # Not sure when this changed.. |