pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/gentoo Fix this to not use the compile-time $...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/71ec348e739e
branches:  trunk
changeset: 545902:71ec348e739e
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Aug 17 05:55:15 2008 +0000

description:
Fix this to not use the compile-time $HOME to look for the gtkrc file.
(Since that is set to work/.home, it was compiling in the pkgsrc work
directory and failing for PKG_DEVELOPERs.)
Use getenv("HOME") instead.
PKGREVISION++.

diffstat:

 sysutils/gentoo/Makefile         |   3 ++-
 sysutils/gentoo/distinfo         |   3 ++-
 sysutils/gentoo/patches/patch-ad |  23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs (56 lines):

diff -r a8fb78d5a65e -r 71ec348e739e sysutils/gentoo/Makefile
--- a/sysutils/gentoo/Makefile  Sun Aug 17 05:52:30 2008 +0000
+++ b/sysutils/gentoo/Makefile  Sun Aug 17 05:55:15 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2006/10/14 09:24:10 obache Exp $
+# $NetBSD: Makefile,v 1.29 2008/08/17 05:55:15 dholland Exp $
 
 DISTNAME=      gentoo-0.11.56
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gentoo/}
 
diff -r a8fb78d5a65e -r 71ec348e739e sysutils/gentoo/distinfo
--- a/sysutils/gentoo/distinfo  Sun Aug 17 05:52:30 2008 +0000
+++ b/sysutils/gentoo/distinfo  Sun Aug 17 05:55:15 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2006/10/14 09:24:10 obache Exp $
+$NetBSD: distinfo,v 1.22 2008/08/17 05:55:15 dholland Exp $
 
 SHA1 (gentoo-0.11.56.tar.gz) = f18dd760331b4e10c71852ea0833cf7dc929ae43
 RMD160 (gentoo-0.11.56.tar.gz) = 8ab88f4a052d4ea41f561b2869e8ce20a2e4ece2
@@ -6,6 +6,7 @@
 SHA1 (patch-aa) = bd3736cffbda663fd571b6b7a2171e64b4d52927
 SHA1 (patch-ab) = 1aaa154789866b436303b0a8f6f20707301d8b7f
 SHA1 (patch-ac) = 4e5d52849887b816eb4388fb2c75aefb3443f5c8
+SHA1 (patch-ad) = 9438f7148d9510d27b5df3149ea8684ff7872e14
 SHA1 (patch-ae) = daa7cbed8d66af155f2624a0066b2f578e9a93c6
 SHA1 (patch-af) = c86f68937cbf2c086cf1282ec12df5db156f66d5
 SHA1 (patch-ag) = 3045a4eb72f8c50d147fe09256ec791359053418
diff -r a8fb78d5a65e -r 71ec348e739e sysutils/gentoo/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gentoo/patches/patch-ad  Sun Aug 17 05:55:15 2008 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.7 2008/08/17 05:55:16 dholland Exp $
+
+--- src/gentoo.c~      2006-08-23 14:58:12.000000000 -0400
++++ src/gentoo.c       2008-08-17 01:44:41.000000000 -0400
+@@ -334,7 +334,18 @@ static GtkWidget * build_gui(MainInfo *m
+ static void init_paths(CfgInfo *cfg)
+ {
+       cfg->path.path[PTID_ICON]  = g_string_new(PATH_ICN);
++#if 0
++      /* PATH_GRC is the compile-time $HOME, which seems wrong. */
+       cfg->path.path[PTID_GTKRC] = g_string_new(PATH_GRC);
++#else
++      {
++              const char *home = getenv("HOME");
++              if (home == NULL) {
++                      home = "/";
++              }
++              cfg->path.path[PTID_GTKRC] = g_string_new(home);
++      }
++#endif
+       cfg->path.path[PTID_FSTAB] = g_string_new("/etc/fstab");
+       cfg->path.path[PTID_MTAB]  = g_string_new("/proc/mounts");
+ 



Home | Main Index | Thread Index | Old Index