xmatchview: change font directory to XMATCHVIEW_FONTDIR

[Brook Milligan <brook%nmsu.edu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Brook Milligan <brook%nmsu.edu@localhost>
Pushed By:	brook
Date:		Sun Jun 20 11:47:15 2021 -0600
Changeset:	dc81f89ff99490267c3f6e8d67a2aced42b60af9

Modified Files:
	xmatchview/Makefile
	xmatchview/files/Makefile.xmatchview

Log Message:
xmatchview: change font directory to XMATCHVIEW_FONTDIR

The previous variable used for the font directory (FONT_DIR)
might easily have conflicted with other uses.  To prevent that,
change the name to XMATCHVIEW_FONTDIR.  This only affects use
of the Makefile in the xmatchview example directory.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dc81f89ff99490267c3f6e8d67a2aced42b60af9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xmatchview/Makefile                  | 2 +-
 xmatchview/files/Makefile.xmatchview | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/xmatchview/Makefile b/xmatchview/Makefile
index e95b7a4944..838a4f6eac 100644
--- a/xmatchview/Makefile
+++ b/xmatchview/Makefile
@@ -33,7 +33,7 @@ TEST_TARGET=	all
 TEST_DIRS=	test test-hive
 TEST_ENV+=	XMATCHVIEW=../xmatchview.py
 TEST_ENV+=	XMATCHVIEW_HIVE=../xmatchview-hive.py
-TEST_ENV+=	FONT_DIR=../tarballs/fonts
+TEST_ENV+=	XMATCHVIEW_FONTDIR=../tarballs/fonts
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile.xmatchview ${WRKSRC}/test/Makefile
diff --git a/xmatchview/files/Makefile.xmatchview b/xmatchview/files/Makefile.xmatchview
index 9dffecc619..e153b0d4a0 100644
--- a/xmatchview/files/Makefile.xmatchview
+++ b/xmatchview/files/Makefile.xmatchview
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-XMATCHVIEW?=	xmatchview.py
-FONT_DIR?=	@PREFIX@/share/fonts/xmatchview
+XMATCHVIEW?=		xmatchview.py
+XMATCHVIEW_FONTDIR?=	@PREFIX@/share/fonts/xmatchview
 
 XMATCHVIEW_ARGS+=	-x FTL1_pa.fa_vs_FTL1_ss.fa.rep
 XMATCHVIEW_ARGS+=	-s FTL1_ss.fa
@@ -14,7 +14,7 @@ XMATCHVIEW_ARGS+=	-c 2
 XMATCHVIEW_ARGS+=	-f png
 XMATCHVIEW_ARGS+=	-y FTL1_pa.gff
 XMATCHVIEW_ARGS+=	-e FTL1_ss.gff
-XMATCHVIEW_ARGS+=	-p ${FONT_DIR}
+XMATCHVIEW_ARGS+=	-p ${XMATCHVIEW_FONTDIR}
 
 all:
 	${XMATCHVIEW} ${XMATCHVIEW_ARGS}