Index: head/x11-toolkits/fltk/Makefile =================================================================== --- head/x11-toolkits/fltk/Makefile (revision 495361) +++ head/x11-toolkits/fltk/Makefile (revision 495362) @@ -1,50 +1,55 @@ # Created by: Dima Sivachenko # $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 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 CONFIGURE_ENV= NROFF=echo WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} 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}|;}" \ ${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 Index: head/x11-toolkits/fltk/distinfo =================================================================== --- head/x11-toolkits/fltk/distinfo (revision 495361) +++ head/x11-toolkits/fltk/distinfo (revision 495362) @@ -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 Index: head/x11-toolkits/fltk/files/patch-CMake_macros.cmake =================================================================== --- head/x11-toolkits/fltk/files/patch-CMake_macros.cmake (nonexistent) +++ head/x11-toolkits/fltk/files/patch-CMake_macros.cmake (revision 495362) @@ -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}) Property changes on: head/x11-toolkits/fltk/files/patch-CMake_macros.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/files/patch-documentation_src_examples.dox =================================================================== --- head/x11-toolkits/fltk/files/patch-documentation_src_examples.dox (nonexistent) +++ head/x11-toolkits/fltk/files/patch-documentation_src_examples.dox (revision 495362) @@ -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 + + + \ref examples_hello +- \ref examples_help ++ \ref examples_help_dialog + \ref examples_iconize + \ref examples_image + \ref examples_inactive +@@ -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 Property changes on: head/x11-toolkits/fltk/files/patch-documentation_src_examples.dox ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/files/patch-test_CMakeLists.txt =================================================================== --- head/x11-toolkits/fltk/files/patch-test_CMakeLists.txt (nonexistent) +++ head/x11-toolkits/fltk/files/patch-test_CMakeLists.txt (revision 495362) @@ -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) Property changes on: head/x11-toolkits/fltk/files/patch-test_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/files/patch-test_Makefile =================================================================== --- head/x11-toolkits/fltk/files/patch-test_Makefile (nonexistent) +++ head/x11-toolkits/fltk/files/patch-test_Makefile (revision 495362) @@ -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 + Property changes on: head/x11-toolkits/fltk/files/patch-test_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/files/patch-test_demo.menu =================================================================== --- head/x11-toolkits/fltk/files/patch-test_demo.menu (nonexistent) +++ head/x11-toolkits/fltk/files/patch-test_demo.menu (revision 495362) @@ -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 Property changes on: head/x11-toolkits/fltk/files/patch-test_demo.menu ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/files/patch-test_help__dialog.cxx =================================================================== --- head/x11-toolkits/fltk/files/patch-test_help__dialog.cxx (nonexistent) +++ head/x11-toolkits/fltk/files/patch-test_help__dialog.cxx (revision 495362) @@ -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]); + Property changes on: head/x11-toolkits/fltk/files/patch-test_help__dialog.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/pkg-descr =================================================================== --- head/x11-toolkits/fltk/pkg-descr (revision 495361) +++ head/x11-toolkits/fltk/pkg-descr (revision 495362) @@ -1,11 +1,11 @@ The Fast Light ToolKit ("FLTK", pronounced "fulltick") is a LGPL'd C++ graphical user interface for X11. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation. 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/ Index: head/x11-toolkits/fltk/pkg-plist =================================================================== --- head/x11-toolkits/fltk/pkg-plist (revision 495361) +++ head/x11-toolkits/fltk/pkg-plist (revision 495362) @@ -1,165 +1,166 @@ bin/fltk-config bin/fluid include/FL/Enumerations.H include/FL/Fl.H include/FL/Fl_Adjuster.H include/FL/Fl_BMP_Image.H include/FL/Fl_Bitmap.H include/FL/Fl_Box.H include/FL/Fl_Browser.H include/FL/Fl_Browser_.H include/FL/Fl_Button.H include/FL/Fl_Cairo.H include/FL/Fl_Cairo_Window.H include/FL/Fl_Chart.H include/FL/Fl_Check_Browser.H include/FL/Fl_Check_Button.H include/FL/Fl_Choice.H include/FL/Fl_Clock.H include/FL/Fl_Color_Chooser.H include/FL/Fl_Copy_Surface.H include/FL/Fl_Counter.H include/FL/Fl_Device.H include/FL/Fl_Dial.H include/FL/Fl_Double_Window.H include/FL/Fl_Export.H include/FL/Fl_File_Browser.H include/FL/Fl_File_Chooser.H include/FL/Fl_File_Icon.H include/FL/Fl_File_Input.H include/FL/Fl_Fill_Dial.H include/FL/Fl_Fill_Slider.H include/FL/Fl_Float_Input.H include/FL/Fl_FormsBitmap.H include/FL/Fl_FormsPixmap.H include/FL/Fl_Free.H include/FL/Fl_GIF_Image.H include/FL/Fl_Gl_Window.H include/FL/Fl_Group.H include/FL/Fl_Help_Dialog.H include/FL/Fl_Help_View.H include/FL/Fl_Hold_Browser.H include/FL/Fl_Hor_Fill_Slider.H include/FL/Fl_Hor_Nice_Slider.H include/FL/Fl_Hor_Slider.H include/FL/Fl_Hor_Value_Slider.H include/FL/Fl_Image.H include/FL/Fl_Image_Surface.H include/FL/Fl_Input.H include/FL/Fl_Input_.H include/FL/Fl_Input_Choice.H include/FL/Fl_Int_Input.H include/FL/Fl_JPEG_Image.H include/FL/Fl_Light_Button.H include/FL/Fl_Line_Dial.H include/FL/Fl_Menu.H include/FL/Fl_Menu_.H include/FL/Fl_Menu_Bar.H include/FL/Fl_Menu_Button.H include/FL/Fl_Menu_Item.H include/FL/Fl_Menu_Window.H include/FL/Fl_Multi_Browser.H include/FL/Fl_Multi_Label.H include/FL/Fl_Multiline_Input.H include/FL/Fl_Multiline_Output.H include/FL/Fl_Native_File_Chooser.H include/FL/Fl_Nice_Slider.H include/FL/Fl_Object.H include/FL/Fl_Output.H include/FL/Fl_Overlay_Window.H include/FL/Fl_PNG_Image.H include/FL/Fl_PNM_Image.H include/FL/Fl_Pack.H include/FL/Fl_Paged_Device.H include/FL/Fl_Pixmap.H include/FL/Fl_Plugin.H include/FL/Fl_Positioner.H include/FL/Fl_PostScript.H include/FL/Fl_Preferences.H include/FL/Fl_Printer.H include/FL/Fl_Progress.H include/FL/Fl_RGB_Image.H include/FL/Fl_Radio_Button.H include/FL/Fl_Radio_Light_Button.H include/FL/Fl_Radio_Round_Button.H include/FL/Fl_Repeat_Button.H include/FL/Fl_Return_Button.H include/FL/Fl_Roller.H include/FL/Fl_Round_Button.H include/FL/Fl_Round_Clock.H include/FL/Fl_Scroll.H include/FL/Fl_Scrollbar.H include/FL/Fl_Secret_Input.H include/FL/Fl_Select_Browser.H include/FL/Fl_Shared_Image.H include/FL/Fl_Simple_Counter.H include/FL/Fl_Single_Window.H include/FL/Fl_Slider.H include/FL/Fl_Spinner.H include/FL/Fl_Sys_Menu_Bar.H include/FL/Fl_Table.H include/FL/Fl_Table_Row.H include/FL/Fl_Tabs.H include/FL/Fl_Text_Buffer.H include/FL/Fl_Text_Display.H include/FL/Fl_Text_Editor.H include/FL/Fl_Tile.H include/FL/Fl_Tiled_Image.H include/FL/Fl_Timer.H include/FL/Fl_Toggle_Button.H include/FL/Fl_Toggle_Light_Button.H include/FL/Fl_Toggle_Round_Button.H include/FL/Fl_Tooltip.H include/FL/Fl_Tree.H include/FL/Fl_Tree_Item.H include/FL/Fl_Tree_Item_Array.H include/FL/Fl_Tree_Prefs.H include/FL/Fl_Valuator.H include/FL/Fl_Value_Input.H include/FL/Fl_Value_Output.H include/FL/Fl_Value_Slider.H include/FL/Fl_Widget.H include/FL/Fl_Window.H include/FL/Fl_Wizard.H include/FL/Fl_XBM_Image.H include/FL/Fl_XPM_Image.H include/FL/abi-version.h include/FL/dirent.h include/FL/filename.H include/FL/fl_ask.H include/FL/fl_draw.H include/FL/fl_message.H include/FL/fl_show_colormap.H include/FL/fl_show_input.H include/FL/fl_types.h include/FL/fl_utf8.h include/FL/forms.H include/FL/gl.h include/FL/gl2opengl.h include/FL/gl_draw.H include/FL/glu.h 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 lib/libfltk.so lib/libfltk.so.1 lib/libfltk.so.1.3 lib/libfltk_forms.a lib/libfltk_forms.so lib/libfltk_forms.so.1 lib/libfltk_forms.so.1.3 lib/libfltk_gl.a lib/libfltk_gl.so lib/libfltk_gl.so.1 lib/libfltk_gl.so.1.3 lib/libfltk_images.a lib/libfltk_images.so lib/libfltk_images.so.1 lib/libfltk_images.so.1.3 man/man1/fltk-config.1.gz man/man1/fluid.1.gz man/man3/fltk.3.gz