5 files changed, 48 insertions, 52 deletions

diff --git a/net-im/gajim/files/patch-Makefile b/net-im/gajim/files/patch-Makefile
index cc11715fc137..c5db11a834e0 100644
--- a/net-im/gajim/files/patch-Makefile
+++ b/net-im/gajim/files/patch-Makefile
@@ -1,50 +1,68 @@
---- 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
+--- Makefile.orig	Mon May 23 22:22:10 2005
++++ Makefile	Thu May 26 15:16:31 2005
+@@ -1,15 +1,17 @@
+ VERSION		?= 0.7
  
- MODULES		= common plugins/gtkgui
+ MODULES		= src src/common po
 -PREFIX		= /usr
 +PREFIX		?= /usr/local
  DESTDIR		= /
-+MAKE		?= gmake
  
--FIND		= find -regex '.*\.\(\(glade\)\|\(py\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)'
+-FIND		= find -regex '.*\.\(\(glade\)\|\(pyo\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)'
 -FILES		= `$(FIND)`
 -DIRS		= `$(FIND) -exec dirname {} \; | sort -u`
 -FIND_LIB	= find -regex '.*\.\(so\)'
+-FILES_LIB	= `$(FIND_LIB)`
+-FIND_PY		= find -regex '.*\.\(py\)'
++MAKE		= gmake
++
 +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)`
++FIND_PY		= $(FIND) . -regex '.*.(py)'
+ FILES_PY	= `$(FIND_PY)`
  
- LANGS		= fr pt_BR
-+GTK_CFLAGS	= `pkg-config glib-2.0 gtk+-2.0 --cflags-only-I | sed -e 's/-I/:/g' | tr -d ' '` 
-+GTK_LDFLAGS	= `pkg-config glib-2.0 gtk+-2.0 --libs-only-L | sed -e 's/-L/:/g' | tr -d ' '`
-+
  SCRIPTS = \
- 	scripts/gajim
+@@ -18,13 +20,13 @@
+ all: translation trayicon idle pyo
  
-@@ -22,15 +27,15 @@
- 	done
+ translation:
+-	make -C po all
++	$(MAKE) -C po all
  
  trayicon:
--	make -C plugins/gtkgui all;
-+	$(MAKE) -C plugins/gtkgui all;
+-	make -C src all;
++	$(MAKE) -C src all;
  
  idle:
--	make -C common all;
-+	$(MAKE) -C common all GTK_LDFLAGS="$(GTK_LDFLAGS)" GTK_CFLAGS="$(GTK_CFLAGS)";
+-	make -C src/common all;
++	$(MAKE) -C src/common all;
+ 
+ pyo:
+ 	for f in $(FILES_PY) ; do \
+@@ -32,9 +34,9 @@
+ 	done
  
  clean:
 -	find -name *.pyc -exec rm {} \;
+-	find -name *.pyo -exec rm {} \;
 -	find -name *.mo -exec rm {} \;
--	$(foreach sdir, $(MODULES), make -C $(sdir) clean;)
 +	find . -name *.pyc -exec rm {} \;
++	find . -name *.pyo -exec rm {} \;
 +	find . -name *.mo -exec rm {} \;
-+	$(foreach sdir, $(MODULES), $(MAKE) -C $(sdir) clean;)
+ 	$(foreach sdir, $(MODULES), make -C $(sdir) clean;)
  
- # FIXME -- olé gorito
  dist:
+@@ -64,8 +66,8 @@
+ 	cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
+ 	mkdir -p "$(DESTDIR)$(PREFIX)/share/applications";
+ 	cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/";
+-	mkdir -p "$(DESTDIR)$(PREFIX)/share/man/man1";
+-	cp gajim.1 "$(DESTDIR)$(PREFIX)/share/man/man1";
++	mkdir -p "$(DESTDIR)$(PREFIX)/man/man1";
++	cp gajim.1 "$(DESTDIR)$(PREFIX)/man/man1";
+ 	mkdir -p "$(DESTDIR)$(PREFIX)/lib/gajim";
+ 	for f in $(FILES_LIB) ; do \
+ 		cp "$$f" "$(DESTDIR)$(PREFIX)/lib/gajim/"; \
diff --git a/net-im/gajim/files/patch-common_Makefile b/net-im/gajim/files/patch-common_Makefile
deleted file mode 100644
index d17d3c1db42b..000000000000
--- a/net-im/gajim/files/patch-common_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 9dcb724b9ba4..000000000000
--- a/net-im/gajim/files/patch-common_setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 5152f4508459..000000000000
--- a/net-im/gajim/files/patch-plugins_gtkui_Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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/files/patch-scripts_gajim b/net-im/gajim/files/patch-scripts_gajim
new file mode 100644
index 000000000000..6de6724ef7ad
--- /dev/null
+++ b/net-im/gajim/files/patch-scripts_gajim
@@ -0,0 +1,8 @@
+--- scripts/gajim.orig	Thu May 26 16:40:05 2005
++++ scripts/gajim	Thu May 26 16:40:23 2005
+@@ -23,4 +23,4 @@
+ 
+ cd PREFIX/share/gajim/src
+ export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim"
+-python -OO gajim.pyo
++python -OO gajim.py