Unbreak: Fix build with GNOME 2.10 (obtained from CVS)

PR:		ports/79059
Submitted by:	Alex Varju
Approved by:	maintainer

4 files changed, 187 insertions, 39 deletions

diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index fefcd878da03..f6774ac04a82 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -18,12 +18,29 @@ COMMENT=	GTK2 client for giFT daemon
 
 LIB_DEPENDS=	gift.0:${PORTSDIR}/net/gift
 
-BROKEN=	"Needs an update for GTK+ 2.6"
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gconf2 gtk20
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
+GCONF_SCHEMAS=	giftui.schemas
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^giftuidatadir=.*|giftuidatadir=${DATADIR}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^giftuidocdir =.*|giftuidocdir =${DOCSDIR}|g' \
+		${WRKSRC}/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/net-p2p/giftui/files/patch-Makefile.in b/net-p2p/giftui/files/patch-Makefile.in
index 4d5e651e5b79..61ad79a8f6f9 100644
--- a/net-p2p/giftui/files/patch-Makefile.in
+++ b/net-p2p/giftui/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon May 17 01:26:53 2004
-+++ Makefile.in	Wed May 26 18:31:08 2004
-@@ -138,7 +138,7 @@
+--- Makefile.in.orig	Sun May 16 22:26:53 2004
++++ Makefile.in	Sun Mar 20 11:43:00 2005
+@@ -513,7 +513,7 @@
  
- SUBDIRS = data po src
+ info-am:
+ 
+-install-data-am: install-giftuidocDATA
++install-data-am:
+ 
+ install-exec-am:
  
--giftuidocdir = $(prefix)/doc/giftui
-+giftuidocdir = $(prefix)/share/doc/giftui
- giftuidoc_DATA = \
- 	README \
- 	COPYING \
diff --git a/net-p2p/giftui/files/patch-gtkcellrendererprogress b/net-p2p/giftui/files/patch-gtkcellrendererprogress
new file mode 100644
index 000000000000..dc899abbcaa1
--- /dev/null
+++ b/net-p2p/giftui/files/patch-gtkcellrendererprogress
@@ -0,0 +1,141 @@
+Index: src/Makefile.am
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/Makefile.am,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- src/Makefile.am	15 May 2004 05:45:36 -0000	1.2
++++ src/Makefile.am	27 Jul 2004 08:18:09 -0000	1.3
+@@ -10,7 +10,6 @@ giftui_SOURCES = \
+ 	io.c io.h\
+ 	main.c main.h\
+ 	util.c util.h\
+-	gtkcellrendererprogress.c gtkcellrendererprogress.h\
+ 	ui_parent.c ui_parent.h\
+ 	ui_child.c ui_child.h\
+ 	ui.h\
+Index: src/Makefile.in
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/Makefile.in,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- src/Makefile.in	15 May 2004 05:45:36 -0000	1.2
++++ src/Makefile.in	27 Jul 2004 08:18:09 -0000	1.3
+@@ -147,7 +147,6 @@ giftui_SOURCES = \
+ 	io.c io.h\
+ 	main.c main.h\
+ 	util.c util.h\
+-	gtkcellrendererprogress.c gtkcellrendererprogress.h\
+ 	ui_parent.c ui_parent.h\
+ 	ui_child.c ui_child.h\
+ 	ui.h\
+@@ -175,13 +174,12 @@ bin_PROGRAMS = giftui$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+ 
+ am_giftui_OBJECTS = configure.$(OBJEXT) event.$(OBJEXT) io.$(OBJEXT) \
+-	main.$(OBJEXT) util.$(OBJEXT) gtkcellrendererprogress.$(OBJEXT) \
+-	ui_parent.$(OBJEXT) ui_child.$(OBJEXT) ui_menu.$(OBJEXT) \
+-	ui_notebook.$(OBJEXT) ui_about.$(OBJEXT) ui_browse.$(OBJEXT) \
+-	ui_connect.$(OBJEXT) ui_icon.$(OBJEXT) ui_pref.$(OBJEXT) \
+-	ui_search.$(OBJEXT) ui_search_cb.$(OBJEXT) \
+-	ui_transfer.$(OBJEXT) ui_transfer_cb.$(OBJEXT) \
+-	ui_util.$(OBJEXT)
++	main.$(OBJEXT) util.$(OBJEXT) ui_parent.$(OBJEXT) \
++	ui_child.$(OBJEXT) ui_menu.$(OBJEXT) ui_notebook.$(OBJEXT) \
++	ui_about.$(OBJEXT) ui_browse.$(OBJEXT) ui_connect.$(OBJEXT) \
++	ui_icon.$(OBJEXT) ui_pref.$(OBJEXT) ui_search.$(OBJEXT) \
++	ui_search_cb.$(OBJEXT) ui_transfer.$(OBJEXT) \
++	ui_transfer_cb.$(OBJEXT) ui_util.$(OBJEXT)
+ giftui_OBJECTS = $(am_giftui_OBJECTS)
+ giftui_DEPENDENCIES =
+ giftui_LDFLAGS =
+@@ -190,7 +188,6 @@ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/configure.Po ./$(DEPDIR)/event.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/gtkcellrendererprogress.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/io.Po ./$(DEPDIR)/main.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/ui_about.Po ./$(DEPDIR)/ui_browse.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/ui_child.Po ./$(DEPDIR)/ui_connect.Po \
+@@ -272,7 +269,6 @@ distclean-compile:
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configure.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcellrendererprogress.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_about.Po@am__quote@
+Index: src/main.c
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/main.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- src/main.c	6 May 2004 06:55:02 -0000	1.1.1.1
++++ src/main.c	27 Jul 2004 08:18:09 -0000	1.2
+@@ -32,6 +32,7 @@
+ #include "ui.h"
+ #include "ui_connect.h"
+ #include "ui_menu.h"
++#include "ui_transfer.h"
+ 
+ static GtkWidget *window;
+ 
+Index: src/ui_transfer.c
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/ui_transfer.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- src/ui_transfer.c	15 May 2004 05:45:36 -0000	1.2
++++ src/ui_transfer.c	27 Jul 2004 08:18:09 -0000	1.3
+@@ -24,8 +24,6 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
+-#include "gtkcellrendererprogress.h"
+-
+ #include "io.h"
+ #include "event.h"
+ #include "configure.h"
+Index: src/ui_transfer.h
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/ui_transfer.h,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- src/ui_transfer.h	6 May 2004 06:55:01 -0000	1.1.1.1
++++ src/ui_transfer.h	27 Jul 2004 08:18:09 -0000	1.2
+@@ -38,6 +38,14 @@
+ 
+ #define GIFTUI_TRANSFERFILE(arg) ((GiftuiTransferFile_t *) (arg))
+ 
++typedef enum
++{
++	GTK_CELL_RENDERER_PROGRESS_ACTIVE,
++	GTK_CELL_RENDERER_PROGRESS_COMPLETED,
++	GTK_CELL_RENDERER_PROGRESS_PAUSED,
++	GTK_CELL_RENDERER_PROGRESS_CANCELED
++} GtkCellRendererProgressColor;
++
+ typedef struct _GiftuiTransfer GiftuiTransfer;
+ typedef struct _GiftuiTransferClass GiftuiTransferClass;
+ 
+Index: src/ui_transfer_cb.c
+===================================================================
+RCS file: /cvsroot/giftui/giftui/src/ui_transfer_cb.c,v
+retrieving revision 1.1.1.1
+retrieving revision 1.2
+diff -u -p -r1.1.1.1 -r1.2
+--- src/ui_transfer_cb.c	6 May 2004 06:54:58 -0000	1.1.1.1
++++ src/ui_transfer_cb.c	27 Jul 2004 08:31:49 -0000	1.2
+@@ -23,8 +23,6 @@
+ #include <libgift/libgift.h>
+ #include <gtk/gtk.h>
+ 
+-#include "gtkcellrendererprogress.h"
+-
+ #include "io.h"
+ #include "event.h"
+ #include "configure.h"
diff --git a/net-p2p/giftui/pkg-plist b/net-p2p/giftui/pkg-plist
index dede66d2d198..58c5d3a47eb1 100644
--- a/net-p2p/giftui/pkg-plist
+++ b/net-p2p/giftui/pkg-plist
@@ -1,31 +1,21 @@
 bin/giftui
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/giftui.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/giftui.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/giftui.schemas > /dev/null || /usr/bin/true
 share/applications/giftui.desktop
-share/doc/giftui/AUTHORS
-share/doc/giftui/COPYING
-share/doc/giftui/ChangeLog
-share/doc/giftui/NEWS
-share/doc/giftui/README
-share/doc/giftui/TODO
-share/giftui/icons/fasttrack-down.png
-share/giftui/icons/fasttrack-network.png
-share/giftui/icons/fasttrack-search.png
-share/giftui/icons/fasttrack-up.png
-share/giftui/icons/gnutella-down.png
-share/giftui/icons/gnutella-network.png
-share/giftui/icons/gnutella-search.png
-share/giftui/icons/gnutella-up.png
-share/giftui/icons/openft-down.png
-share/giftui/icons/openft-network.png
-share/giftui/icons/openft-search.png
-share/giftui/icons/openft-up.png
-share/giftui/icons/opennap-down.png
-share/giftui/icons/opennap-network.png
-share/giftui/icons/opennap-search.png
-share/giftui/icons/opennap-up.png
+%%DATADIR%%/icons/fasttrack-down.png
+%%DATADIR%%/icons/fasttrack-network.png
+%%DATADIR%%/icons/fasttrack-search.png
+%%DATADIR%%/icons/fasttrack-up.png
+%%DATADIR%%/icons/gnutella-down.png
+%%DATADIR%%/icons/gnutella-network.png
+%%DATADIR%%/icons/gnutella-search.png
+%%DATADIR%%/icons/gnutella-up.png
+%%DATADIR%%/icons/openft-down.png
+%%DATADIR%%/icons/openft-network.png
+%%DATADIR%%/icons/openft-search.png
+%%DATADIR%%/icons/openft-up.png
+%%DATADIR%%/icons/opennap-down.png
+%%DATADIR%%/icons/opennap-network.png
+%%DATADIR%%/icons/opennap-search.png
+%%DATADIR%%/icons/opennap-up.png
 share/pixmaps/giftui.png
-@dirrm share/giftui/icons
-@dirrm share/giftui
-@dirrm share/doc/giftui
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%