diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-04-11 20:26:30 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-04-11 20:26:30 +0000 |
| commit | ab16aa93cf9ba98dc4f8270557ef95b79ea31426 (patch) | |
| tree | c87c978a4b11f4f647edc0793e2e33d7b46a64ec /www/dillo | |
| parent | 372e4fe573d947f974109b8793ad5d220d34d4ff (diff) | |
| download | pkgsrc-ab16aa93cf9ba98dc4f8270557ef95b79ea31426.tar.gz | |
Fix build if USE_INET6 is set to NO. Do not use gmake.
Closes PR pkg/20920 by Martin Weber.
Diffstat (limited to 'www/dillo')
| -rw-r--r-- | www/dillo/Makefile | 3 | ||||
| -rw-r--r-- | www/dillo/distinfo | 4 | ||||
| -rw-r--r-- | www/dillo/patches/patch-aa | 13 |
3 files changed, 10 insertions, 10 deletions
diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 9154d19a639..a565696f1c5 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/03/21 18:15:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2003/04/11 20:26:30 jmmv Exp $ # DISTNAME= dillo-0.7.1.2 @@ -13,7 +13,6 @@ COMMENT= Very small and fast graphical web-browser USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_X11= yes -USE_GMAKE= yes GNU_CONFIGURE= yes EGDIR= ${PREFIX}/share/examples/dillo diff --git a/www/dillo/distinfo b/www/dillo/distinfo index b76e26db5c0..d4e4430f185 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2003/03/21 18:15:29 jmmv Exp $ +$NetBSD: distinfo,v 1.13 2003/04/11 20:26:30 jmmv Exp $ SHA1 (dillo-0.7.1.2.tar.gz) = eb6ed7af0cb0f0d68f0f3411cbba0606d1dec242 Size (dillo-0.7.1.2.tar.gz) = 365171 bytes -SHA1 (patch-aa) = 0e66eeab596e0a513a4d6b1b40cf7b9bfe9d1b5a +SHA1 (patch-aa) = a03f8d4af8f789be6dce6227213100af75e90807 SHA1 (patch-ab) = ce94918707e3639edfdc0ee1e2d1cd00eed6e3fb SHA1 (patch-ac) = e432430a1ab0b12d0824fa00c34548eb4e26976b diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa index a9f0c719ad1..91f182fd03f 100644 --- a/www/dillo/patches/patch-aa +++ b/www/dillo/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2003/03/21 18:15:29 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2003/04/11 20:26:31 jmmv Exp $ --- src/IO/http.c.orig 2003-03-04 20:34:59.000000000 +0100 +++ src/IO/http.c @@ -17,19 +17,19 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 18:15:29 jmmv Exp $ SocketData_t *S; DilloHost *dh; -@@ -269,30 +270,35 @@ static int Http_connect_socket(ChainLink +@@ -268,31 +269,35 @@ static int Http_connect_socket(ChainLink + fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD)); - /* Some OSes require this... */ +- /* Some OSes require this... */ - memset(&name, 0, sizeof(name)); -+ memset(&name4, 0, sizeof(name4)); -+ memset(&name6, 0, sizeof(name6)); /* Set remaining parms. */ switch (dh->af) { case AF_INET: { - struct sockaddr_in *sin = (struct sockaddr_in *)&name; + struct sockaddr_in *sin = (struct sockaddr_in *)&name4; ++ memset(&name4, 0, sizeof(name4)); sin->sin_family = dh->af; sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT); memcpy(&sin->sin_addr, dh->data, dh->alen); @@ -45,6 +45,7 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 18:15:29 jmmv Exp $ char buf[128]; - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name6; ++ memset(&name6, 0, sizeof(name6)); sin6->sin6_family = dh->af; sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT); memcpy(&sin6->sin6_addr, dh->data, dh->alen); @@ -56,7 +57,7 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 18:15:29 jmmv Exp $ break; } #endif -@@ -302,7 +308,7 @@ static int Http_connect_socket(ChainLink +@@ -302,7 +307,7 @@ static int Http_connect_socket(ChainLink S->GioCh = g_io_channel_unix_new(S->SockFD); g_io_add_watch(S->GioCh, G_IO_ERR | G_IO_HUP | G_IO_OUT, Http_use_socket, Info->LocalKey); |