8 files changed, 36 insertions, 78 deletions

diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index fc7e132620e4..e780789557a7 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	meanwhile
-PORTVERSION=	0.3
-PORTREVISION=	4
+PORTVERSION=	0.4.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,10 +19,4 @@ USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-IGNORE=		Does not build on 64-bit platforms, but new release is imminent
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/meanwhile/distinfo b/net-im/meanwhile/distinfo
index 195ec7034ba1..7175188c134d 100644
--- a/net-im/meanwhile/distinfo
+++ b/net-im/meanwhile/distinfo
@@ -1,2 +1,2 @@
-MD5 (meanwhile-0.3.tar.gz) = b28b87aaed0381f93906b605137289ab
-SIZE (meanwhile-0.3.tar.gz) = 347260
+MD5 (meanwhile-0.4.0.tar.gz) = 57be89738f987fd0834735865795261d
+SIZE (meanwhile-0.4.0.tar.gz) = 388902
diff --git a/net-im/meanwhile/files/patch-src_mw_debug.h b/net-im/meanwhile/files/patch-src_mw_debug.h
deleted file mode 100644
index 53b96e6a649a..000000000000
--- a/net-im/meanwhile/files/patch-src_mw_debug.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mw_debug.h.orig	Sun Mar 13 19:52:16 2005
-+++ src/mw_debug.h	Sun Mar 13 19:52:51 2005
-@@ -9,8 +9,12 @@
- #define NSTR(str) ((str != NULL)? str: "(null)")
- 
- 
-+#ifndef g_debug
- #define g_debug(format...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
-+#endif
-+#ifndef g_info
- #define g_info(format...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-+#endif
- 
- 
- /**
diff --git a/net-im/meanwhile/pkg-plist b/net-im/meanwhile/pkg-plist
index 29f4d87a7187..c05a994dc30b 100644
--- a/net-im/meanwhile/pkg-plist
+++ b/net-im/meanwhile/pkg-plist
@@ -1,16 +1,17 @@
-include/meanwhile/channel.h
-include/meanwhile/cipher.h
-include/meanwhile/common.h
-include/meanwhile/error.h
-include/meanwhile/meanwhile.h
-include/meanwhile/message.h
-include/meanwhile/service.h
-include/meanwhile/session.h
-include/meanwhile/srvc_aware.h
-include/meanwhile/srvc_conf.h
-include/meanwhile/srvc_im.h
-include/meanwhile/srvc_store.h
-include/meanwhile/st_list.h
+include/meanwhile/mw_channel.h
+include/meanwhile/mw_cipher.h
+include/meanwhile/mw_common.h
+include/meanwhile/mw_error.h
+include/meanwhile/mw_message.h
+include/meanwhile/mw_service.h
+include/meanwhile/mw_session.h
+include/meanwhile/mw_srvc_aware.h
+include/meanwhile/mw_srvc_conf.h
+include/meanwhile/mw_srvc_dir.h
+include/meanwhile/mw_srvc_im.h
+include/meanwhile/mw_srvc_resolve.h
+include/meanwhile/mw_srvc_store.h
+include/meanwhile/mw_st_list.h
 lib/libmeanwhile.a
 lib/libmeanwhile.so
 lib/libmeanwhile.so.0
diff --git a/net/meanwhile/Makefile b/net/meanwhile/Makefile
index fc7e132620e4..e780789557a7 100644
--- a/net/meanwhile/Makefile
+++ b/net/meanwhile/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	meanwhile
-PORTVERSION=	0.3
-PORTREVISION=	4
+PORTVERSION=	0.4.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,10 +19,4 @@ USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-IGNORE=		Does not build on 64-bit platforms, but new release is imminent
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/meanwhile/distinfo b/net/meanwhile/distinfo
index 195ec7034ba1..7175188c134d 100644
--- a/net/meanwhile/distinfo
+++ b/net/meanwhile/distinfo
@@ -1,2 +1,2 @@
-MD5 (meanwhile-0.3.tar.gz) = b28b87aaed0381f93906b605137289ab
-SIZE (meanwhile-0.3.tar.gz) = 347260
+MD5 (meanwhile-0.4.0.tar.gz) = 57be89738f987fd0834735865795261d
+SIZE (meanwhile-0.4.0.tar.gz) = 388902
diff --git a/net/meanwhile/files/patch-src_mw_debug.h b/net/meanwhile/files/patch-src_mw_debug.h
deleted file mode 100644
index 53b96e6a649a..000000000000
--- a/net/meanwhile/files/patch-src_mw_debug.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mw_debug.h.orig	Sun Mar 13 19:52:16 2005
-+++ src/mw_debug.h	Sun Mar 13 19:52:51 2005
-@@ -9,8 +9,12 @@
- #define NSTR(str) ((str != NULL)? str: "(null)")
- 
- 
-+#ifndef g_debug
- #define g_debug(format...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
-+#endif
-+#ifndef g_info
- #define g_info(format...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-+#endif
- 
- 
- /**
diff --git a/net/meanwhile/pkg-plist b/net/meanwhile/pkg-plist
index 29f4d87a7187..c05a994dc30b 100644
--- a/net/meanwhile/pkg-plist
+++ b/net/meanwhile/pkg-plist
@@ -1,16 +1,17 @@
-include/meanwhile/channel.h
-include/meanwhile/cipher.h
-include/meanwhile/common.h
-include/meanwhile/error.h
-include/meanwhile/meanwhile.h
-include/meanwhile/message.h
-include/meanwhile/service.h
-include/meanwhile/session.h
-include/meanwhile/srvc_aware.h
-include/meanwhile/srvc_conf.h
-include/meanwhile/srvc_im.h
-include/meanwhile/srvc_store.h
-include/meanwhile/st_list.h
+include/meanwhile/mw_channel.h
+include/meanwhile/mw_cipher.h
+include/meanwhile/mw_common.h
+include/meanwhile/mw_error.h
+include/meanwhile/mw_message.h
+include/meanwhile/mw_service.h
+include/meanwhile/mw_session.h
+include/meanwhile/mw_srvc_aware.h
+include/meanwhile/mw_srvc_conf.h
+include/meanwhile/mw_srvc_dir.h
+include/meanwhile/mw_srvc_im.h
+include/meanwhile/mw_srvc_resolve.h
+include/meanwhile/mw_srvc_store.h
+include/meanwhile/mw_st_list.h
 lib/libmeanwhile.a
 lib/libmeanwhile.so
 lib/libmeanwhile.so.0