Attachment #226685 for bug #254934




# Created by: Dima Sivachenko <dima@Chg.RU>

PORTNAME=	fltk
PORTVERSION=	1.3.7
PORTREVISION=	1
CATEGORIES=	x11-toolkits
MASTER_SITES=	https://www.fltk.org/pub/${PORTNAME}/${PORTVERSION}/
DISTNAME=	${PORTNAME}-${PORTVERSION}-source

LIB_DEPENDS=	libpng.so:graphics/png \
		libfontconfig.so:x11-fonts/fontconfig

USES=		cmake desktop-file-utils gl jpeg localbase pkgconfig shared-mime-info tar:bz2 xorg
USE_XORG=	ice sm x11 xcursor xext xfixes xft xinerama xrender
USE_GL=		gl glu
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-shared
CONFIGURE_ENV=	NROFF=echo

CMAKE_ON=	OPTION_BUILD_SHARED_LIBS

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

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}|;}" \
		${WRKSRC}/src/Fl_Preferences.cxx
	${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \
		${WRKSRC}/test/Makefile
	${REINPLACE_CMD} -e '/^INSTALL_BIN/s,-m,${STRIP} &, ; \
		s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in
	${REINPLACE_CMD} -E \
		's,(.*)LDFLAGS(.*)LINKSHARED(.*),\1LINKSHARED\2LDFLAGS\3,' \
			${WRKSRC}/fluid/Makefile

post-install:
.for x in fltk fltk_forms fltk_gl fltk_images
	${LN} -sf lib${x}.so.${PORTVERSION:R} \
		${STAGEDIR}${PREFIX}/lib/lib${x}.so.1
.endfor

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11-toolkits/fltk/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1551605094	1	TIMESTAMP = 1627233788
2	SHA256 (fltk-1.3.5-source.tar.bz2) = 2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c	2	SHA256 (fltk-1.3.7-source.tar.bz2) = 5ff1e90766ff4216e78e9a19a9bf527e6258f04accccd4429e9bb829b01d690d
3	SIZE (fltk-1.3.5-source.tar.bz2) = 4497531	3	SIZE (fltk-1.3.7-source.tar.bz2) = 4571092




--- fltk-config.in.orig	2021-07-25 13:16:28 UTC
+++ fltk-config.in
@@ -233,7 +233,7 @@ else
 fi
 
 # Calculate needed libraries
-LDSTATIC="$libdir/libfltk.a $LDLIBS"
+LDSTATIC="-lm $libdir/libfltk.a $LDLIBS"
 LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
 LIBS="$libdir/libfltk.a"
 
 if test x$use_forms = xyes; then
@@ -349,7 +349,7 @@ if test "$echo_optim" = "yes"; then
 fi
 
 if test "$echo_ldflags" = "yes"; then




include/FL/x.H
lib/libfltk.a
lib/libfltk.so
lib/libfltk.so.1
lib/libfltk.so.1.3
lib/libfltk.so.1.3.7
lib/libfltk_forms.a
lib/libfltk_forms.so
lib/libfltk_forms.so.1
lib/libfltk_forms.so.1.3
lib/libfltk_forms.so.1.3.7
lib/libfltk_gl.a
lib/libfltk_gl.so
lib/libfltk_gl.so.1
lib/libfltk_gl.so.1.3
lib/libfltk_gl.so.1.3.7
lib/libfltk_images.a
lib/libfltk_images.so
lib/libfltk_images.so.1
lib/libfltk_images.so.1.3
lib/libfltk_images.so.1.3.7
man/man1/fltk-config.1.gz
man/man1/fluid.1.gz
man/man3/fltk.3.gz
man/man6/blocks.6.gz
man/man6/checkers.6.gz
man/man6/sudoku.6.gz
share/applications/fluid.desktop
%%DATADIR%%/FLTK-Functions.cmake
%%DATADIR%%/FLTK-Targets-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/FLTK-Targets.cmake
%%DATADIR%%/FLTKConfig.cmake
%%DATADIR%%/UseFLTK.cmake
share/icons/hicolor/128x128/apps/fluid.png
share/icons/hicolor/32x32/apps/fluid.png
share/icons/hicolor/48x48/apps/fluid.png
share/icons/hicolor/64x64/apps/fluid.png
share/mime/packages/fluid.xml




--- 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})

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-FL_Fl_Check_Browser.H (-10 lines)
1	--- FL/Fl_Check_Browser.H.orig 2012-11-07 18:19:01.000000000 +0100
2	+++ FL/Fl_Check_Browser.H 2012-11-07 18:19:16.000000000 +0100
3	@@ -88,6 +88,7 @@
4	Returns how many lines are in the browser. The last line number is equal to
5	this.
6	*/
7	+#undef nitems // nitems was added as a macro in sys/param.h in r236486
8	int nitems() const { return nitems_; }
9	/** Returns how many items are currently checked. */
10	int nchecked() const { return nchecked_; }




--- configure.orig	2016-11-11 16:04:30 UTC
+++ configure
@@ -4193,7 +4193,7 @@ if ${ac_cv_path_NROFF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $NROFF in
-  [\\/]* | ?:[\\/]*)
+  [\\/]* | ?:[\\/]* | echo)
   ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
   ;;
   *)
@@ -7408,7 +7408,7 @@ $as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE
 	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-	LDFLAGS="$X_LIBS $LDFLAGS"
+	LDFLAGS="$LDFLAGS $X_LIBS"
 	DSOFLAGS="$X_LIBS $DSOFLAGS"
 	$as_echo "#define USE_X11 1" >>confdefs.h
 
@@ -8276,16 +8276,9 @@ if test -n "$GCC"; then
 	#       They all seem to make either no difference or enlarge
 	#       the code by a few hundred bytes.
 	#
-	#       "-Os" seems to be the best compromise between speed and
-	#       code size.  "-O3" and higher seem to make no effective
-	#       difference in the speed of the code, but does bloat the
-	#       library 10+%.
-	#
 
 	if test "x$with_optim" != x; then
 	    OPTIM="$with_optim $OPTIM"
-	else
-	    OPTIM="-Os $OPTIM"
 	fi
     fi
 




--- documentation/Makefile.orig	2011-08-27 01:33:42.000000000 +0000
+++ documentation/Makefile	2011-08-27 01:39:59.000000000 +0000
@@ -73,7 +73,7 @@
 
 install: $(MANPAGES)
 	echo "Installing documentation files in $(DESTDIR)$(docdir) ..."
-	-$(INSTALL_DIR) $(DESTDIR)$(docdir)
+#	-$(INSTALL_DIR) $(DESTDIR)$(docdir)
 	if test -f html/index.html ; then \
 	  for file in html/* ; do \
 		$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
@@ -84,11 +84,6 @@
 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
 	fi
 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
-	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
-	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
 	-$(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




--- 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)




--- 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
 

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-test_demo.menu (-11 lines)
1	--- test/demo.menu.orig 2019-03-03 08:40:23 UTC
2	+++ test/demo.menu
3	@@ -77,7 +77,7 @@
4	@o:Font Tests...:@of
5	@of:Fonts:fonts
6	@of:UTF-8:utf8
7	- @o:HelpDialog:help
8	+ @o:HelpDialog:help_dialog
9	@o:Input Choice:input_choice
10	@o:Preferences:preferences
11	@o:Threading:threads




--- 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]);
   

Return to bug 254934

Lines 1-8 Link Here

(-)b/x11-toolkits/fltk/Makefile (-33 / +5 lines)
1	# Created by: Dima Sivachenko <dima@Chg.RU>	1	# Created by: Dima Sivachenko <dima@Chg.RU>
2		2
3	PORTNAME= fltk	3	PORTNAME= fltk
4	PORTVERSION= 1.3.5	4	PORTVERSION= 1.3.7
5	PORTREVISION= 1
6	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
7	MASTER_SITES= https://www.fltk.org/pub/${PORTNAME}/${PORTVERSION}/	6	MASTER_SITES= https://www.fltk.org/pub/${PORTNAME}/${PORTVERSION}/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-source	7	DISTNAME= ${PORTNAME}-${PORTVERSION}-source
Lines 16-55 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
16	LIB_DEPENDS= libpng.so:graphics/png \	15	LIB_DEPENDS= libpng.so:graphics/png \
17	libfontconfig.so:x11-fonts/fontconfig	16	libfontconfig.so:x11-fonts/fontconfig
18		17
19	USES= gl jpeg localbase pkgconfig tar:bz2 xorg	18	USES= cmake desktop-file-utils gl jpeg localbase pkgconfig shared-mime-info tar:bz2 xorg
20	USE_XORG= x11 xcursor xext xfixes xft xinerama xrender	19	USE_XORG= ice sm x11 xcursor xext xfixes xft xinerama xrender
21	USE_GL= gl glu	20	USE_GL= gl glu
22	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
23	GNU_CONFIGURE= yes
24	CONFIGURE_ARGS= --enable-shared
25	CONFIGURE_ENV= NROFF=echo
26		22
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	23	CMAKE_ON= OPTION_BUILD_SHARED_LIBS
28		24
29	PORTEXAMPLES= *	25	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
30
31	OPTIONS_DEFINE= EXAMPLES
32
33	post-extract:
34	@${MV} ${WRKSRC}/test/help.cxx ${WRKSRC}/test/help_dialog.cxx
35	@${MV} ${WRKSRC}/test/help-test.html ${WRKSRC}/test/help_dialog.html
36
37	post-patch: .SILENT
38	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
39	${REINPLACE_CMD} -e "\\|/etc/fltk\|{s\|\|${PREFIX}&\|;s\|10\|$${plength}\|;}" \
40	${WRKSRC}/src/Fl_Preferences.cxx
41	${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \
42	${WRKSRC}/test/Makefile
43	${REINPLACE_CMD} -e '/^INSTALL_BIN/s,-m,${STRIP} &, ; \
44	s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in
45	${REINPLACE_CMD} -E \
46	's,(.)LDFLAGS(.)LINKSHARED(.*),\1LINKSHARED\2LDFLAGS\3,' \
47	${WRKSRC}/fluid/Makefile
48
49	post-install:
50	.for x in fltk fltk_forms fltk_gl fltk_images
51	${LN} -sf lib${x}.so.${PORTVERSION:R} \
52	${STAGEDIR}${PREFIX}/lib/lib${x}.so.1
53	.endfor
54		26
55	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)b/x11-toolkits/fltk/files/patch-fltk-config.in (-5 / +5 lines)
1	--- fltk-config.in.orig Mon Sep 6 15:20:52 2004	1	--- fltk-config.in.orig 2021-07-25 13:16:28 UTC
2	+++ fltk-config.in Sat Jun 25 11:45:04 2005	2	+++ fltk-config.in
3	@@ -180,7 +180,7 @@	3	@@ -233,7 +233,7 @@ else
4	fi	4	fi
5		5
6	# Calculate needed libraries	6	# Calculate needed libraries
7	-LDSTATIC="$libdir/libfltk.a $LDLIBS"	7	-LDSTATIC="$libdir/libfltk.a $LDLIBS"
8	+LDSTATIC="-lm $libdir/libfltk.a $LDLIBS"	8	+LDSTATIC="-lm $libdir/libfltk.a $LDLIBS"
9	LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"	9	LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
10	LIBS="$libdir/libfltk.a"
11		10
12	@@ -247,7 +247,7 @@	11	if test x$use_forms = xyes; then
		12	@@ -349,7 +349,7 @@ if test "$echo_optim" = "yes"; then
13	fi	13	fi
14		14
15	if test "$echo_ldflags" = "yes"; then	15	if test "$echo_ldflags" = "yes"; then

Lines 147-166 include/FL/win32.H Link Here

(-)b/x11-toolkits/fltk/pkg-plist (-4 / +18 lines)
147	include/FL/x.H	147	include/FL/x.H
148	lib/libfltk.a	148	lib/libfltk.a
149	lib/libfltk.so	149	lib/libfltk.so
150	lib/libfltk.so.1
151	lib/libfltk.so.1.3	150	lib/libfltk.so.1.3
		151	lib/libfltk.so.1.3.7
152	lib/libfltk_forms.a	152	lib/libfltk_forms.a
153	lib/libfltk_forms.so	153	lib/libfltk_forms.so
154	lib/libfltk_forms.so.1
155	lib/libfltk_forms.so.1.3	154	lib/libfltk_forms.so.1.3
		155	lib/libfltk_forms.so.1.3.7
156	lib/libfltk_gl.a	156	lib/libfltk_gl.a
157	lib/libfltk_gl.so	157	lib/libfltk_gl.so
158	lib/libfltk_gl.so.1
159	lib/libfltk_gl.so.1.3	158	lib/libfltk_gl.so.1.3
		159	lib/libfltk_gl.so.1.3.7
160	lib/libfltk_images.a	160	lib/libfltk_images.a
161	lib/libfltk_images.so	161	lib/libfltk_images.so
162	lib/libfltk_images.so.1
163	lib/libfltk_images.so.1.3	162	lib/libfltk_images.so.1.3
		163	lib/libfltk_images.so.1.3.7
164	man/man1/fltk-config.1.gz	164	man/man1/fltk-config.1.gz
165	man/man1/fluid.1.gz	165	man/man1/fluid.1.gz
166	man/man3/fltk.3.gz	166	man/man3/fltk.3.gz
		167	man/man6/blocks.6.gz
		168	man/man6/checkers.6.gz
		169	man/man6/sudoku.6.gz
		170	share/applications/fluid.desktop
		171	%%DATADIR%%/FLTK-Functions.cmake
		172	%%DATADIR%%/FLTK-Targets-%%CMAKE_BUILD_TYPE%%.cmake
		173	%%DATADIR%%/FLTK-Targets.cmake
		174	%%DATADIR%%/FLTKConfig.cmake
		175	%%DATADIR%%/UseFLTK.cmake
		176	share/icons/hicolor/128x128/apps/fluid.png
		177	share/icons/hicolor/32x32/apps/fluid.png
		178	share/icons/hicolor/48x48/apps/fluid.png
		179	share/icons/hicolor/64x64/apps/fluid.png
		180	share/mime/packages/fluid.xml

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-CMake_macros.cmake (-14 lines)
1	--- CMake/macros.cmake.orig 2019-03-03 08:40:23 UTC
2	+++ CMake/macros.cmake
3	@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
4
5	set (tname ${NAME}) # target name
6
7	- # rename reserved target name "help" (CMake 2.8.12 and later)
8	- if (${tname} MATCHES "^help$")
9	- set (tname "test_help")
10	- endif (${tname} MATCHES "^help$")
11	-
12	foreach(src ${SOURCES})
13	if ("${src}" MATCHES "\\.fl$")
14	list(APPEND flsrcs ${src})

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-configure (-37 lines)
1	--- configure.orig 2016-11-11 16:04:30 UTC
2	+++ configure
3	@@ -4193,7 +4193,7 @@ if ${ac_cv_path_NROFF+:} false; then :
4	$as_echo_n "(cached) " >&6
5	else
6	case $NROFF in
7	- [\\/]* \| ?:[\\/]*)
8	+ [\\/]* \| ?:[\\/]* \| echo)
9	ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
10	;;
11	*)
12	@@ -7408,7 +7408,7 @@ $as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE
13	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
14	CFLAGS="$CFLAGS $X_CFLAGS"
15	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
16	- LDFLAGS="$X_LIBS $LDFLAGS"
17	+ LDFLAGS="$LDFLAGS $X_LIBS"
18	DSOFLAGS="$X_LIBS $DSOFLAGS"
19	$as_echo "#define USE_X11 1" >>confdefs.h
20
21	@@ -8276,16 +8276,9 @@ if test -n "$GCC"; then
22	# They all seem to make either no difference or enlarge
23	# the code by a few hundred bytes.
24	#
25	- # "-Os" seems to be the best compromise between speed and
26	- # code size. "-O3" and higher seem to make no effective
27	- # difference in the speed of the code, but does bloat the
28	- # library 10+%.
29	- #
30
31	if test "x$with_optim" != x; then
32	OPTIM="$with_optim $OPTIM"
33	- else
34	- OPTIM="-Os $OPTIM"
35	fi
36	fi
37

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-documentation_Makefile (-23 lines)
1	--- documentation/Makefile.orig 2011-08-27 01:33:42.000000000 +0000
2	+++ documentation/Makefile 2011-08-27 01:39:59.000000000 +0000
3	@@ -73,7 +73,7 @@
4
5	install: $(MANPAGES)
6	echo "Installing documentation files in $(DESTDIR)$(docdir) ..."
7	- -$(INSTALL_DIR) $(DESTDIR)$(docdir)
8	+# -$(INSTALL_DIR) $(DESTDIR)$(docdir)
9	if test -f html/index.html ; then \
10	for file in html/* ; do \
11	$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
12	@@ -84,11 +84,6 @@
13	$(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
14	fi
15	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
16	- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
17	- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
18	- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
19	- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
20	- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
21	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
22	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
23	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-test_CMakeLists.txt (-34 lines)
1	--- test/CMakeLists.txt.orig 2019-03-03 08:40:23 UTC
2	+++ test/CMakeLists.txt
3	@@ -64,7 +64,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;flt
4	CREATE_EXAMPLE(fonts fonts.cxx fltk)
5	CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
6	CREATE_EXAMPLE(hello hello.cxx fltk)
7	-CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
8	+CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images")
9	CREATE_EXAMPLE(icon icon.cxx fltk)
10	CREATE_EXAMPLE(iconize iconize.cxx fltk)
11	CREATE_EXAMPLE(image image.cxx fltk)
12	@@ -134,7 +134,7 @@ endif(FLTK_HAVE_CAIRO)
13	# Note: this is incomplete as of 11 Feb 2015
14	# Todo: currently all files are copied, but some of them need configuration:
15	# - demo.menu: fluid can't be started (wrong path)
16	-# - demo.menu: help (help-test.html) can't find its images (not copied)
17	+# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied)
18	# - maybe more ...
19
20	# prepare for a "better" test file installation path
21	@@ -149,11 +149,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu CO
22
23	# use target directory only to avoid redundancy
24	configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY)
25	-configure_file(help-test.html ${TESTFILE_PATH} COPYONLY)
26	+configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY)
27	configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY)
28	configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY)
29	if(APPLE AND NOT OPTION_APPLE_X11)
30	configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY)
31	configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY)
32	- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY)
33	+ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY)
34	endif(APPLE AND NOT OPTION_APPLE_X11)

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-test_Makefile (-37 lines)
1	--- test/Makefile.orig 2019-03-03 08:40:23 UTC
2	+++ test/Makefile
3	@@ -53,7 +53,7 @@ CPPFILES =\
4	gl_overlay.cxx \
5	glpuzzle.cxx \
6	hello.cxx \
7	- help.cxx \
8	+ help_dialog.cxx \
9	icon.cxx \
10	iconize.cxx \
11	image.cxx \
12	@@ -126,7 +126,7 @@ ALL = \
13	fonts$(EXEEXT) \
14	forms$(EXEEXT) \
15	hello$(EXEEXT) \
16	- help$(EXEEXT) \
17	+ help_dialog$(EXEEXT) \
18	icon$(EXEEXT) \
19	iconize$(EXEEXT) \
20	image$(EXEEXT) \
21	@@ -372,12 +372,12 @@ forms$(EXEEXT): forms.o
22
23	hello$(EXEEXT): hello.o
24
25	-help$(EXEEXT): help.o $(IMGLIBNAME)
26	+help_dialog$(EXEEXT): help_dialog.o $(IMGLIBNAME)
27	echo Linking $@...
28	- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
29	+ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
30	$(OSX_ONLY) ../fltk-config --post $@
31	- $(OSX_ONLY) mkdir -p help.app/Contents/Resources
32	- $(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/
33	+ $(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources
34	+ $(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/
35
36	icon$(EXEEXT): icon.o
37

Removed Link Here

(-)a/x11-toolkits/fltk/files/patch-test_help__dialog.cxx (-18 lines)
1	--- test/help_dialog.cxx.orig 2019-03-03 08:40:23 UTC
2	+++ test/help_dialog.cxx
3	@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line argume
4	strcpy(buf, argv[0]);
5	char *slash = strrchr(buf, '/');
6	if (slash)
7	- strcpy(slash, "/../Resources/help-test.html");
8	+ strcpy(slash, "/../Resources/help_dialog.html");
9	help->load(buf);
10
11	#else
12
13	if (argc <= 1)
14	- help->load("help-test.html");
15	+ help->load("help_dialog.html");
16	else
17	help->load(argv[1]);
18