Received: by mail.netbsd.org (Postfix, from userid 605) id D6D3584D93; Wed, 4 Sep 2019 17:35:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5E24084D82 for ; Wed, 4 Sep 2019 17:35:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6aOeZvyMCtPC for ; Wed, 4 Sep 2019 17:35:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 84D0484D58 for ; Wed, 4 Sep 2019 17:35:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7F31FFBF4; Wed, 4 Sep 2019 17:35:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1567618545114870" MIME-Version: 1.0 Date: Wed, 4 Sep 2019 17:35:45 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/sysutils/gentoo To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190904173545.7F31FFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1567618545114870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Wed Sep 4 17:35:45 UTC 2019 Modified Files: pkgsrc/sysutils/gentoo: Makefile PLIST distinfo Added Files: pkgsrc/sysutils/gentoo/patches: patch-Makefile.in patch-src_gentoo.c patch-src_mntent__wrap.c Removed Files: pkgsrc/sysutils/gentoo/patches: patch-aa patch-ab patch-ac patch-ad patch-ae patch-af patch-ag patch-ah Log Message: gentoo: Update to 0.20.7 note: this now uses GTK3. 0.20.7 * Fixed bug that prevented setting the colors for a command button's secondary (right-click) function. Reported by RickTee. * Tiny rewrite to how list entries are stored when reading directories which on my system improved speed by around 30X. Suggested by RickTee. * Updated the GNU gettext machinery. Now requires gettext on your system to support internationalization, instead of including the code in a intl/ subdir in gentoo's code. Makes sense? * Fixed a bug that made gentoo's progress-reporting dialogs lack a parent window, whch in turn made GTK+ emit warnings. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/gentoo/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/gentoo/PLIST cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/gentoo/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/gentoo/patches/patch-Makefile.in \ pkgsrc/sysutils/gentoo/patches/patch-src_gentoo.c \ pkgsrc/sysutils/gentoo/patches/patch-src_mntent__wrap.c cvs rdiff -u -r1.8 -r0 pkgsrc/sysutils/gentoo/patches/patch-aa \ pkgsrc/sysutils/gentoo/patches/patch-ad cvs rdiff -u -r1.6 -r0 pkgsrc/sysutils/gentoo/patches/patch-ab cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/gentoo/patches/patch-ac cvs rdiff -u -r1.7 -r0 pkgsrc/sysutils/gentoo/patches/patch-ae cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/gentoo/patches/patch-af cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/gentoo/patches/patch-ag cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/gentoo/patches/patch-ah Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1567618545114870 Content-Disposition: inline Content-Length: 6945 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/gentoo/Makefile diff -u pkgsrc/sysutils/gentoo/Makefile:1.34 pkgsrc/sysutils/gentoo/Makefile:1.35 --- pkgsrc/sysutils/gentoo/Makefile:1.34 Tue Oct 23 19:51:03 2012 +++ pkgsrc/sysutils/gentoo/Makefile Wed Sep 4 17:35:45 2019 @@ -1,23 +1,25 @@ -# $NetBSD: Makefile,v 1.34 2012/10/23 19:51:03 asau Exp $ +# $NetBSD: Makefile,v 1.35 2019/09/04 17:35:45 nia Exp $ -DISTNAME= gentoo-0.11.57 -PKGREVISION= 3 +DISTNAME= gentoo-0.20.7 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gentoo/} MAINTAINER= dunse@goa.nu -HOMEPAGE= http://www.obsession.se/gentoo/ -COMMENT= Two-pane filemanager using GTK+, 100% GUI configurable +HOMEPAGE= https://sourceforge.net/projects/gentoo/ +COMMENT= Two-pane filemanager using GTK, 100% GUI configurable +LICENSE= gnu-gpl-v2 + +USE_TOOLS+= pkg-config +USE_TOOLS+= msgfmt msgmerge xgettext +GNU_CONFIGURE= yes -USE_PKGLOCALEDIR= yes -USE_TOOLS+= msgfmt -GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --disable-gtktest EGDIR= ${PREFIX}/share/examples/gentoo -CONF_FILES= ${EGDIR}/gentoorc ${PKG_SYSCONFDIR}/gentoorc +CONF_FILES+= ${EGDIR}/gentoorc ${PKG_SYSCONFDIR}/gentoorc CONF_FILES+= ${EGDIR}/gentoogtkrc ${PKG_SYSCONFDIR}/gentoogtkrc .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/gentoo/PLIST diff -u pkgsrc/sysutils/gentoo/PLIST:1.12 pkgsrc/sysutils/gentoo/PLIST:1.13 --- pkgsrc/sysutils/gentoo/PLIST:1.12 Sun Jun 14 18:16:05 2009 +++ pkgsrc/sysutils/gentoo/PLIST Wed Sep 4 17:35:45 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:16:05 joerg Exp $ +@comment $NetBSD: PLIST,v 1.13 2019/09/04 17:35:45 nia Exp $ bin/gentoo share/examples/gentoo/gentoogtkrc share/examples/gentoo/gentoorc @@ -125,7 +125,9 @@ share/gentoo/icons/xbm2.xpm share/gentoo/icons/xcf.xpm share/gentoo/icons/xpm.xpm share/gentoo/icons/xpm2.xpm +share/locale/ca/LC_MESSAGES/gentoo.mo share/locale/de/LC_MESSAGES/gentoo.mo +share/locale/es/LC_MESSAGES/gentoo.mo share/locale/es_MX/LC_MESSAGES/gentoo.mo share/locale/fr/LC_MESSAGES/gentoo.mo share/locale/it/LC_MESSAGES/gentoo.mo Index: pkgsrc/sysutils/gentoo/distinfo diff -u pkgsrc/sysutils/gentoo/distinfo:1.28 pkgsrc/sysutils/gentoo/distinfo:1.29 --- pkgsrc/sysutils/gentoo/distinfo:1.28 Wed Nov 4 01:32:14 2015 +++ pkgsrc/sysutils/gentoo/distinfo Wed Sep 4 17:35:45 2019 @@ -1,14 +1,9 @@ -$NetBSD: distinfo,v 1.28 2015/11/04 01:32:14 agc Exp $ +$NetBSD: distinfo,v 1.29 2019/09/04 17:35:45 nia Exp $ -SHA1 (gentoo-0.11.57.tar.gz) = ac5859b489a6b88161d5b0f2ddd06490ce9915eb -RMD160 (gentoo-0.11.57.tar.gz) = 675333aa740f297a0d41d5795689b8e4280d2bdf -SHA512 (gentoo-0.11.57.tar.gz) = 98cd28ba485771c7988896f6365fcab7d313387e48a65af890c8442c3b8e26ca4c545b8ed008af9b6d4b03a622219431e3f8ef1ad539ca3bc9160fa77d4351a7 -Size (gentoo-0.11.57.tar.gz) = 1479376 bytes -SHA1 (patch-aa) = 5d8f1fcd4110b09e02f44584e2ccd921a7175929 -SHA1 (patch-ab) = e84931dbc57434881f8071e389ebe8df061ee0b6 -SHA1 (patch-ac) = 4e5d52849887b816eb4388fb2c75aefb3443f5c8 -SHA1 (patch-ad) = 7e41b435aff7af5e57bfb82902a6bb88af37ad97 -SHA1 (patch-ae) = 92a0efdb319b33db09f96d8d2a4729f9fdf2c9af -SHA1 (patch-af) = 2b80f24bd545177b0d089696e7b3ed7f0d72a3b0 -SHA1 (patch-ag) = 3045a4eb72f8c50d147fe09256ec791359053418 -SHA1 (patch-ah) = c14c80a7c821f69b98cb23156ec5b30ac40ed2ec +SHA1 (gentoo-0.20.7.tar.gz) = 7a04d05610c3118e1c4bd81869b24e5bd973bf52 +RMD160 (gentoo-0.20.7.tar.gz) = 88a08b6139f385b2a5a65150200b88872edab2fb +SHA512 (gentoo-0.20.7.tar.gz) = 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0 +Size (gentoo-0.20.7.tar.gz) = 1414198 bytes +SHA1 (patch-Makefile.in) = 2cbc495151cdd95fda868b603bc5dcca3425477b +SHA1 (patch-src_gentoo.c) = a04cfd377168488a681b6f71087ab530e3bfd9d4 +SHA1 (patch-src_mntent__wrap.c) = 0b06442ecf1fa486cb8ac70ad51d17d76ad4e9fb Added files: Index: pkgsrc/sysutils/gentoo/patches/patch-Makefile.in diff -u /dev/null pkgsrc/sysutils/gentoo/patches/patch-Makefile.in:1.1 --- /dev/null Wed Sep 4 17:35:45 2019 +++ pkgsrc/sysutils/gentoo/patches/patch-Makefile.in Wed Sep 4 17:35:45 2019 @@ -0,0 +1,24 @@ +$NetBSD: patch-Makefile.in,v 1.1 2019/09/04 17:35:45 nia Exp $ + +Install configuration to examples. + +--- Makefile.in.orig 2016-06-14 09:51:27.000000000 +0000 ++++ Makefile.in +@@ -264,7 +264,7 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-GENTOO_CFLAGS = @GENTOO_CFLAGS@ ++GENTOO_CFLAGS = @CFLAGS@ + GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ + GMSGFMT = @GMSGFMT@ + GMSGFMT_015 = @GMSGFMT_015@ +@@ -362,7 +362,7 @@ runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +-sysconfdir = @sysconfdir@ ++sysconfdir = ${datadir}/examples/@PACKAGE@ + target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ Index: pkgsrc/sysutils/gentoo/patches/patch-src_gentoo.c diff -u /dev/null pkgsrc/sysutils/gentoo/patches/patch-src_gentoo.c:1.1 --- /dev/null Wed Sep 4 17:35:45 2019 +++ pkgsrc/sysutils/gentoo/patches/patch-src_gentoo.c Wed Sep 4 17:35:45 2019 @@ -0,0 +1,20 @@ +$NetBSD: patch-src_gentoo.c,v 1.1 2019/09/04 17:35:45 nia Exp $ + +Avoid embedding home directory references in the binary. + +--- src/gentoo.c.orig 2016-02-07 11:53:06.000000000 +0000 ++++ src/gentoo.c +@@ -297,7 +297,12 @@ static void init_paths(CfgInfo *cfg) + g_string_append(cfg->path.path[PTID_GTKRC], G_DIR_SEPARATOR_S PACKAGE); + } + else +- cfg->path.path[PTID_GTKRC] = g_string_new(PATH_GRC); ++ { ++ char *home = getenv("HOME"); ++ if(home == NULL) ++ home = "/"; ++ cfg->path.path[PTID_GTKRC] = g_string_new(home); ++ } + cfg->path.path[PTID_FSTAB] = g_string_new("/etc/fstab"); + cfg->path.path[PTID_MTAB] = g_string_new("/proc/mounts"); + Index: pkgsrc/sysutils/gentoo/patches/patch-src_mntent__wrap.c diff -u /dev/null pkgsrc/sysutils/gentoo/patches/patch-src_mntent__wrap.c:1.1 --- /dev/null Wed Sep 4 17:35:45 2019 +++ pkgsrc/sysutils/gentoo/patches/patch-src_mntent__wrap.c Wed Sep 4 17:35:45 2019 @@ -0,0 +1,18 @@ +$NetBSD: patch-src_mntent__wrap.c,v 1.1 2019/09/04 17:35:45 nia Exp $ + +NetBSD is special and spells it statvfs. + +--- src/mntent_wrap.c.orig 2014-03-14 20:25:05.000000000 +0000 ++++ src/mntent_wrap.c +@@ -115,7 +115,11 @@ static FILE f_fstab, f_mtab; + ** a call to getmntinfo(). The mtab_pos and mtab_num integers are then used to + ** keep track of where in the returned array of statfs structs we are. + */ ++#ifdef __NetBSD__ ++static struct statvfs *mtab = NULL; ++#else + static struct statfs *mtab = NULL; ++#endif + static guint mtab_pos = 0, mtab_num = 0; + + /* 1999-05-09 - An attempt at a BSD implementation, after having received input from --_----------=_1567618545114870--