xnedit: Rework build system patch

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Jan 24 11:27:12 2022 +0100
Changeset:	c1b0677125d9d6d1c7f571804ffa5cf5ea70e30a

Modified Files:
	xnedit/Makefile
	xnedit/distinfo
Added Files:
	xnedit/patches/patch-source_Makefile.common
Removed Files:
	xnedit/patches/patch-makefiles_Makefile.netbsd

Log Message:
xnedit: Rework build system patch

- Honor LDFLAGS with different patch in generic way.
- Add tool dependencies.
- Complaints from verifypc are wrong (fontconfig and Xft are used directly).

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

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

diffstat:
 xnedit/Makefile                                |  4 ++--
 xnedit/distinfo                                |  2 +-
 xnedit/patches/patch-makefiles_Makefile.netbsd | 16 ----------------
 xnedit/patches/patch-source_Makefile.common    | 20 ++++++++++++++++++++
 4 files changed, 23 insertions(+), 19 deletions(-)

diffs:
diff --git a/xnedit/Makefile b/xnedit/Makefile
index fb79627bc1..48254c5685 100644
--- a/xnedit/Makefile
+++ b/xnedit/Makefile
@@ -11,6 +11,7 @@ LICENSE=	gnu-gpl-v2
 VERS=		1.4.0
 
 USE_LANGUAGES=	c99
+USE_TOOLS=	pkg-config yacc
 
 WRKSRC=			${WRKDIR}/xnedit
 BUILD_TARGET=		netbsd
@@ -44,8 +45,7 @@ do-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-# Not needed (indirect dependency of libXft)
-#.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/xnedit/distinfo b/xnedit/distinfo
index c908af14c5..8c186f5734 100644
--- a/xnedit/distinfo
+++ b/xnedit/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (xnedit-1.4.0.tar.gz) = 6d36770d496e3e7fed8c907bf86073e0bba5e77f264565d2d8740d1096982fee
 SHA512 (xnedit-1.4.0.tar.gz) = eba465679984290b5ff1c0584c78fadf78d96b6daef8e78b772bee4e6b4278c025c5f2b22f0688ed3f8bcdea6d54cb6154727cf0d7c53372d908d7d1fb80a401
 Size (xnedit-1.4.0.tar.gz) = 1509634 bytes
-SHA1 (patch-makefiles_Makefile.netbsd) = c739f640987cfed40cc673d3fcb68e3fe94d3b6f
+SHA1 (patch-source_Makefile.common) = 279759cb063721e69a11c4a75310b325a4e28527
 SHA1 (patch-source_textSel.c) = 6f32461596f461a23d68f616add43d5a6b28df65
diff --git a/xnedit/patches/patch-makefiles_Makefile.netbsd b/xnedit/patches/patch-makefiles_Makefile.netbsd
deleted file mode 100644
index 1140b61f65..0000000000
--- a/xnedit/patches/patch-makefiles_Makefile.netbsd
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Add system X11 include directory.
-
---- makefiles/Makefile.netbsd.orig	2019-04-04 14:42:00.000000000 +0000
-+++ makefiles/Makefile.netbsd
-@@ -10,7 +10,7 @@ AR=ar
- # To test if the Motif library exports the runtime version
- # add -DHAVE__XMVERSIONSTRING to CFLAGS
- #
--CFLAGS=-O -I/usr/pkg/include -I/usr/pkg/include/X11 -I/usr/X11R7/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM `pkg-config --cflags xft fontconfig`
--LIBS= -L/usr/X11R7/lib -R/usr/X11R7/lib -lpcre -liconv -lm -lXm -lXt -lSM -lICE -lX11 -lXrender -lXpm -lXext `pkg-config --libs xft fontconfig`
-+CFLAGS+=-DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
-+LIBS= ${LDFLAGS} ${MOTIFLIB} -lpcre -liconv -lm -lXm -lXt -lSM -lICE -lX11 -lXrender -lXpm -lXext -lXft
- 
- include Makefile.common
diff --git a/xnedit/patches/patch-source_Makefile.common b/xnedit/patches/patch-source_Makefile.common
new file mode 100644
index 0000000000..e7a77d81d7
--- /dev/null
+++ b/xnedit/patches/patch-source_Makefile.common
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Honor LDFLAGS.
+
+--- source/Makefile.common.orig	2022-01-09 12:28:40.000000000 +0000
++++ source/Makefile.common
+@@ -21,11 +21,11 @@ all: xnedit xnc
+ xnedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
+ 	$(CC) $(CFLAGS) -c linkdate.c -o linkdate.o
+ 	$(CC) $(CFLAGS) $(OBJS) linkdate.o \
+-	 ../util/libNUtil.a $(XMLLIB) $(XLTLIB) $(LIBS) -o $@
++	 ../util/libNUtil.a $(LDFLAGS) $(XMLLIB) $(XLTLIB) $(LIBS) -o $@
+ 
+ # Note LIBS isn't quite right here; it links unnecessarily against Motif
+ xnc: nc.o server_common.o ../util/libNUtil.a
+-	$(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
++	$(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LDFLAGS) $(LIBS) -o $@
+ 
+ help.o: help.c
+ 	$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@