Add a hack to fix the build with GNOME 2.26.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12235 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 113 insertions, 0 deletions

diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
new file mode 100644
index 000000000..79fdeb2e5
--- /dev/null
+++ b/x11/gnome-swallow/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	gnome-swallow
+# Date created:				16 April 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnome-swallow
+PORTVERSION=	1.2
+PORTREVISION=	6
+CATEGORIES=	x11 gnome
+MASTER_SITES=	http://interreality.org/~tetron/technology/swallow/
+
+MAINTAINER=	marcus@FreeBSD.org
+COMMENT=	Applet that swallows any X11 application into the GNOME 2 panel
+
+USE_XORG=	x11
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomepanel
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		LIBS="`pkg-config --libs libgnomeui-2.0`"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/GNOME_Swallow.server
+
+.include <bsd.port.mk>
diff --git a/x11/gnome-swallow/distinfo b/x11/gnome-swallow/distinfo
new file mode 100644
index 000000000..4642b9c5b
--- /dev/null
+++ b/x11/gnome-swallow/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-swallow-1.2.tar.gz) = 9a278a8b5031957f7ca4f5f99044ba8e
+SHA256 (gnome-swallow-1.2.tar.gz) = 09df0782e216591d1bff90e50b894242fa135f577f3502223e57734dc304afc8
+SIZE (gnome-swallow-1.2.tar.gz) = 90732
diff --git a/x11/gnome-swallow/files/patch-GNOME_Swallow.server b/x11/gnome-swallow/files/patch-GNOME_Swallow.server
new file mode 100644
index 000000000..1f99ad2a6
--- /dev/null
+++ b/x11/gnome-swallow/files/patch-GNOME_Swallow.server
@@ -0,0 +1,17 @@
+--- GNOME_Swallow.server.orig	Wed Apr 16 03:13:17 2003
++++ GNOME_Swallow.server	Wed Apr 16 03:13:30 2003
+@@ -1,6 +1,6 @@
+ <oaf_info>
+ <oaf_server iid="OAFIID:GNOME_Swallow_Factory" type="exe"
+-            location="/usr/lib/gnome-panel/gnome_swallow">
++            location="%%PREFIX%%/lib/gnome-panel/gnome_swallow">
+ 
+         <oaf_attribute name="repo_ids" type="stringv">
+                 <item value="IDL:Bonobo/GenericFactory:1.0"/>
+@@ -23,4 +23,4 @@
+         <oaf_attribute name="panel:category" type="string" value="Utility"/>
+         <oaf_attribute name="panel:icon" type="string" value="gnome-applets.png"/>
+ </oaf_server>
+-</oaf_info>
+\ No newline at end of file
++</oaf_info>
diff --git a/x11/gnome-swallow/files/patch-Makefile.in b/x11/gnome-swallow/files/patch-Makefile.in
new file mode 100644
index 000000000..e8914f324
--- /dev/null
+++ b/x11/gnome-swallow/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Apr 16 03:11:46 2003
++++ Makefile.in	Wed Apr 16 03:11:57 2003
+@@ -103,7 +103,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ paneldir = $(prefix)/lib/gnome-panel
+-serversdir = $(prefix)/lib/bonobo/servers
++serversdir = $(prefix)/libdata/bonobo/servers
+ docdir = $(prefix)/share/doc/gnome-swallow
+ 
+ dist_doc_DATA = README
diff --git a/x11/gnome-swallow/files/patch-gnome-swallow.c b/x11/gnome-swallow/files/patch-gnome-swallow.c
new file mode 100644
index 000000000..49b5b5c1f
--- /dev/null
+++ b/x11/gnome-swallow/files/patch-gnome-swallow.c
@@ -0,0 +1,41 @@
+--- gnome-swallow.c.orig	Fri Sep 12 00:21:55 2003
++++ gnome-swallow.c	Sun Apr 24 00:28:34 2005
+@@ -1,3 +1,5 @@
++#include <sys/types.h>
++#include <sys/time.h>
+ #include <string.h>
+ #include <stdio.h>
+ #include <signal.h>
+@@ -55,7 +57,7 @@ gboolean swallow(char* wantedWindow, Dis
+ 
+     XSync (display, FALSE);
+ 
+-    gettimeofday(&tv);
++    gettimeofday(&tv, NULL);
+     now = start = (double)tv.tv_sec + ((double)tv.tv_usec / 1000000.0);
+ 
+     while (ready == FALSE && now < (start + 10.0))
+@@ -131,7 +133,7 @@ gboolean swallow(char* wantedWindow, Dis
+         fprintf(stderr,"Loop");
+         gtk_main_iteration_do(FALSE);
+ 
+-        gettimeofday(&tv);
++        gettimeofday(&tv, NULL);
+         now = (double)tv.tv_sec + ((double)tv.tv_usec / 1000000.0);
+     }
+ 
+@@ -249,13 +251,13 @@ void exitProgram(GtkWidget* w, gpointer 
+ void forkApplet(struct AppletConfigure* ap)
+ {
+     if(ap->pid > -1) {
++        int s;
+         /* Kill the old process and wait for it to die (if the process
+            is already dead then it will be a zombie anyway).
+          */
+         kill(ap->pid, SIGTERM);
+         sleep(1);
+         kill(ap->pid, SIGKILL);
+-        int s;
+         waitpid(ap->pid, &s, WNOHANG);
+     }
+ 
diff --git a/x11/gnome-swallow/pkg-descr b/x11/gnome-swallow/pkg-descr
new file mode 100644
index 000000000..94f04f35c
--- /dev/null
+++ b/x11/gnome-swallow/pkg-descr
@@ -0,0 +1,5 @@
+Gnome-swallow is a pseudo-applet that allows one to swallow any X11
+application into the GNOME 2 panel.  This restores the functionality that
+used to exist in GNOME 1.x.
+
+WWW: http://interreality.org/~tetron/technology/swallow/
diff --git a/x11/gnome-swallow/pkg-plist b/x11/gnome-swallow/pkg-plist
new file mode 100644
index 000000000..cf195d120
--- /dev/null
+++ b/x11/gnome-swallow/pkg-plist
@@ -0,0 +1,5 @@
+lib/gnome-panel/gnome_swallow
+libdata/bonobo/servers/GNOME_Swallow.server
+share/doc/gnome-swallow/README
+@dirrm share/doc/gnome-swallow
+@dirrm lib/gnome-panel