pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fltk14-devel: Update to git 2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Mar 20 17:53:45 2024 +0100
Changeset:	e2d4b3dfbd26772c1f50ab5cf516d3a726c22847

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

Log Message:
fltk14-devel: Update to git 2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54

Disable build of test programs with new configure option "--disable-test".

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

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

diffstat:
 fltk14-devel/Makefile                    |  5 +++--
 fltk14-devel/TODO                        |  6 ++++--
 fltk14-devel/distinfo                    |  8 +++-----
 fltk14-devel/patches/patch-Makefile      | 28 ----------------------------
 fltk14-devel/patches/patch-test_Makefile | 17 -----------------
 5 files changed, 10 insertions(+), 54 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 8b4d397772..0a12471882 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	fltk-1.4.x
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_TAG=	a77f68693c2d2b14fe0d251844ae8f811ec790a3
+GITHUB_TAG=	2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
@@ -30,7 +30,8 @@ CONFIGURE_ARGS+=	--disable-localjpeg
 CONFIGURE_ARGS+=	--disable-localpng
 CONFIGURE_ARGS+=	--disable-localzlib
 
-TEST_TARGET=	check
+# Disable build of test programs
+CONFIGURE_ARGS+=	--disable-test
 
 .include "options.mk"
 
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
index 102ad31f6f..d4f5f88c30 100644
--- a/fltk14-devel/TODO
+++ b/fltk14-devel/TODO
@@ -1,8 +1,10 @@
 [X] Add zlib dependency
 [X] Support for HP-UX
 [ ] Support for AIX
-[ ] Static libraries should not be installed with execute permissions.
+[ ] Static libraries should not be installed with execute permissions
     "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.
+[ ] Some configurations create the compiler warnings below
 [X] Build test programs only on request (make test)
+    This was rejected upstream (Issue #940).
+    Disable build of test programs with new option "--disable-test".
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 591247a338..128d72a674 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,8 +1,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) = d339f6cfe27b0033769b6d24a10307bd1cb5a807
+BLAKE2s (fltk-1.4.x-2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54.zip) = 194b20c9029082b04d48c8672d3d84b39360b1b09dcf280500bf5f6edf5c06dc
+SHA512 (fltk-1.4.x-2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54.zip) = a2d54875ba982d17866ed27205eeefd8aba5bcddd6d93d9e4759c6541841694f66eee385957d275e184f9e071a2c73125cd9c59a67ee358113d8a9bd06222577
+Size (fltk-1.4.x-2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54.zip) = 9337915 bytes
 SHA1 (patch-documentation_Makefile) = 4af65225feb343f8d4bf1af11cfb4929b7fe81c6
-SHA1 (patch-test_Makefile) = 80f1c06321bd586a087ef510cbe2690279eb63f8
diff --git a/fltk14-devel/patches/patch-Makefile b/fltk14-devel/patches/patch-Makefile
deleted file mode 100644
index 6aa941097f..0000000000
--- a/fltk14-devel/patches/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Remove "test" from directory list.
-Add rule to build tests on request.
-
---- Makefile.orig	2024-03-18 22:51:05.000000000 +0000
-+++ Makefile
-@@ -16,7 +16,7 @@
- 
- include makeinclude
- 
--DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \
-+DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options \
-        documentation
- 
- all: makeinclude fltk-config
-@@ -25,6 +25,11 @@ all: makeinclude fltk-config
- 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
- 	done
- 
-+# [pkgsrc] Build tests only on request
-+check: makeinclude
-+	echo "=== making test ===";\
-+	(cd test; $(MAKE) $(MFLAGS)) || exit 1;\
-+
- install: makeinclude
- 	-mkdir -p $(DESTDIR)$(bindir)
- 	$(RM) $(DESTDIR)$(bindir)/fltk-config
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
deleted file mode 100644
index bfd9ceabe5..0000000000
--- a/fltk14-devel/patches/patch-test_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Add note that GUI test programs are not executed automatically.
-
---- test/Makefile.orig	2024-03-18 22:51:05.000000000 +0000
-+++ test/Makefile
-@@ -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 "------------------------------------------------"
- 
- gldemos:	$(GLALL)
- 


Home | Main Index | Thread Index | Old Index