Update to version 0.2.1 beta 5.

12 files changed, 32 insertions, 92 deletions

diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index a29dbb52680a..f05844f2a239 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	everybuddy
-PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTVERSION=	0.2.1b5
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	jim@FreeBSD.org
 
@@ -20,4 +20,7 @@ GNU_CONFIGURE=	yes
 
 MAN1=		everybuddy.1
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/net/ayttm/distinfo b/net/ayttm/distinfo
index 590b85e2b436..0384fe0c4bdc 100644
--- a/net/ayttm/distinfo
+++ b/net/ayttm/distinfo
@@ -1 +1 @@
-MD5 (everybuddy-0.2.0.tar.gz) = fba80cb89284099bc89114e37e4fedad
+MD5 (everybuddy-0.2.1beta5.tar.gz) = 12e4f0a074b2d452dd84a73bfc40d9e4
diff --git a/net/ayttm/files/patch-aa b/net/ayttm/files/patch-aa
index 2f64364014d9..df24355206ae 100644
--- a/net/ayttm/files/patch-aa
+++ b/net/ayttm/files/patch-aa
@@ -1,15 +1,11 @@
---- configure.orig	Sun Jan 21 00:36:28 2001
-+++ configure	Sun Jan 21 00:37:27 2001
-@@ -2415,10 +2415,10 @@
- CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" 
- 
- EB_CFLAGS="$CFLAGS -I../"
--EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -lpthread -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode"
-+EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -pthread -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode"
+--- configure.orig	Mon Jun 18 13:40:19 2001
++++ configure	Mon Jun 18 13:44:04 2001
+@@ -3437,7 +3437,7 @@
+ EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode -L../zephyr -lzephyr"
  EB_LDADD="$LDADD"
  
 -EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g "
 +EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall"
- # Check whether --with-esd-prefix or --without-esd-prefix was given.
- if test "${with_esd_prefix+set}" = set; then
-   withval="$with_esd_prefix"
+ 
+ esd_val=yes
+ # Check whether --enable-esd or --disable-esd was given.
diff --git a/net/ayttm/files/patch-ac b/net/ayttm/files/patch-ac
deleted file mode 100644
index b38f494d1fc1..000000000000
--- a/net/ayttm/files/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/main.c.orig	Sun Jan 21 00:47:19 2001
-+++ src/main.c	Sun Jan 21 00:48:42 2001
-@@ -130,6 +130,7 @@
- #if defined( _WIN32 )
- 	strcpy(config_dir, "C:\\.everybuddy\\");
- #else
-+	gtk_set_locale ();
- 	g_snprintf(config_dir, 1024, "%s/.everybuddy/",getenv("HOME"));
- #endif
- 
-@@ -263,6 +264,7 @@
- 		close(sock);
- 		exit(ret);
- 	}
-+	gtk_set_locale ();
- 	g_snprintf(buff, 1024, "%s",config_dir);
- 	services_init();
- 		
diff --git a/net/ayttm/files/patch-ag b/net/ayttm/files/patch-ag
index b226ce2fd005..c7015ce37ecf 100644
--- a/net/ayttm/files/patch-ag
+++ b/net/ayttm/files/patch-ag
@@ -1,9 +1,9 @@
---- pixmaps/Makefile.am.orig	Sun Jan 21 00:51:54 2001
-+++ pixmaps/Makefile.am	Sun Jan 21 00:52:09 2001
+--- pixmaps/Makefile.am.orig	Mon Jun 18 13:54:21 2001
++++ pixmaps/Makefile.am	Mon Jun 18 13:54:43 2001
 @@ -6,5 +6,5 @@
  	msn_online.xpm msn_away.xpm tb_mail_send.xpm tb_search.xpm \
  	line-wrap.xbm line-arrow.xbm ebicon.png jabber_online.xpm jabber_away.xpm \
- 	ebicon.png
+ 	ebicon.png zephyr_online.xpm zephyr_hidden.xpm zephyr_offline.xpm
 -Utilitiesdir = $(datadir)/pixmaps
 -Utilities_DATA = ebicon.png
 +Utilitiesdir = 
diff --git a/net/ayttm/files/patch-ah b/net/ayttm/files/patch-ah
deleted file mode 100644
index 57205cc21182..000000000000
--- a/net/ayttm/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/#main.c~	Mon Jan 29 14:49:29 2001
-+++ src/main.c	Mon Jan 29 14:49:29 2001
-@@ -279,7 +279,7 @@
- 	strcat(local.sun_path, "eb_socket");
- 	unlink(local.sun_path);
- 	local.sun_family = AF_UNIX;
--	len = strlen(local.sun_path) + sizeof(local.sun_family);
-+	len = strlen(local.sun_path) + 1 + sizeof(local.sun_family);
- 	if(bind(sock, (struct sockaddr *)&local, len) == -1)
- 	{
- 		perror("bind");
diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile
index a29dbb52680a..f05844f2a239 100644
--- a/net/everybuddy/Makefile
+++ b/net/everybuddy/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	everybuddy
-PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTVERSION=	0.2.1b5
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	jim@FreeBSD.org
 
@@ -20,4 +20,7 @@ GNU_CONFIGURE=	yes
 
 MAN1=		everybuddy.1
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/net/everybuddy/distinfo b/net/everybuddy/distinfo
index 590b85e2b436..0384fe0c4bdc 100644
--- a/net/everybuddy/distinfo
+++ b/net/everybuddy/distinfo
@@ -1 +1 @@
-MD5 (everybuddy-0.2.0.tar.gz) = fba80cb89284099bc89114e37e4fedad
+MD5 (everybuddy-0.2.1beta5.tar.gz) = 12e4f0a074b2d452dd84a73bfc40d9e4
diff --git a/net/everybuddy/files/patch-aa b/net/everybuddy/files/patch-aa
index 2f64364014d9..df24355206ae 100644
--- a/net/everybuddy/files/patch-aa
+++ b/net/everybuddy/files/patch-aa
@@ -1,15 +1,11 @@
---- configure.orig	Sun Jan 21 00:36:28 2001
-+++ configure	Sun Jan 21 00:37:27 2001
-@@ -2415,10 +2415,10 @@
- CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" 
- 
- EB_CFLAGS="$CFLAGS -I../"
--EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -lpthread -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode"
-+EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -pthread -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode"
+--- configure.orig	Mon Jun 18 13:40:19 2001
++++ configure	Mon Jun 18 13:44:04 2001
+@@ -3437,7 +3437,7 @@
+ EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode -L../zephyr -lzephyr"
  EB_LDADD="$LDADD"
  
 -EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g "
 +EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall"
- # Check whether --with-esd-prefix or --without-esd-prefix was given.
- if test "${with_esd_prefix+set}" = set; then
-   withval="$with_esd_prefix"
+ 
+ esd_val=yes
+ # Check whether --enable-esd or --disable-esd was given.
diff --git a/net/everybuddy/files/patch-ac b/net/everybuddy/files/patch-ac
deleted file mode 100644
index b38f494d1fc1..000000000000
--- a/net/everybuddy/files/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/main.c.orig	Sun Jan 21 00:47:19 2001
-+++ src/main.c	Sun Jan 21 00:48:42 2001
-@@ -130,6 +130,7 @@
- #if defined( _WIN32 )
- 	strcpy(config_dir, "C:\\.everybuddy\\");
- #else
-+	gtk_set_locale ();
- 	g_snprintf(config_dir, 1024, "%s/.everybuddy/",getenv("HOME"));
- #endif
- 
-@@ -263,6 +264,7 @@
- 		close(sock);
- 		exit(ret);
- 	}
-+	gtk_set_locale ();
- 	g_snprintf(buff, 1024, "%s",config_dir);
- 	services_init();
- 		
diff --git a/net/everybuddy/files/patch-ag b/net/everybuddy/files/patch-ag
index b226ce2fd005..c7015ce37ecf 100644
--- a/net/everybuddy/files/patch-ag
+++ b/net/everybuddy/files/patch-ag
@@ -1,9 +1,9 @@
---- pixmaps/Makefile.am.orig	Sun Jan 21 00:51:54 2001
-+++ pixmaps/Makefile.am	Sun Jan 21 00:52:09 2001
+--- pixmaps/Makefile.am.orig	Mon Jun 18 13:54:21 2001
++++ pixmaps/Makefile.am	Mon Jun 18 13:54:43 2001
 @@ -6,5 +6,5 @@
  	msn_online.xpm msn_away.xpm tb_mail_send.xpm tb_search.xpm \
  	line-wrap.xbm line-arrow.xbm ebicon.png jabber_online.xpm jabber_away.xpm \
- 	ebicon.png
+ 	ebicon.png zephyr_online.xpm zephyr_hidden.xpm zephyr_offline.xpm
 -Utilitiesdir = $(datadir)/pixmaps
 -Utilities_DATA = ebicon.png
 +Utilitiesdir = 
diff --git a/net/everybuddy/files/patch-ah b/net/everybuddy/files/patch-ah
deleted file mode 100644
index 57205cc21182..000000000000
--- a/net/everybuddy/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/#main.c~	Mon Jan 29 14:49:29 2001
-+++ src/main.c	Mon Jan 29 14:49:29 2001
-@@ -279,7 +279,7 @@
- 	strcat(local.sun_path, "eb_socket");
- 	unlink(local.sun_path);
- 	local.sun_family = AF_UNIX;
--	len = strlen(local.sun_path) + sizeof(local.sun_family);
-+	len = strlen(local.sun_path) + 1 + sizeof(local.sun_family);
- 	if(bind(sock, (struct sockaddr *)&local, len) == -1)
- 	{
- 		perror("bind");