Sun Aug 17 05:55:16 2008 UTC ()
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++.


(dholland)
diff -r1.28 -r1.29 pkgsrc/sysutils/gentoo/Makefile
diff -r1.21 -r1.22 pkgsrc/sysutils/gentoo/distinfo
diff -r0 -r1.7 pkgsrc/sysutils/gentoo/patches/patch-ad
cvs diff -r1.28 -r1.29 pkgsrc/sysutils/gentoo/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gentoo/Makefile 2006/10/14 09:24:10 1.28
+++ pkgsrc/sysutils/gentoo/Makefile 2008/08/17 05:55:15 1.29
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.28 2006/10/14 09:24:10 obache Exp $ 1# $NetBSD: Makefile,v 1.29 2008/08/17 05:55:15 dholland Exp $
2 2
3DISTNAME= gentoo-0.11.56 3DISTNAME= gentoo-0.11.56
 4PKGREVISION= 1
4CATEGORIES= sysutils 5CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gentoo/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gentoo/}
6 7
7MAINTAINER= dunse@goa.nu 8MAINTAINER= dunse@goa.nu
8HOMEPAGE= http://www.obsession.se/gentoo/ 9HOMEPAGE= http://www.obsession.se/gentoo/
9COMMENT= Two-pane filemanager using GTK+, 100% GUI configurable 10COMMENT= Two-pane filemanager using GTK+, 100% GUI configurable
10 11
11USE_TOOLS+= msgfmt 12USE_TOOLS+= msgfmt
12USE_PKGLOCALEDIR= yes 13USE_PKGLOCALEDIR= yes
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
15 16
16EGDIR= ${PREFIX}/share/examples/gentoo 17EGDIR= ${PREFIX}/share/examples/gentoo
cvs diff -r1.21 -r1.22 pkgsrc/sysutils/gentoo/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gentoo/distinfo 2006/10/14 09:24:10 1.21
+++ pkgsrc/sysutils/gentoo/distinfo 2008/08/17 05:55:15 1.22
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.21 2006/10/14 09:24:10 obache Exp $ 1$NetBSD: distinfo,v 1.22 2008/08/17 05:55:15 dholland Exp $
2 2
3SHA1 (gentoo-0.11.56.tar.gz) = f18dd760331b4e10c71852ea0833cf7dc929ae43 3SHA1 (gentoo-0.11.56.tar.gz) = f18dd760331b4e10c71852ea0833cf7dc929ae43
4RMD160 (gentoo-0.11.56.tar.gz) = 8ab88f4a052d4ea41f561b2869e8ce20a2e4ece2 4RMD160 (gentoo-0.11.56.tar.gz) = 8ab88f4a052d4ea41f561b2869e8ce20a2e4ece2
5Size (gentoo-0.11.56.tar.gz) = 1375769 bytes 5Size (gentoo-0.11.56.tar.gz) = 1375769 bytes
6SHA1 (patch-aa) = bd3736cffbda663fd571b6b7a2171e64b4d52927 6SHA1 (patch-aa) = bd3736cffbda663fd571b6b7a2171e64b4d52927
7SHA1 (patch-ab) = 1aaa154789866b436303b0a8f6f20707301d8b7f 7SHA1 (patch-ab) = 1aaa154789866b436303b0a8f6f20707301d8b7f
8SHA1 (patch-ac) = 4e5d52849887b816eb4388fb2c75aefb3443f5c8 8SHA1 (patch-ac) = 4e5d52849887b816eb4388fb2c75aefb3443f5c8
 9SHA1 (patch-ad) = 9438f7148d9510d27b5df3149ea8684ff7872e14
9SHA1 (patch-ae) = daa7cbed8d66af155f2624a0066b2f578e9a93c6 10SHA1 (patch-ae) = daa7cbed8d66af155f2624a0066b2f578e9a93c6
10SHA1 (patch-af) = c86f68937cbf2c086cf1282ec12df5db156f66d5 11SHA1 (patch-af) = c86f68937cbf2c086cf1282ec12df5db156f66d5
11SHA1 (patch-ag) = 3045a4eb72f8c50d147fe09256ec791359053418 12SHA1 (patch-ag) = 3045a4eb72f8c50d147fe09256ec791359053418
12SHA1 (patch-ah) = a2d8839860ccdbc56cdd7ca11f945b29c32917ae 13SHA1 (patch-ah) = a2d8839860ccdbc56cdd7ca11f945b29c32917ae
File Added: pkgsrc/sysutils/gentoo/patches/Attic/patch-ad
$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");