CVS commit: pkgsrc/sysutils/xfm

["Nia Alarie" <nia%netbsd.org@localhost>]

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.

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"