Received: by mail.netbsd.org (Postfix, from userid 605) id 4C1EC84D57; Sat, 28 Aug 2021 09:22:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 807E484D40 for ; Sat, 28 Aug 2021 09:22:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id RELQ9Z4YU68I for ; Sat, 28 Aug 2021 09:22:24 +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 C706D84CE1 for ; Sat, 28 Aug 2021 09:22:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B6207FA97; Sat, 28 Aug 2021 09:22:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163014254312560" MIME-Version: 1.0 Date: Sat, 28 Aug 2021 09:22:23 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/sysutils/xfm To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210828092223.B6207FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163014254312560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Aug 28 09:22:23 UTC 2021 Modified Files: pkgsrc/sysutils/xfm: Makefile Log Message: xfm: Copy the app-defaults to the X11 directory. No idea if this is correct, but X only seems to search its base directory for app-defaults and xfm immediately errors if they can't be opened. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/xfm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_163014254312560 Content-Disposition: inline Content-Length: 937 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/xfm/Makefile diff -u pkgsrc/sysutils/xfm/Makefile:1.23 pkgsrc/sysutils/xfm/Makefile:1.24 --- pkgsrc/sysutils/xfm/Makefile:1.23 Mon Feb 24 21:45:24 2020 +++ pkgsrc/sysutils/xfm/Makefile Sat Aug 28 09:22:23 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2020/02/24 21:45:24 bouyer Exp $ +# $NetBSD: Makefile,v 1.24 2021/08/28 09:22:23 nia Exp $ DISTNAME= xfm-1.4.3 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= sysutils x11 MASTER_SITES= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/ @@ -28,6 +28,13 @@ buildlink-Xaw3d-inc-hack: buildlink-dire TOOL_DEPENDS+= tradcpp>=0.5.2:../../devel/tradcpp +.include "../../mk/bsd.prefs.mk" + +.if empty(X11BASE:M${PREFIX}) +CONF_FILES+= ${PREFIX}/lib/X11/app-defaults/Xfm \ + ${X11BASE}/lib/X11/app-defaults/Xfm +.endif + .include "../../x11/libXaw3d/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" --_----------=_163014254312560--