Fix cddb support since IPv6 support has been added.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3926 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 126 insertions, 4 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index c1399bb3a..c062757cd 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomemedia2
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.10
@@ -39,9 +40,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
 		${WRKSRC}/gnome-cd/Makefile.in
 .if ${OSVERSION} > 501107
-	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%CDROM%%|cd0|' ${WRKSRC}/configure
 .else
-	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%CDROM%%|cd0c|' ${WRKSRC}/configure
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/gnome-media/files/patch-cddb-slave2_inetaddr.c b/audio/gnome-media/files/patch-cddb-slave2_inetaddr.c
new file mode 100644
index 000000000..c22864699
--- /dev/null
+++ b/audio/gnome-media/files/patch-cddb-slave2_inetaddr.c
@@ -0,0 +1,30 @@
+--- cddb-slave2/inetaddr.c.orig	Sat Mar 12 02:38:12 2005
++++ cddb-slave2/inetaddr.c	Sat Mar 12 02:39:15 2005
+@@ -1908,6 +1908,9 @@ gnet_inetaddr_get_interface_to (const GI
+   int sockfd;
+ #ifdef ENABLE_IPV6
+   struct sockaddr_in6 myaddr6;
++#define SS_LEN ss_len
++#else
++#define SS_LEN sa_len
+ #endif
+   struct sockaddr_in myaddr;
+   socklen_t len;
+@@ -1927,7 +1930,7 @@ gnet_inetaddr_get_interface_to (const GI
+ 	return NULL;
+       }
+ 
+-      if (connect (sockfd, (struct sockaddr *)&(addr->sa), sizeof (addr->sa)) == -1)
++      if (connect (sockfd, (struct sockaddr *)&(addr->sa), addr->sa.SS_LEN) == -1)
+ 	{
+ 	  GNET_CLOSE_SOCKET (sockfd);
+ 	  g_free (iface);
+@@ -1953,7 +1956,7 @@ gnet_inetaddr_get_interface_to (const GI
+       return NULL;
+     }
+ 
+-    if (connect (sockfd, (struct sockaddr *)&addr->sa, sizeof(addr->sa)) == -1)
++    if (connect (sockfd, (struct sockaddr *)&addr->sa, addr->sa.SS_LEN) == -1)
+       {
+ 	GNET_CLOSE_SOCKET(sockfd);
+ 	g_free (iface);
diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
new file mode 100644
index 000000000..9dfa415ef
--- /dev/null
+++ b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
@@ -0,0 +1,30 @@
+--- cddb-slave2/tcp.c.orig	Sat Mar 12 02:32:52 2005
++++ cddb-slave2/tcp.c	Sat Mar 12 02:39:55 2005
+@@ -171,6 +171,9 @@ gnet_tcp_socket_new_async (const GInetAd
+   struct sockaddr_in6* 	sa_in6;
+   struct sockaddr_in6 	sa6;
+   int ifindex;
++#define SS_LEN ss_len
++#else
++#define SS_LEN sa_len
+ #endif
+   struct sockaddr_in* 	sa_in;
+   struct sockaddr	sa;
+@@ -265,7 +268,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ 		continue;
+ 
+ 	      sa_in6->sin6_scope_id = ifindex;
+-	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
++	      con = connect (s->sockfd, (struct sockaddr *)&sa6, s->sa.SS_LEN);
+ 	      if (con == 0 || errno == EINPROGRESS)
+ 				break;
+ 
+@@ -283,7 +286,7 @@ gnet_tcp_socket_new_async (const GInetAd
+       memcpy(&sa, &addr->sa, sizeof(sa));
+       sa_in = (struct sockaddr_in *) &sa;
+       sa_in->sin_family = AF_INET;
+-      con = connect(s->sockfd, &sa, sizeof(s->sa));
++      con = connect(s->sockfd, &sa, s->sa.SS_LEN);
+     }
+ 
+   /* Connect (but non-blocking!) */
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index c1399bb3a..c062757cd 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomemedia2
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.10
@@ -39,9 +40,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
 		${WRKSRC}/gnome-cd/Makefile.in
 .if ${OSVERSION} > 501107
-	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%CDROM%%|cd0|' ${WRKSRC}/configure
 .else
-	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%CDROM%%|cd0c|' ${WRKSRC}/configure
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_inetaddr.c b/audio/gnomemedia2/files/patch-cddb-slave2_inetaddr.c
new file mode 100644
index 000000000..c22864699
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-cddb-slave2_inetaddr.c
@@ -0,0 +1,30 @@
+--- cddb-slave2/inetaddr.c.orig	Sat Mar 12 02:38:12 2005
++++ cddb-slave2/inetaddr.c	Sat Mar 12 02:39:15 2005
+@@ -1908,6 +1908,9 @@ gnet_inetaddr_get_interface_to (const GI
+   int sockfd;
+ #ifdef ENABLE_IPV6
+   struct sockaddr_in6 myaddr6;
++#define SS_LEN ss_len
++#else
++#define SS_LEN sa_len
+ #endif
+   struct sockaddr_in myaddr;
+   socklen_t len;
+@@ -1927,7 +1930,7 @@ gnet_inetaddr_get_interface_to (const GI
+ 	return NULL;
+       }
+ 
+-      if (connect (sockfd, (struct sockaddr *)&(addr->sa), sizeof (addr->sa)) == -1)
++      if (connect (sockfd, (struct sockaddr *)&(addr->sa), addr->sa.SS_LEN) == -1)
+ 	{
+ 	  GNET_CLOSE_SOCKET (sockfd);
+ 	  g_free (iface);
+@@ -1953,7 +1956,7 @@ gnet_inetaddr_get_interface_to (const GI
+       return NULL;
+     }
+ 
+-    if (connect (sockfd, (struct sockaddr *)&addr->sa, sizeof(addr->sa)) == -1)
++    if (connect (sockfd, (struct sockaddr *)&addr->sa, addr->sa.SS_LEN) == -1)
+       {
+ 	GNET_CLOSE_SOCKET(sockfd);
+ 	g_free (iface);
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
new file mode 100644
index 000000000..9dfa415ef
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
@@ -0,0 +1,30 @@
+--- cddb-slave2/tcp.c.orig	Sat Mar 12 02:32:52 2005
++++ cddb-slave2/tcp.c	Sat Mar 12 02:39:55 2005
+@@ -171,6 +171,9 @@ gnet_tcp_socket_new_async (const GInetAd
+   struct sockaddr_in6* 	sa_in6;
+   struct sockaddr_in6 	sa6;
+   int ifindex;
++#define SS_LEN ss_len
++#else
++#define SS_LEN sa_len
+ #endif
+   struct sockaddr_in* 	sa_in;
+   struct sockaddr	sa;
+@@ -265,7 +268,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ 		continue;
+ 
+ 	      sa_in6->sin6_scope_id = ifindex;
+-	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
++	      con = connect (s->sockfd, (struct sockaddr *)&sa6, s->sa.SS_LEN);
+ 	      if (con == 0 || errno == EINPROGRESS)
+ 				break;
+ 
+@@ -283,7 +286,7 @@ gnet_tcp_socket_new_async (const GInetAd
+       memcpy(&sa, &addr->sa, sizeof(sa));
+       sa_in = (struct sockaddr_in *) &sa;
+       sa_in->sin_family = AF_INET;
+-      con = connect(s->sockfd, &sa, sizeof(s->sa));
++      con = connect(s->sockfd, &sa, s->sa.SS_LEN);
+     }
+ 
+   /* Connect (but non-blocking!) */