fltk14-devel: Build test programs on request

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

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Mar 20 12:55:38 2024 +0100
Changeset:	fe3a8123deced3fc304dadb16ee06bde5cd96674

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/TODO
	fltk14-devel/distinfo
	fltk14-devel/patches/patch-Makefile
	fltk14-devel/patches/patch-documentation_Makefile
	fltk14-devel/patches/patch-test_Makefile

Log Message:
fltk14-devel: Build test programs on request

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

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

diffstat:
 fltk14-devel/Makefile                             | 10 +++++-----
 fltk14-devel/TODO                                 |  1 +
 fltk14-devel/distinfo                             |  6 +++---
 fltk14-devel/patches/patch-Makefile               | 10 +++++-----
 fltk14-devel/patches/patch-documentation_Makefile |  6 +++---
 fltk14-devel/patches/patch-test_Makefile          | 20 ++++++++++----------
 6 files changed, 27 insertions(+), 26 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index cd6ac706b5..8b4d397772 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -11,11 +11,9 @@ HOMEPAGE=	https://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces
 LICENSE=	gnu-lgpl-v2
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		autoconf gmake nroff pkg-config
-# Doesn't run tests, only build them (because they are GUI programs)
-TEST_TARGET=		test
+USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
+USE_TOOLS+=	autoconf gmake nroff pkg-config
 
 PTHREAD_OPTS+=		require
 GNU_CONFIGURE=		yes
@@ -32,6 +30,8 @@ CONFIGURE_ARGS+=	--disable-localjpeg
 CONFIGURE_ARGS+=	--disable-localpng
 CONFIGURE_ARGS+=	--disable-localzlib
 
+TEST_TARGET=	check
+
 .include "options.mk"
 
 # ------------------------------------------------------
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
index 7f4ccbc7f5..102ad31f6f 100644
--- a/fltk14-devel/TODO
+++ b/fltk14-devel/TODO
@@ -5,3 +5,4 @@
     "fltk.list" has entires with 444 permissions, looks like a bug.
 [ ] Check for library suffixes on AIX, HP-UX and macOS
 [ ] Some configurations create the compiler warnings below.
+[X] Build test programs only on request (make test)
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 09d021e6ce..591247a338 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -3,6 +3,6 @@ $NetBSD$
 BLAKE2s (fltk-1.4.x-a77f68693c2d2b14fe0d251844ae8f811ec790a3.zip) = 40c2f747b8f7243e079759783163d3dc73f54aa676d3fbda00dfd6c6a2f1e8a5
 SHA512 (fltk-1.4.x-a77f68693c2d2b14fe0d251844ae8f811ec790a3.zip) = 8664d1cc98932e335dd87af5c6be920d0e6b2a82bfd91c467a9dc0a23482932f7675012ffb380bb456f002bbde53761224fc0b4e7ef4f81e9d9fb37baba2067d
 Size (fltk-1.4.x-a77f68693c2d2b14fe0d251844ae8f811ec790a3.zip) = 9337479 bytes
-SHA1 (patch-Makefile) = 6ee1ce87974ccc307c6213ffc7cb5d989cc463d4
-SHA1 (patch-documentation_Makefile) = 2bf2bdcb808ed75bee22d9587a5fc5edb5f22e35
-SHA1 (patch-test_Makefile) = fe53f4571ac0388866e719dd15628a2648319aa9
+SHA1 (patch-Makefile) = d339f6cfe27b0033769b6d24a10307bd1cb5a807
+SHA1 (patch-documentation_Makefile) = 4af65225feb343f8d4bf1af11cfb4929b7fe81c6
+SHA1 (patch-test_Makefile) = 80f1c06321bd586a087ef510cbe2690279eb63f8
diff --git a/fltk14-devel/patches/patch-Makefile b/fltk14-devel/patches/patch-Makefile
index 5445d64c7e..6aa941097f 100644
--- a/fltk14-devel/patches/patch-Makefile
+++ b/fltk14-devel/patches/patch-Makefile
@@ -1,9 +1,9 @@
 $NetBSD$
 
-Remove tests from directory list.
-Add rule to build tests.
+Remove "test" from directory list.
+Add rule to build tests on request.
 
---- Makefile.orig	2024-03-01 13:00:43.000000000 +0000
+--- Makefile.orig	2024-03-18 22:51:05.000000000 +0000
 +++ Makefile
 @@ -16,7 +16,7 @@
  
@@ -18,8 +18,8 @@ Add rule to build tests.
  		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
  	done
  
-+# [pkgsrc] Build only for "make test"
-+test: makeinclude
++# [pkgsrc] Build tests only on request
++check: makeinclude
 +	echo "=== making test ===";\
 +	(cd test; $(MAKE) $(MFLAGS)) || exit 1;\
 +
diff --git a/fltk14-devel/patches/patch-documentation_Makefile b/fltk14-devel/patches/patch-documentation_Makefile
index de3a3acb86..ea3eaecbaf 100644
--- a/fltk14-devel/patches/patch-documentation_Makefile
+++ b/fltk14-devel/patches/patch-documentation_Makefile
@@ -2,9 +2,9 @@ $NetBSD$
 
 Do not install manpages to cat1/cat3/cat6 directories.
 
---- documentation/Makefile.orig	2023-04-23 08:03:02.000000000 +0000
+--- documentation/Makefile.orig	2024-03-18 22:51:05.000000000 +0000
 +++ documentation/Makefile
-@@ -90,12 +90,6 @@ install: $(MANPAGES)
+@@ -91,12 +91,6 @@ install: $(MANPAGES)
  	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
  	fi
  	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
@@ -17,7 +17,7 @@ Do not install manpages to cat1/cat3/cat6 directories.
  	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
  	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
  	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
-@@ -104,10 +98,6 @@ install: $(MANPAGES)
+@@ -105,10 +99,6 @@ install: $(MANPAGES)
  	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
  
  install-linux install-osx:
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
index 2235010c64..bfd9ceabe5 100644
--- a/fltk14-devel/patches/patch-test_Makefile
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -2,16 +2,16 @@ $NetBSD$
 
 Add note that GUI test programs are not executed automatically.
 
---- test/Makefile.orig	2024-03-01 13:00:43.000000000 +0000
+--- test/Makefile.orig	2024-03-18 22:51:05.000000000 +0000
 +++ test/Makefile
-@@ -242,6 +242,10 @@ GLALL = \
- 	glut_test$(EXEEXT) \
- 	shape$(EXEEXT) \
- 	unittests$(EXEEXT)
-+	echo "-------------------------------------------"
-+	echo 'Test programs were built in $${WRKSRC}/test.'
+@@ -247,6 +247,10 @@ all:	$(ALL) $(GLDEMOS)
+ 	for dir in $(FLUIDDIR); do\
+ 	  $(MAKE)  $(MFLAGS) $(ALLFLUID);\
+ 	done
++	echo "------------------------------------------------"
++	echo 'GUI test programs were built in $${WRKSRC}/test.'
 +	echo "You have to start them manually."
-+	echo "-------------------------------------------"
++	echo "------------------------------------------------"
+ 
+ gldemos:	$(GLALL)
  
- all:	$(ALL) $(GLDEMOS)
- 	for dir in $(FLUIDDIR); do\