From 2bd59989c863c10cad265d17ae0eafd96615fd5d Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Mon, 17 Feb 2003 20:37:21 +0000
Subject: Do not die if libgtop encounters a different OS version than the one
 on which it was compiled.  Instead, warn the user, and keep on going.

Submitted by:	Thomas E. Zander <riggs@rrr.de>
---
 devel/libgtop/Makefile                        |  4 ++--
 devel/libgtop/files/patch-src_daemon_server.c | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 devel/libgtop/files/patch-src_daemon_server.c

(limited to 'devel/libgtop')

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 2626a4eb9bea..39272bd6dcde 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	libgtop
 PORTVERSION=	1.0.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libgtop/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/libgtop/files/patch-src_daemon_server.c b/devel/libgtop/files/patch-src_daemon_server.c
new file mode 100644
index 000000000000..bf0bba5c7f21
--- /dev/null
+++ b/devel/libgtop/files/patch-src_daemon_server.c
@@ -0,0 +1,17 @@
+--- src/daemon/server.c.orig	Mon Feb 17 15:22:19 2003
++++ src/daemon/server.c	Mon Feb 17 15:23:31 2003
+@@ -88,11 +88,12 @@
+ 	if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
+ 	    strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
+ 	    strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
+-		fprintf (stderr, "Can only run on %s %s %s\n",
++	    	fprintf (stderr, "This libgtop was compiled on %s %s %s\n",
+ 			 LIBGTOP_COMPILE_SYSTEM,
+ 			 LIBGTOP_COMPILE_RELEASE,
+ 			 LIBGTOP_COMPILE_MACHINE);
+-		_exit (1);
++		fprintf (stderr, "If you see strange problems caused by it,\n");
++		fprintf (stderr, "you should recompile libgtop and dependent applications\n");
+ 	}
+ #endif
+ 	
-- 
cgit v1.2.3