Index: head/x11-toolkits/fltk/Makefile =================================================================== --- head/x11-toolkits/fltk/Makefile (revision 447378) +++ head/x11-toolkits/fltk/Makefile (revision 447379) @@ -1,47 +1,49 @@ # Created by: Dima Sivachenko # $FreeBSD$ PORTNAME= fltk -PORTVERSION= 1.3.3 -PORTREVISION= 5 +PORTVERSION= 1.3.4 CATEGORIES= x11-toolkits MASTER_SITES= http://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 USES= groff jpeg localbase pkgconfig USE_XORG= x11 xcursor xext xfixes xft xinerama USE_GL= glu USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES 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 - ${REINPLACE_CMD} -e '/Fl_XFont_On_Demand/s,class,& FL_EXPORT,' \ - ${WRKSRC}/FL/x.H - ${REINPLACE_CMD} -e 's,result = 0;,fl_open_display(); &,' \ - ${WRKSRC}/src/Fl_x.cxx + +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 447378) +++ head/x11-toolkits/fltk/distinfo (revision 447379) @@ -1,2 +1,3 @@ -SHA256 (fltk-1.3.3-source.tar.gz) = f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 -SIZE (fltk-1.3.3-source.tar.gz) = 4986376 +TIMESTAMP = 1478880621 +SHA256 (fltk-1.3.4-source.tar.gz) = c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f +SIZE (fltk-1.3.4-source.tar.gz) = 5284217 Index: head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx =================================================================== --- head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx (revision 447378) +++ head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx (nonexistent) @@ -1,16 +0,0 @@ ------------------------------------------------------------------------- -r10699 | greg.ercolano | 2015-04-13 16:55:27 +0000 (Mon, 13 Apr 2015) | 3 lines - -Fix return value test, as pointed out by Albrecht. - ---- src/Fl_Tree_Item.cxx.orig 2014-09-05 02:59:00 UTC -+++ src/Fl_Tree_Item.cxx -@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite - } else { // different parent? - if ( to > to_parent->children() ) // try to prevent a reparent() error - return -4; -- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent -+ if ( from_parent->deparent(from) == NULL ) // deparent self from current parent - return -5; - if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to' - to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0 Property changes on: head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/files/patch-src_Makefile =================================================================== --- head/x11-toolkits/fltk/files/patch-src_Makefile (revision 447378) +++ head/x11-toolkits/fltk/files/patch-src_Makefile (nonexistent) @@ -1,34 +0,0 @@ ---- src/Makefile.orig 2011-08-27 01:18:14.000000000 +0000 -+++ src/Makefile 2011-08-27 01:31:39.000000000 +0000 -@@ -576,6 +576,7 @@ - $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ - $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \ - $(LN) libfltk.so.1.3 $(DESTDIR)$(libdir)/libfltk.so;\ -+ $(LN) libfltk.so.1.3 $(DESTDIR)$(libdir)/libfltk.so.1;\ - fi - if test x$(DSONAME) = xlibfltk.sl.1.3; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ -@@ -607,6 +608,7 @@ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ - $(INSTALL_LIB) libfltk_forms.so.1.3 $(DESTDIR)$(libdir); \ - $(LN) libfltk_forms.so.1.3 $(DESTDIR)$(libdir)/libfltk_forms.so;\ -+ $(LN) libfltk_forms.so.1.3 $(DESTDIR)$(libdir)/libfltk_forms.so.1;\ - fi - if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ -@@ -638,6 +640,7 @@ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ - $(INSTALL_LIB) libfltk_gl.so.1.3 $(DESTDIR)$(libdir); \ - $(LN) libfltk_gl.so.1.3 $(DESTDIR)$(libdir)/libfltk_gl.so;\ -+ $(LN) libfltk_gl.so.1.3 $(DESTDIR)$(libdir)/libfltk_gl.so.1;\ - fi - if test x$(GLDSONAME) = xlibfltk_gl.sl.1.3; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ -@@ -669,6 +672,7 @@ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ - $(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \ - $(LN) libfltk_images.so.1.3 $(DESTDIR)$(libdir)/libfltk_images.so;\ -+ $(LN) libfltk_images.so.1.3 $(DESTDIR)$(libdir)/libfltk_images.so.1;\ - fi - if test x$(IMGDSONAME) = xlibfltk_images.sl.1.3; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ Property changes on: head/x11-toolkits/fltk/files/patch-src_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-toolkits/fltk/files/patch-configure =================================================================== --- head/x11-toolkits/fltk/files/patch-configure (revision 447378) +++ head/x11-toolkits/fltk/files/patch-configure (revision 447379) @@ -1,29 +1,28 @@ ---- configure.orig 2011-08-31 09:14:41.000000000 +0200 -+++ configure 2011-08-31 09:14:54.000000000 +0200 -@@ -7362,7 +7362,7 @@ +--- configure.orig 2016-11-11 16:04:30 UTC ++++ configure +@@ -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 -@@ -8137,17 +8137,10 @@ - # Don't use -fforce-mem, -fforce-addr, or -fcaller-saves. +@@ -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 + if test "x$with_optim" != x; then OPTIM="$with_optim $OPTIM" - else -- OPTIM="-Os $OPTIM" +- OPTIM="-Os $OPTIM" fi fi Index: head/x11-toolkits/fltk/pkg-plist =================================================================== --- head/x11-toolkits/fltk/pkg-plist (revision 447378) +++ head/x11-toolkits/fltk/pkg-plist (revision 447379) @@ -1,164 +1,165 @@ 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/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