Gajim is a Jabber client based on a plugin system.

PR:		ports/80438
Submitted by:	Vsevolod Stakhov <vsevolod@highsecure.ru>

16 files changed, 582 insertions, 0 deletions

diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
new file mode 100644
index 000000000000..e46ae75bd896
--- /dev/null
+++ b/net-im/gajim-devel/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	gajim
+# Date created:				27 April 2005
+# Whom:					Vsevolod Stakhov <vsevolod@highsecure.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gajim
+PORTVERSION=	0.6.1
+CATEGORIES=	net
+MASTER_SITES=	http://www.gajim.org/downloads/
+
+MAINTAINER=	vsevolod@highsecure.ru
+COMMENT=	Gajim is a Jabber client based on a plugin system
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
+
+USE_X_PREFIX=	yes
+USE_PYTHON=	2.3+
+USE_GMAKE=	yes
+
+MAKE_ENV+=	PY_CFLAGS=-I${PYTHON_INCLUDEDIR} \
+		PY_PREFIX=${LOCALBASE}
+
+.include <bsd.port.mk>
diff --git a/net-im/gajim-devel/distinfo b/net-im/gajim-devel/distinfo
new file mode 100644
index 000000000000..843b364c6c46
--- /dev/null
+++ b/net-im/gajim-devel/distinfo
@@ -0,0 +1,2 @@
+MD5 (gajim-0.6.1.tar.gz) = fc84c9297a185565f5ba6ad4ea83c5bf
+Size (gajim-0.6.1.tar.gz) = 434627
diff --git a/net-im/gajim-devel/files/patch-Makefile b/net-im/gajim-devel/files/patch-Makefile
new file mode 100644
index 000000000000..5f0dbfa14a17
--- /dev/null
+++ b/net-im/gajim-devel/files/patch-Makefile
@@ -0,0 +1,50 @@
+--- Makefile.orig	Sun Apr  3 14:40:02 2005
++++ Makefile	Thu Apr 28 16:13:52 2005
+@@ -1,16 +1,21 @@
+ VERSION		?= 0.6.1
+ 
+ MODULES		= common plugins/gtkgui
+-PREFIX		= /usr
++PREFIX		?= /usr/local
+ DESTDIR		= /
++MAKE		?= gmake
+ 
+-FIND		= find -regex '.*\.\(\(glade\)\|\(py\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)'
+-FILES		= `$(FIND)`
+-DIRS		= `$(FIND) -exec dirname {} \; | sort -u`
+-FIND_LIB	= find -regex '.*\.\(so\)'
++FIND		= find -E
++FINDOPTS	= -regex '.*.((glade)|(py)|(xpm)|(gif)|(png)|(mo)|(wav))'
++FILES		= `$(FIND) . $(FINDOPTS)`
++DIRS		= `$(FIND) . $(FINDOPTS) -exec dirname {} \; | sort -u`
++FIND_LIB	= $(FIND) . -regex '.*.(so)'
+ FILES_LIB	= `$(FIND_LIB)`
+ 
+ LANGS		= fr pt_BR
++GTK_CFLAGS	= `pkg-config gtk+-2.0 --cflags-only-I | sed -e 's/-I/:/g' | tr -d ' '` 
++GTK_LDFLAGS	= `pkg-config gtk+-2.0 --libs-only-L | sed -e 's/-L/:/g' | tr -d ' '`
++
+ SCRIPTS = \
+ 	scripts/gajim
+ 
+@@ -22,15 +27,15 @@
+ 	done
+ 
+ trayicon:
+-	make -C plugins/gtkgui all;
++	$(MAKE) -C plugins/gtkgui all;
+ 
+ idle:
+-	make -C common all;
++	$(MAKE) -C common all GTK_LDFLAGS="$(GTK_LDFLAGS)" GTK_CFLAGS="$(GTK_CFLAGS)";
+ 
+ clean:
+-	find -name *.pyc -exec rm {} \;
+-	find -name *.mo -exec rm {} \;
+-	$(foreach sdir, $(MODULES), make -C $(sdir) clean;)
++	find . -name *.pyc -exec rm {} \;
++	find . -name *.mo -exec rm {} \;
++	$(foreach sdir, $(MODULES), $(MAKE) -C $(sdir) clean;)
+ 
+ # FIXME -- olé gorito
+ dist:
diff --git a/net-im/gajim-devel/files/patch-common_Makefile b/net-im/gajim-devel/files/patch-common_Makefile
new file mode 100644
index 000000000000..d17d3c1db42b
--- /dev/null
+++ b/net-im/gajim-devel/files/patch-common_Makefile
@@ -0,0 +1,10 @@
+--- common/Makefile.orig	Sun Apr  3 14:40:00 2005
++++ common/Makefile	Thu Apr 28 15:36:14 2005
+@@ -1,5 +1,6 @@
++
+ all:
+-	python setup.py build_ext -i
++	python setup.py build_ext --include-dirs="$(PREFIX)/include$(GTK_CFLAGS)" --library-dirs="$(PREFIX)/lib$(GTK_LDFLAGS)"
+ 
+ clean:
+ 	rm -f *.so
diff --git a/net-im/gajim-devel/files/patch-common_setup.py b/net-im/gajim-devel/files/patch-common_setup.py
new file mode 100644
index 000000000000..9dcb724b9ba4
--- /dev/null
+++ b/net-im/gajim-devel/files/patch-common_setup.py
@@ -0,0 +1,11 @@
+--- common/setup.py.orig	Sun Apr  3 14:40:00 2005
++++ common/setup.py	Thu Apr 28 00:56:41 2005
+@@ -24,8 +24,6 @@
+ 		sources = ['idle.c'],
+ #               extra_compile_args = ['-W'],
+                 libraries = ['gtk-x11-2.0','gdk-x11-2.0','glib-2.0','X11','Xext','Xss','atk-1.0'],
+-                library_dirs = ['/usr/X11R6/lib'],
+-                include_dirs = ['/usr/include/gtk-2.0', '/usr/include/glib-2.0','/usr/lib/gtk-2.0/include','/usr/lib/glib-2.0/include','/usr/include/pango-1.0','/usr/include/atk-1.0']
+ 	)
+ elif os.name == 'nt':
+ 	module1 = Extension( 'idle',
diff --git a/net-im/gajim-devel/files/patch-plugins_gtkui_Makefile b/net-im/gajim-devel/files/patch-plugins_gtkui_Makefile
new file mode 100644
index 000000000000..5152f4508459
--- /dev/null
+++ b/net-im/gajim-devel/files/patch-plugins_gtkui_Makefile
@@ -0,0 +1,9 @@
+--- plugins/gtkgui/Makefile.orig	Wed Apr 27 22:53:16 2005
++++ plugins/gtkgui/Makefile	Wed Apr 27 22:54:13 2005
+@@ -1,5 +1,5 @@
+ # Set the C flags to include the GTK+ and Python libraries
+-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.4/ -I.
++CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` $(PY_CFLAGS) -I.
+ LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
+ 
+ # Build the shared object
diff --git a/net-im/gajim-devel/pkg-descr b/net-im/gajim-devel/pkg-descr
new file mode 100644
index 000000000000..4c65e1994391
--- /dev/null
+++ b/net-im/gajim-devel/pkg-descr
@@ -0,0 +1,13 @@
+Gajim is a Jabber client based on a plugin system.  At this time, 2 plugins
+have been written: one in GTK2 and one that log messages.
+
+FEATURES:
+
+    * Tabbed chat windows
+    * Groupchat support (with MUC protocol)
+    * Emoticons, URL grabber
+    * Systray icon
+    * GPG support
+    * Multiple accounts support
+
+WWW: http://www.gajim.org/
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
new file mode 100644
index 000000000000..d7798fc17bd6
--- /dev/null
+++ b/net-im/gajim-devel/pkg-plist
@@ -0,0 +1,171 @@
+bin/gajim
+lib/gajim/idle.so
+lib/gajim/trayicon.so
+%%DATADIR%%/COPYING
+%%DATADIR%%/Core/__init__.py
+%%DATADIR%%/Core/core.py
+%%DATADIR%%/Messages/fr/LC_MESSAGES/gajim.mo
+%%DATADIR%%/Messages/pt_BR/LC_MESSAGES/gajim.mo
+%%DATADIR%%/common/__init__.py
+%%DATADIR%%/common/debug.py
+%%DATADIR%%/common/hub.py
+%%DATADIR%%/common/i18n.py
+%%DATADIR%%/common/jabber.py
+%%DATADIR%%/common/optparser.py
+%%DATADIR%%/common/plugin.py
+%%DATADIR%%/common/setup.py
+%%DATADIR%%/common/sleepy.py
+%%DATADIR%%/common/thread.py
+%%DATADIR%%/common/xmlstream.py
+%%DATADIR%%/gajim.py
+%%DATADIR%%/gajim.xpm
+%%DATADIR%%/plugins/__init__.py
+%%DATADIR%%/plugins/gtkgui/__init__.py
+%%DATADIR%%/plugins/gtkgui/chat.py
+%%DATADIR%%/plugins/gtkgui/config.py
+%%DATADIR%%/plugins/gtkgui/dialogs.py
+%%DATADIR%%/plugins/gtkgui/emoticons/angry.png
+%%DATADIR%%/plugins/gtkgui/emoticons/bat.png
+%%DATADIR%%/plugins/gtkgui/emoticons/beer.png
+%%DATADIR%%/plugins/gtkgui/emoticons/biggrin.png
+%%DATADIR%%/plugins/gtkgui/emoticons/blush.png
+%%DATADIR%%/plugins/gtkgui/emoticons/boy.png
+%%DATADIR%%/plugins/gtkgui/emoticons/brflower.png
+%%DATADIR%%/plugins/gtkgui/emoticons/brheart.png
+%%DATADIR%%/plugins/gtkgui/emoticons/coffee.png
+%%DATADIR%%/plugins/gtkgui/emoticons/coolglasses.png
+%%DATADIR%%/plugins/gtkgui/emoticons/cry.png
+%%DATADIR%%/plugins/gtkgui/emoticons/cuffs.png
+%%DATADIR%%/plugins/gtkgui/emoticons/devil.png
+%%DATADIR%%/plugins/gtkgui/emoticons/drink.png
+%%DATADIR%%/plugins/gtkgui/emoticons/flower.png
+%%DATADIR%%/plugins/gtkgui/emoticons/frowning.png
+%%DATADIR%%/plugins/gtkgui/emoticons/girl.png
+%%DATADIR%%/plugins/gtkgui/emoticons/heart.png
+%%DATADIR%%/plugins/gtkgui/emoticons/hugleft.png
+%%DATADIR%%/plugins/gtkgui/emoticons/hugright.png
+%%DATADIR%%/plugins/gtkgui/emoticons/kiss.png
+%%DATADIR%%/plugins/gtkgui/emoticons/lamp.png
+%%DATADIR%%/plugins/gtkgui/emoticons/mail.png
+%%DATADIR%%/plugins/gtkgui/emoticons/moon.png
+%%DATADIR%%/plugins/gtkgui/emoticons/music.png
+%%DATADIR%%/plugins/gtkgui/emoticons/no.png
+%%DATADIR%%/plugins/gtkgui/emoticons/oh.png
+%%DATADIR%%/plugins/gtkgui/emoticons/phone.png
+%%DATADIR%%/plugins/gtkgui/emoticons/photo.png
+%%DATADIR%%/plugins/gtkgui/emoticons/pussy.png
+%%DATADIR%%/plugins/gtkgui/emoticons/rainbow.png
+%%DATADIR%%/plugins/gtkgui/emoticons/smile.png
+%%DATADIR%%/plugins/gtkgui/emoticons/star.png
+%%DATADIR%%/plugins/gtkgui/emoticons/stare.png
+%%DATADIR%%/plugins/gtkgui/emoticons/tongue.png
+%%DATADIR%%/plugins/gtkgui/emoticons/unhappy.png
+%%DATADIR%%/plugins/gtkgui/emoticons/wink.png
+%%DATADIR%%/plugins/gtkgui/emoticons/yes.png
+%%DATADIR%%/plugins/gtkgui/groupchat_window.py
+%%DATADIR%%/plugins/gtkgui/gtkgui.glade
+%%DATADIR%%/plugins/gtkgui/gtkgui.py
+%%DATADIR%%/plugins/gtkgui/history_window.py
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/chat.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/connecting.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/error.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/invisible.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/message.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/not_in_the_roster.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/requested.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/typing.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/xa.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/chat.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/connecting.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/invisible.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/xa.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/connecting.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/chat.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/connecting.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/error.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/invisible.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/message.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/not_in_the_roster.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/requested.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/xa.png
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/away.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/chat.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/connecting.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/dnd.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/error.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/invisible.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/message.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/not_in_the_roster.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/offline.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/online.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/requested.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/xa.xpm
+%%DATADIR%%/plugins/gtkgui/pixmaps/logo.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/smile.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/away.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/dnd.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/offline.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/online.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/xa.png
+%%DATADIR%%/plugins/gtkgui/roster_window.py
+%%DATADIR%%/plugins/gtkgui/systray.py
+%%DATADIR%%/plugins/gtkgui/tabbed_chat_window.py
+%%DATADIR%%/plugins/logger/__init__.py
+%%DATADIR%%/plugins/logger/logger.py
+%%DATADIR%%/plugins/sock/__init__.py
+%%DATADIR%%/plugins/sock/sock.py
+%%DATADIR%%/sounds/connected.wav
+%%DATADIR%%/sounds/disconnected.wav
+%%DATADIR%%/sounds/message1.wav
+%%DATADIR%%/sounds/message2.wav
+%%DATADIR%%/sounds/sent.wav
+
+@dirrm lib/gajim
+@dirrm %%DATADIR%%/common
+@dirrm %%DATADIR%%/plugins/gtkgui/emoticons
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/gossip
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/icq
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/msn
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/stellar
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/sun
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets
+@dirrm %%DATADIR%%/plugins/gtkgui/pixmaps/transport
+@dirrm %%DATADIR%%/plugins/gtkgui/pixmaps
+@dirrm %%DATADIR%%/plugins/gtkgui
+@dirrm %%DATADIR%%/plugins/logger
+@dirrm %%DATADIR%%/plugins/sock
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/Core
+@dirrm %%DATADIR%%/Messages/fr/LC_MESSAGES
+@dirrm %%DATADIR%%/Messages/fr
+@dirrm %%DATADIR%%/Messages/pt_BR/LC_MESSAGES
+@dirrm %%DATADIR%%/Messages/pt_BR
+@dirrm %%DATADIR%%/Messages
+@dirrm %%DATADIR%%
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
new file mode 100644
index 000000000000..e46ae75bd896
--- /dev/null
+++ b/net-im/gajim/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	gajim
+# Date created:				27 April 2005
+# Whom:					Vsevolod Stakhov <vsevolod@highsecure.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gajim
+PORTVERSION=	0.6.1
+CATEGORIES=	net
+MASTER_SITES=	http://www.gajim.org/downloads/
+
+MAINTAINER=	vsevolod@highsecure.ru
+COMMENT=	Gajim is a Jabber client based on a plugin system
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
+
+USE_X_PREFIX=	yes
+USE_PYTHON=	2.3+
+USE_GMAKE=	yes
+
+MAKE_ENV+=	PY_CFLAGS=-I${PYTHON_INCLUDEDIR} \
+		PY_PREFIX=${LOCALBASE}
+
+.include <bsd.port.mk>
diff --git a/net-im/gajim/distinfo b/net-im/gajim/distinfo
new file mode 100644
index 000000000000..843b364c6c46
--- /dev/null
+++ b/net-im/gajim/distinfo
@@ -0,0 +1,2 @@
+MD5 (gajim-0.6.1.tar.gz) = fc84c9297a185565f5ba6ad4ea83c5bf
+Size (gajim-0.6.1.tar.gz) = 434627
diff --git a/net-im/gajim/files/patch-Makefile b/net-im/gajim/files/patch-Makefile
new file mode 100644
index 000000000000..5f0dbfa14a17
--- /dev/null
+++ b/net-im/gajim/files/patch-Makefile
@@ -0,0 +1,50 @@
+--- Makefile.orig	Sun Apr  3 14:40:02 2005
++++ Makefile	Thu Apr 28 16:13:52 2005
+@@ -1,16 +1,21 @@
+ VERSION		?= 0.6.1
+ 
+ MODULES		= common plugins/gtkgui
+-PREFIX		= /usr
++PREFIX		?= /usr/local
+ DESTDIR		= /
++MAKE		?= gmake
+ 
+-FIND		= find -regex '.*\.\(\(glade\)\|\(py\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)'
+-FILES		= `$(FIND)`
+-DIRS		= `$(FIND) -exec dirname {} \; | sort -u`
+-FIND_LIB	= find -regex '.*\.\(so\)'
++FIND		= find -E
++FINDOPTS	= -regex '.*.((glade)|(py)|(xpm)|(gif)|(png)|(mo)|(wav))'
++FILES		= `$(FIND) . $(FINDOPTS)`
++DIRS		= `$(FIND) . $(FINDOPTS) -exec dirname {} \; | sort -u`
++FIND_LIB	= $(FIND) . -regex '.*.(so)'
+ FILES_LIB	= `$(FIND_LIB)`
+ 
+ LANGS		= fr pt_BR
++GTK_CFLAGS	= `pkg-config gtk+-2.0 --cflags-only-I | sed -e 's/-I/:/g' | tr -d ' '` 
++GTK_LDFLAGS	= `pkg-config gtk+-2.0 --libs-only-L | sed -e 's/-L/:/g' | tr -d ' '`
++
+ SCRIPTS = \
+ 	scripts/gajim
+ 
+@@ -22,15 +27,15 @@
+ 	done
+ 
+ trayicon:
+-	make -C plugins/gtkgui all;
++	$(MAKE) -C plugins/gtkgui all;
+ 
+ idle:
+-	make -C common all;
++	$(MAKE) -C common all GTK_LDFLAGS="$(GTK_LDFLAGS)" GTK_CFLAGS="$(GTK_CFLAGS)";
+ 
+ clean:
+-	find -name *.pyc -exec rm {} \;
+-	find -name *.mo -exec rm {} \;
+-	$(foreach sdir, $(MODULES), make -C $(sdir) clean;)
++	find . -name *.pyc -exec rm {} \;
++	find . -name *.mo -exec rm {} \;
++	$(foreach sdir, $(MODULES), $(MAKE) -C $(sdir) clean;)
+ 
+ # FIXME -- olé gorito
+ dist:
diff --git a/net-im/gajim/files/patch-common_Makefile b/net-im/gajim/files/patch-common_Makefile
new file mode 100644
index 000000000000..d17d3c1db42b
--- /dev/null
+++ b/net-im/gajim/files/patch-common_Makefile
@@ -0,0 +1,10 @@
+--- common/Makefile.orig	Sun Apr  3 14:40:00 2005
++++ common/Makefile	Thu Apr 28 15:36:14 2005
+@@ -1,5 +1,6 @@
++
+ all:
+-	python setup.py build_ext -i
++	python setup.py build_ext --include-dirs="$(PREFIX)/include$(GTK_CFLAGS)" --library-dirs="$(PREFIX)/lib$(GTK_LDFLAGS)"
+ 
+ clean:
+ 	rm -f *.so
diff --git a/net-im/gajim/files/patch-common_setup.py b/net-im/gajim/files/patch-common_setup.py
new file mode 100644
index 000000000000..9dcb724b9ba4
--- /dev/null
+++ b/net-im/gajim/files/patch-common_setup.py
@@ -0,0 +1,11 @@
+--- common/setup.py.orig	Sun Apr  3 14:40:00 2005
++++ common/setup.py	Thu Apr 28 00:56:41 2005
+@@ -24,8 +24,6 @@
+ 		sources = ['idle.c'],
+ #               extra_compile_args = ['-W'],
+                 libraries = ['gtk-x11-2.0','gdk-x11-2.0','glib-2.0','X11','Xext','Xss','atk-1.0'],
+-                library_dirs = ['/usr/X11R6/lib'],
+-                include_dirs = ['/usr/include/gtk-2.0', '/usr/include/glib-2.0','/usr/lib/gtk-2.0/include','/usr/lib/glib-2.0/include','/usr/include/pango-1.0','/usr/include/atk-1.0']
+ 	)
+ elif os.name == 'nt':
+ 	module1 = Extension( 'idle',
diff --git a/net-im/gajim/files/patch-plugins_gtkui_Makefile b/net-im/gajim/files/patch-plugins_gtkui_Makefile
new file mode 100644
index 000000000000..5152f4508459
--- /dev/null
+++ b/net-im/gajim/files/patch-plugins_gtkui_Makefile
@@ -0,0 +1,9 @@
+--- plugins/gtkgui/Makefile.orig	Wed Apr 27 22:53:16 2005
++++ plugins/gtkgui/Makefile	Wed Apr 27 22:54:13 2005
+@@ -1,5 +1,5 @@
+ # Set the C flags to include the GTK+ and Python libraries
+-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.4/ -I.
++CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` $(PY_CFLAGS) -I.
+ LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
+ 
+ # Build the shared object
diff --git a/net-im/gajim/pkg-descr b/net-im/gajim/pkg-descr
new file mode 100644
index 000000000000..4c65e1994391
--- /dev/null
+++ b/net-im/gajim/pkg-descr
@@ -0,0 +1,13 @@
+Gajim is a Jabber client based on a plugin system.  At this time, 2 plugins
+have been written: one in GTK2 and one that log messages.
+
+FEATURES:
+
+    * Tabbed chat windows
+    * Groupchat support (with MUC protocol)
+    * Emoticons, URL grabber
+    * Systray icon
+    * GPG support
+    * Multiple accounts support
+
+WWW: http://www.gajim.org/
diff --git a/net-im/gajim/pkg-plist b/net-im/gajim/pkg-plist
new file mode 100644
index 000000000000..d7798fc17bd6
--- /dev/null
+++ b/net-im/gajim/pkg-plist
@@ -0,0 +1,171 @@
+bin/gajim
+lib/gajim/idle.so
+lib/gajim/trayicon.so
+%%DATADIR%%/COPYING
+%%DATADIR%%/Core/__init__.py
+%%DATADIR%%/Core/core.py
+%%DATADIR%%/Messages/fr/LC_MESSAGES/gajim.mo
+%%DATADIR%%/Messages/pt_BR/LC_MESSAGES/gajim.mo
+%%DATADIR%%/common/__init__.py
+%%DATADIR%%/common/debug.py
+%%DATADIR%%/common/hub.py
+%%DATADIR%%/common/i18n.py
+%%DATADIR%%/common/jabber.py
+%%DATADIR%%/common/optparser.py
+%%DATADIR%%/common/plugin.py
+%%DATADIR%%/common/setup.py
+%%DATADIR%%/common/sleepy.py
+%%DATADIR%%/common/thread.py
+%%DATADIR%%/common/xmlstream.py
+%%DATADIR%%/gajim.py
+%%DATADIR%%/gajim.xpm
+%%DATADIR%%/plugins/__init__.py
+%%DATADIR%%/plugins/gtkgui/__init__.py
+%%DATADIR%%/plugins/gtkgui/chat.py
+%%DATADIR%%/plugins/gtkgui/config.py
+%%DATADIR%%/plugins/gtkgui/dialogs.py
+%%DATADIR%%/plugins/gtkgui/emoticons/angry.png
+%%DATADIR%%/plugins/gtkgui/emoticons/bat.png
+%%DATADIR%%/plugins/gtkgui/emoticons/beer.png
+%%DATADIR%%/plugins/gtkgui/emoticons/biggrin.png
+%%DATADIR%%/plugins/gtkgui/emoticons/blush.png
+%%DATADIR%%/plugins/gtkgui/emoticons/boy.png
+%%DATADIR%%/plugins/gtkgui/emoticons/brflower.png
+%%DATADIR%%/plugins/gtkgui/emoticons/brheart.png
+%%DATADIR%%/plugins/gtkgui/emoticons/coffee.png
+%%DATADIR%%/plugins/gtkgui/emoticons/coolglasses.png
+%%DATADIR%%/plugins/gtkgui/emoticons/cry.png
+%%DATADIR%%/plugins/gtkgui/emoticons/cuffs.png
+%%DATADIR%%/plugins/gtkgui/emoticons/devil.png
+%%DATADIR%%/plugins/gtkgui/emoticons/drink.png
+%%DATADIR%%/plugins/gtkgui/emoticons/flower.png
+%%DATADIR%%/plugins/gtkgui/emoticons/frowning.png
+%%DATADIR%%/plugins/gtkgui/emoticons/girl.png
+%%DATADIR%%/plugins/gtkgui/emoticons/heart.png
+%%DATADIR%%/plugins/gtkgui/emoticons/hugleft.png
+%%DATADIR%%/plugins/gtkgui/emoticons/hugright.png
+%%DATADIR%%/plugins/gtkgui/emoticons/kiss.png
+%%DATADIR%%/plugins/gtkgui/emoticons/lamp.png
+%%DATADIR%%/plugins/gtkgui/emoticons/mail.png
+%%DATADIR%%/plugins/gtkgui/emoticons/moon.png
+%%DATADIR%%/plugins/gtkgui/emoticons/music.png
+%%DATADIR%%/plugins/gtkgui/emoticons/no.png
+%%DATADIR%%/plugins/gtkgui/emoticons/oh.png
+%%DATADIR%%/plugins/gtkgui/emoticons/phone.png
+%%DATADIR%%/plugins/gtkgui/emoticons/photo.png
+%%DATADIR%%/plugins/gtkgui/emoticons/pussy.png
+%%DATADIR%%/plugins/gtkgui/emoticons/rainbow.png
+%%DATADIR%%/plugins/gtkgui/emoticons/smile.png
+%%DATADIR%%/plugins/gtkgui/emoticons/star.png
+%%DATADIR%%/plugins/gtkgui/emoticons/stare.png
+%%DATADIR%%/plugins/gtkgui/emoticons/tongue.png
+%%DATADIR%%/plugins/gtkgui/emoticons/unhappy.png
+%%DATADIR%%/plugins/gtkgui/emoticons/wink.png
+%%DATADIR%%/plugins/gtkgui/emoticons/yes.png
+%%DATADIR%%/plugins/gtkgui/groupchat_window.py
+%%DATADIR%%/plugins/gtkgui/gtkgui.glade
+%%DATADIR%%/plugins/gtkgui/gtkgui.py
+%%DATADIR%%/plugins/gtkgui/history_window.py
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/chat.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/connecting.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/error.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/invisible.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/message.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/not_in_the_roster.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/requested.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/typing.png
+%%DATADIR%%/plugins/gtkgui/iconsets/gossip/xa.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/chat.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/connecting.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/invisible.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/icq/xa.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/connecting.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/msn/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/away.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/chat.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/connecting.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/dnd.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/error.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/invisible.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/message.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/not_in_the_roster.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/offline.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/online.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/requested.png
+%%DATADIR%%/plugins/gtkgui/iconsets/stellar/xa.png
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/away.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/chat.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/closed.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/connecting.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/dnd.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/error.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/invisible.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/message.gif
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/not_in_the_roster.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/offline.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/online.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/opened.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/requested.xpm
+%%DATADIR%%/plugins/gtkgui/iconsets/sun/xa.xpm
+%%DATADIR%%/plugins/gtkgui/pixmaps/logo.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/smile.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/away.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/dnd.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/offline.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/online.png
+%%DATADIR%%/plugins/gtkgui/pixmaps/transport/xa.png
+%%DATADIR%%/plugins/gtkgui/roster_window.py
+%%DATADIR%%/plugins/gtkgui/systray.py
+%%DATADIR%%/plugins/gtkgui/tabbed_chat_window.py
+%%DATADIR%%/plugins/logger/__init__.py
+%%DATADIR%%/plugins/logger/logger.py
+%%DATADIR%%/plugins/sock/__init__.py
+%%DATADIR%%/plugins/sock/sock.py
+%%DATADIR%%/sounds/connected.wav
+%%DATADIR%%/sounds/disconnected.wav
+%%DATADIR%%/sounds/message1.wav
+%%DATADIR%%/sounds/message2.wav
+%%DATADIR%%/sounds/sent.wav
+
+@dirrm lib/gajim
+@dirrm %%DATADIR%%/common
+@dirrm %%DATADIR%%/plugins/gtkgui/emoticons
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/gossip
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/icq
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/msn
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/stellar
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets/sun
+@dirrm %%DATADIR%%/plugins/gtkgui/iconsets
+@dirrm %%DATADIR%%/plugins/gtkgui/pixmaps/transport
+@dirrm %%DATADIR%%/plugins/gtkgui/pixmaps
+@dirrm %%DATADIR%%/plugins/gtkgui
+@dirrm %%DATADIR%%/plugins/logger
+@dirrm %%DATADIR%%/plugins/sock
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/Core
+@dirrm %%DATADIR%%/Messages/fr/LC_MESSAGES
+@dirrm %%DATADIR%%/Messages/fr
+@dirrm %%DATADIR%%/Messages/pt_BR/LC_MESSAGES
+@dirrm %%DATADIR%%/Messages/pt_BR
+@dirrm %%DATADIR%%/Messages
+@dirrm %%DATADIR%%