From db1b9aca3503074560508d03ce1e03eb0cd6d0cd Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Mon, 22 Dec 2003 20:15:18 +0000
Subject: Fix the DATADIR and Help links.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1514 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/libgnome/Makefile                             |  2 +-
 x11/libgnome/files/patch-libgnome_gnome-program.c | 34 +++++++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 72f20fc05..3ab565e4d 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnome
 PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
index c480676d5..90fcdd22c 100644
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -1,6 +1,12 @@
 --- libgnome/gnome-program.c.orig	Wed Jul 23 05:35:30 2003
-+++ libgnome/gnome-program.c	Tue Dec  9 17:25:38 2003
-@@ -899,12 +899,12 @@
++++ libgnome/gnome-program.c	Mon Dec 22 01:19:23 2003
+@@ -894,17 +894,17 @@
+ 	attr_rel = "";
+ 	break;
+     case GNOME_FILE_DOMAIN_DATADIR:
+-	prefix_rel = "/share";
++	prefix_rel = "/share/gnome";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
  	attr_rel = "";
  	break;
      case GNOME_FILE_DOMAIN_SOUND:
@@ -24,7 +30,14 @@
  	break;
      case GNOME_FILE_DOMAIN_APP_LIBDIR:
  	prefix_rel = "/lib";
-@@ -931,13 +931,13 @@
+@@ -925,19 +925,19 @@
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_DATADIR:
+-	prefix_rel = "/share";
++	prefix_rel = "/share/gnome";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "";
  	search_path = FALSE;
  	break;
      case GNOME_FILE_DOMAIN_APP_SOUND:
@@ -40,3 +53,18 @@
  	attr_name = GNOME_PARAM_APP_DATADIR;
  	attr_rel = "/pixmaps";
  	search_path = FALSE;
+@@ -958,12 +958,12 @@
+ 
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 
+-	len = strlen ("/gnome/help/") + 
++	len = strlen ("/help/") + 
+ 		strlen (program->_priv->app_id) + 1;
+ 	attr_rel = g_alloca (len);
+ 	if (attr_rel == NULL /* bad things */)
+ 		return NULL;
+-	g_snprintf (attr_rel, len, "/gnome/help/%s", program->_priv->app_id);
++	g_snprintf (attr_rel, len, "/help/%s", program->_priv->app_id);
+ 
+ 	search_path = FALSE;
+ 	break;
-- 
cgit v1.2.3