- Update FLTK to version 1.3.5 which brings many new features,

  bug fixes, and adaptations to new compilers
- Switch to the smaller .tar.bz2 distfile and make a few implicit
  dependencies explicit (as reported by `stage-qa')
- Rename `test/help' demo program to `test/help_dialog' in order
  to unbreak against upcomig `devel/ninja' update to version 1.9.0
- The ABI is 100% compatible with the previous version so no port
  revision bumps are necessary for consumer ports
- Chase HTTP redirection in the MASTER_SITES and WWW: line

PR:	235507 (ninja-related)

10 files changed, 158 insertions, 10 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index de614db34411..e08ae8223088 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	fltk
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	https://www.fltk.org/pub/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -13,11 +13,12 @@ COMMENT=	Cross-platform C++ graphical user interface toolkit
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		jpeg localbase pkgconfig
-USE_XORG=	x11 xcursor xext xfixes xft xinerama
-USE_GL=		glu
+USES=		gl jpeg localbase pkgconfig tar:bz2
+USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
+USE_GL=		gl glu
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -29,6 +30,10 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
+post-extract:
+	@${MV} ${WRKSRC}/test/help.cxx ${WRKSRC}/test/help_dialog.cxx
+	@${MV} ${WRKSRC}/test/help-test.html ${WRKSRC}/test/help_dialog.html
+
 post-patch: .SILENT
 	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
 	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index e3dad2aa5667..887f4dbd7963 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478880621
-SHA256 (fltk-1.3.4-source.tar.gz) = c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f
-SIZE (fltk-1.3.4-source.tar.gz) = 5284217
+TIMESTAMP = 1551605094
+SHA256 (fltk-1.3.5-source.tar.bz2) = 2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c
+SIZE (fltk-1.3.5-source.tar.bz2) = 4497531
diff --git a/x11-toolkits/fltk/files/patch-CMake_macros.cmake b/x11-toolkits/fltk/files/patch-CMake_macros.cmake
new file mode 100644
index 000000000000..226b7405afcb
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-CMake_macros.cmake
@@ -0,0 +1,14 @@
+--- CMake/macros.cmake.orig	2019-03-03 08:40:23 UTC
++++ CMake/macros.cmake
+@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
+ 
+     set (tname ${NAME})		# target name
+ 
+-    # rename reserved target name "help" (CMake 2.8.12 and later)
+-    if (${tname} MATCHES "^help$")
+-        set (tname "test_help")
+-    endif (${tname} MATCHES "^help$")
+-
+     foreach(src ${SOURCES})
+         if ("${src}" MATCHES "\\.fl$")
+             list(APPEND flsrcs ${src})
diff --git a/x11-toolkits/fltk/files/patch-documentation_src_examples.dox b/x11-toolkits/fltk/files/patch-documentation_src_examples.dox
new file mode 100644
index 000000000000..630c82fd8d43
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-documentation_src_examples.dox
@@ -0,0 +1,28 @@
+--- documentation/src/examples.dox.orig	2019-03-03 08:40:23 UTC
++++ documentation/src/examples.dox
+@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory s
+ </tr>
+ <tr>
+ <td> \ref examples_hello           </td>
+-<td> \ref examples_help            </td>
++<td> \ref examples_help_dialog     </td>
+ <td> \ref examples_iconize         </td>
+ <td> \ref examples_image           </td>
+ <td> \ref examples_inactive        </td>
+@@ -326,13 +326,13 @@ easily under FLTK.
+ tiny demo shows how little is needed to get a functioning application
+ running with FLTK. Quite impressive, I'd say.
+ 
+-\subsection examples_help help
++\subsection examples_help_dialog help_dialog
+ 
+ \par
+-\c help displays the built-in FLTK help browser. The 
++\c help_dialog displays the built-in FLTK help browser. The
+ Fl_Help_Dialog understands a subset of html and renders
+ various image formats. This widget makes it easy to provide help
+-pages to the user without depending on the operating system's 
++pages to the user without depending on the operating system's
+ html browser.
+ 
+ \subsection examples_iconize iconize
diff --git a/x11-toolkits/fltk/files/patch-test_CMakeLists.txt b/x11-toolkits/fltk/files/patch-test_CMakeLists.txt
new file mode 100644
index 000000000000..93ad8414aa74
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-test_CMakeLists.txt
@@ -0,0 +1,34 @@
+--- test/CMakeLists.txt.orig	2019-03-03 08:40:23 UTC
++++ test/CMakeLists.txt
+@@ -64,7 +64,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;flt
+ CREATE_EXAMPLE(fonts fonts.cxx fltk)
+ CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
+ CREATE_EXAMPLE(hello hello.cxx fltk)
+-CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
++CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images")
+ CREATE_EXAMPLE(icon icon.cxx fltk)
+ CREATE_EXAMPLE(iconize iconize.cxx fltk)
+ CREATE_EXAMPLE(image image.cxx fltk)
+@@ -134,7 +134,7 @@ endif(FLTK_HAVE_CAIRO)
+ # Note: this is incomplete as of 11 Feb 2015
+ # Todo: currently all files are copied, but some of them need configuration:
+ # - demo.menu: fluid can't be started (wrong path)
+-# - demo.menu: help (help-test.html) can't find its images (not copied)
++# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied)
+ # - maybe more ...
+ 
+ # prepare for a "better" test file installation path
+@@ -149,11 +149,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu CO
+ 
+ # use target directory only to avoid redundancy
+ configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY)
+-configure_file(help-test.html ${TESTFILE_PATH} COPYONLY)
++configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY)
+ configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY)
+ configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY)
+ if(APPLE AND NOT OPTION_APPLE_X11)
+     configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY)
+     configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY)
+-    configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY)
++    configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY)
+ endif(APPLE AND NOT OPTION_APPLE_X11)
diff --git a/x11-toolkits/fltk/files/patch-test_Makefile b/x11-toolkits/fltk/files/patch-test_Makefile
new file mode 100644
index 000000000000..9ac59b2ee483
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-test_Makefile
@@ -0,0 +1,37 @@
+--- test/Makefile.orig	2019-03-03 08:40:23 UTC
++++ test/Makefile
+@@ -53,7 +53,7 @@ CPPFILES =\
+ 	gl_overlay.cxx \
+ 	glpuzzle.cxx \
+ 	hello.cxx \
+-	help.cxx \
++	help_dialog.cxx \
+ 	icon.cxx \
+ 	iconize.cxx \
+ 	image.cxx \
+@@ -126,7 +126,7 @@ ALL =	\
+ 	fonts$(EXEEXT) \
+ 	forms$(EXEEXT) \
+ 	hello$(EXEEXT) \
+-	help$(EXEEXT) \
++	help_dialog$(EXEEXT) \
+ 	icon$(EXEEXT) \
+ 	iconize$(EXEEXT) \
+ 	image$(EXEEXT) \
+@@ -372,12 +372,12 @@ forms$(EXEEXT): forms.o
+ 
+ hello$(EXEEXT): hello.o
+ 
+-help$(EXEEXT): help.o $(IMGLIBNAME)
++help_dialog$(EXEEXT): help_dialog.o $(IMGLIBNAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ 	$(OSX_ONLY) ../fltk-config --post $@
+-	$(OSX_ONLY) mkdir -p help.app/Contents/Resources
+-	$(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/
++	$(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources
++	$(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/
+ 
+ icon$(EXEEXT): icon.o
+ 
diff --git a/x11-toolkits/fltk/files/patch-test_demo.menu b/x11-toolkits/fltk/files/patch-test_demo.menu
new file mode 100644
index 000000000000..24f5037dda31
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-test_demo.menu
@@ -0,0 +1,11 @@
+--- test/demo.menu.orig	2019-03-03 08:40:23 UTC
++++ test/demo.menu
+@@ -77,7 +77,7 @@
+ 	@o:Font Tests...:@of
+ 		@of:Fonts:fonts
+ 		@of:UTF-8:utf8
+-	@o:HelpDialog:help
++	@o:HelpDialog:help_dialog
+ 	@o:Input Choice:input_choice
+ 	@o:Preferences:preferences
+ 	@o:Threading:threads
diff --git a/x11-toolkits/fltk/files/patch-test_help__dialog.cxx b/x11-toolkits/fltk/files/patch-test_help__dialog.cxx
new file mode 100644
index 000000000000..4a9a603a16e7
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-test_help__dialog.cxx
@@ -0,0 +1,18 @@
+--- test/help_dialog.cxx.orig	2019-03-03 08:40:23 UTC
++++ test/help_dialog.cxx
+@@ -46,13 +46,13 @@ main(int  argc,			// I - Number of command-line argume
+     strcpy(buf, argv[0]);
+     char *slash = strrchr(buf, '/');
+     if (slash)
+-      strcpy(slash, "/../Resources/help-test.html");
++      strcpy(slash, "/../Resources/help_dialog.html");
+     help->load(buf);
+   
+ #else
+   
+   if (argc <= 1)
+-    help->load("help-test.html");
++    help->load("help_dialog.html");
+   else
+     help->load(argv[1]);
+   
diff --git a/x11-toolkits/fltk/pkg-descr b/x11-toolkits/fltk/pkg-descr
index 967cf43cd627..137061994b11 100644
--- a/x11-toolkits/fltk/pkg-descr
+++ b/x11-toolkits/fltk/pkg-descr
@@ -8,4 +8,4 @@ FLTK is designed to be small and modular enough to be statically linked,
 but works fine as a shared library.  FLTK also includes an excellent UI
 builder called FLUID that can be used to create applications in minutes.
 
-WWW: http://www.fltk.org/
+WWW: https://www.fltk.org/
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index ae7e1a61ad66..6f15df0e1435 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -142,6 +142,7 @@ include/FL/glut.H
 include/FL/mac.H
 include/FL/math.h
 include/FL/names.h
+include/FL/platform.H
 include/FL/win32.H
 include/FL/x.H
 lib/libfltk.a