Index: head/x11-toolkits/fltk-devel/Makefile
===================================================================
--- head/x11-toolkits/fltk-devel/Makefile	(revision 370438)
+++ head/x11-toolkits/fltk-devel/Makefile	(revision 370439)
@@ -1,46 +1,47 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	fltk
 DISTVERSION=	1.3.x-r${SNAPSHOT_VERS}
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/snapshots/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Cross-platform C++ graphical user interface toolkit
 
 LICENSE=	LGPL20
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	EXAMPLES
 EXAMPLES_CMAKE_OFF=	-DOPTION_BUILD_EXAMPLES:BOOL=OFF
 
 USE_XORG=	xft
 USE_GL=		glu
 USE_LDCONFIG=	${PREFIX}/lib/fltk-devel
 USES+=		cmake:outsource
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-DOPTION_BUILD_SHARED_LIBS:BOOL=ON \
-    		-DOPTION_PREFIX_BIN:PATH=${PREFIX}/bin/fltk-devel \
-		-DOPTION_PREFIX_DATA:PATH=${PREFIX}/share/fltk-devel \
-		-DOPTION_PREFIX_DOC:PATH=${PREFIX}/share/examples/fltk-devel \
-		-DOPTION_PREFIX_INCLUDE:PATH=${PREFIX}/include/fltk-devel \
-		-DOPTION_PREFIX_LIB:PATH=${PREFIX}/lib/fltk-devel
+    		-DPREFIX_BIN:PATH=${PREFIX}/bin/fltk-devel \
+		-DPREFIX_DATA:PATH=${PREFIX}/share/fltk-devel \
+		-DPREFIX_DOC:PATH=${PREFIX}/share/examples/fltk-devel \
+		-DPREFIX_INCLUDE:PATH=${PREFIX}/include/fltk-devel \
+		-DPREFIX_LIB:PATH=${PREFIX}/lib/fltk-devel
 
 
-SNAPSHOT_VERS=	10337
+SNAPSHOT_VERS=	10350
 PORTEXAMPLES=	*
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
 
 PORTSCOUT=	limit:1.3.*
 
 post-install:
+	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/fltk-config ${STAGEDIR}${PREFIX}/bin/fltk-devel
 	${LN} -sf fltk-devel/libfltk.so ${STAGEDIR}${PREFIX}/lib/libfltk-devel.so
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/fltk-devel/distinfo
===================================================================
--- head/x11-toolkits/fltk-devel/distinfo	(revision 370438)
+++ head/x11-toolkits/fltk-devel/distinfo	(revision 370439)
@@ -1,2 +1,2 @@
-SHA256 (fltk-1.3.x-r10337.tar.gz) = 83a4a5898ce65538c300f31188bc4186b2da10c275ec155b37fe52789553d355
-SIZE (fltk-1.3.x-r10337.tar.gz) = 4929799
+SHA256 (fltk-1.3.x-r10350.tar.gz) = 534551d7b849f497a1bc6349c19ea12f91d9b1a966c372e0f2c8093151462f76
+SIZE (fltk-1.3.x-r10350.tar.gz) = 4937077
Index: head/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake
===================================================================
--- head/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake	(revision 370438)
+++ head/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake	(revision 370439)
@@ -1,11 +1,20 @@
---- CMake/install.cmake.orig	2014-02-14 15:10:59.000000000 +0100
-+++ CMake/install.cmake	2014-02-14 15:11:07.000000000 +0100
-@@ -63,7 +63,7 @@
+--- CMake/install.cmake.orig	2014-09-27 02:41:06.000000000 +0200
++++ CMake/install.cmake	2014-10-08 14:32:55.000000000 +0200
+@@ -32,7 +32,7 @@
+ )
+ 
+ install(DIRECTORY ${FLTK_SOURCE_DIR}/FL
+-   DESTINATION include USE_SOURCE_PERMISSIONS
++   DESTINATION include/fltk-devel USE_SOURCE_PERMISSIONS
+    PATTERN ".svn" EXCLUDE
+ )
+ 
+@@ -75,7 +75,7 @@
     install(FILES
        ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man
-       DESTINATION ${PREFIX_MAN}/man${LEVEL}
+       DESTINATION man/man${LEVEL}
 -      RENAME ${FILE}.${LEVEL}
 +      RENAME ${FILE}-devel.${LEVEL}
     )
     endmacro(INSTALL_MAN FILE LEVEL)
  
Index: head/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake
===================================================================
--- head/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake	(nonexistent)
+++ head/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake	(revision 370439)
@@ -0,0 +1,15 @@
+--- CMake/macros.cmake.orig	2014-10-08 14:15:49.000000000 +0200
++++ CMake/macros.cmake	2014-10-08 14:17:23.000000000 +0200
+@@ -65,9 +65,9 @@
+ 
+     install(TARGETS ${LIBRARY_NAME}
+         EXPORT FLTK-Targets
+-        RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
++        RUNTIME DESTINATION bin/fltk-devel
++        LIBRARY DESTINATION lib/fltk-devel
++        ARCHIVE DESTINATION lib/fltk-devel
+         )
+ 
+     list(APPEND FLTK_LIBRARIES "${LIBRARY_NAME}")

Property changes on: head/x11-toolkits/fltk-devel/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-devel/files/patch-CMake_setup.cmake
===================================================================
--- head/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake	(revision 370438)
+++ head/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake	(revision 370439)
@@ -1,15 +1,13 @@
---- CMake/setup.cmake.orig	2014-02-14 15:09:21.000000000 +0100
-+++ CMake/setup.cmake	2014-02-14 15:10:00.000000000 +0100
-@@ -56,6 +56,12 @@
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
- endif(APPLE)
+--- CMake/setup.cmake.orig	2014-10-08 14:16:19.000000000 +0200
++++ CMake/setup.cmake	2014-10-08 14:16:59.000000000 +0200
+@@ -58,8 +58,8 @@
+    set(FLTK_CONFIG_PATH FLTK/.framework/Resources/CMake)
+    set(FLTK_EXAMPLES_PATH share/fltk-examples)
+ else()
+-   set(FLTK_CONFIG_PATH lib/fltk)
+-   set(FLTK_EXAMPLES_PATH share/fltk-examples)
++   set(FLTK_CONFIG_PATH lib/fltk-devel)
++   set(FLTK_EXAMPLES_PATH share/examples/fltk-devel)
+ endif(WIN32 AND NOT CYGWIN)
  
-+if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
-+    set(HAVE_STRTOL 1)
-+    set(HAVE_STRCASECMP 1)
-+    set(HAVE_DIRENT_H 1)
-+endif()
-+
- if(WIN32)
-    if(MSVC)
-       add_definitions(-DWIN32_LEAN_AND_MEAN)
+ include(TestBigEndian)
Index: head/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt
===================================================================
--- head/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt	(nonexistent)
+++ head/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt	(revision 370439)
@@ -0,0 +1,11 @@
+--- fluid/CMakeLists.txt.orig	2014-10-08 14:22:45.000000000 +0200
++++ fluid/CMakeLists.txt	2014-10-08 14:23:33.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+ install(TARGETS fluid
+     EXPORT FLTK-Targets
+-    RUNTIME DESTINATION bin
++    RUNTIME DESTINATION bin/fltk-devel
+     LIBRARY DESTINATION lib
+     ARCHIVE DESTINATION lib
+     )

Property changes on: head/x11-toolkits/fltk-devel/files/patch-fluid_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-devel/pkg-plist
===================================================================
--- head/x11-toolkits/fltk-devel/pkg-plist	(revision 370438)
+++ head/x11-toolkits/fltk-devel/pkg-plist	(revision 370439)
@@ -1,179 +1,174 @@
 bin/fltk-devel/fltk-config
 bin/fltk-devel/fluid
 include/fltk-devel/FL/Enumerations.H
 include/fltk-devel/FL/Fl.H
 include/fltk-devel/FL/Fl_Adjuster.H
 include/fltk-devel/FL/Fl_BMP_Image.H
 include/fltk-devel/FL/Fl_Bitmap.H
 include/fltk-devel/FL/Fl_Box.H
 include/fltk-devel/FL/Fl_Browser.H
 include/fltk-devel/FL/Fl_Browser_.H
 include/fltk-devel/FL/Fl_Button.H
 include/fltk-devel/FL/Fl_Cairo.H
 include/fltk-devel/FL/Fl_Cairo_Window.H
 include/fltk-devel/FL/Fl_Chart.H
 include/fltk-devel/FL/Fl_Check_Browser.H
 include/fltk-devel/FL/Fl_Check_Button.H
 include/fltk-devel/FL/Fl_Choice.H
 include/fltk-devel/FL/Fl_Clock.H
 include/fltk-devel/FL/Fl_Color_Chooser.H
 include/fltk-devel/FL/Fl_Copy_Surface.H
 include/fltk-devel/FL/Fl_Counter.H
 include/fltk-devel/FL/Fl_Device.H
 include/fltk-devel/FL/Fl_Dial.H
 include/fltk-devel/FL/Fl_Double_Window.H
 include/fltk-devel/FL/Fl_Export.H
 include/fltk-devel/FL/Fl_File_Browser.H
 include/fltk-devel/FL/Fl_File_Chooser.H
 include/fltk-devel/FL/Fl_File_Icon.H
 include/fltk-devel/FL/Fl_File_Input.H
 include/fltk-devel/FL/Fl_Fill_Dial.H
 include/fltk-devel/FL/Fl_Fill_Slider.H
 include/fltk-devel/FL/Fl_Float_Input.H
 include/fltk-devel/FL/Fl_FormsBitmap.H
 include/fltk-devel/FL/Fl_FormsPixmap.H
 include/fltk-devel/FL/Fl_Free.H
 include/fltk-devel/FL/Fl_GIF_Image.H
 include/fltk-devel/FL/Fl_Gl_Window.H
 include/fltk-devel/FL/Fl_Group.H
 include/fltk-devel/FL/Fl_Help_Dialog.H
 include/fltk-devel/FL/Fl_Help_View.H
 include/fltk-devel/FL/Fl_Hold_Browser.H
 include/fltk-devel/FL/Fl_Hor_Fill_Slider.H
 include/fltk-devel/FL/Fl_Hor_Nice_Slider.H
 include/fltk-devel/FL/Fl_Hor_Slider.H
 include/fltk-devel/FL/Fl_Hor_Value_Slider.H
 include/fltk-devel/FL/Fl_Image.H
 include/fltk-devel/FL/Fl_Image_Surface.H
 include/fltk-devel/FL/Fl_Input.H
 include/fltk-devel/FL/Fl_Input_.H
 include/fltk-devel/FL/Fl_Input_Choice.H
 include/fltk-devel/FL/Fl_Int_Input.H
 include/fltk-devel/FL/Fl_JPEG_Image.H
 include/fltk-devel/FL/Fl_Light_Button.H
 include/fltk-devel/FL/Fl_Line_Dial.H
 include/fltk-devel/FL/Fl_Menu.H
 include/fltk-devel/FL/Fl_Menu_.H
 include/fltk-devel/FL/Fl_Menu_Bar.H
 include/fltk-devel/FL/Fl_Menu_Button.H
 include/fltk-devel/FL/Fl_Menu_Item.H
 include/fltk-devel/FL/Fl_Menu_Window.H
 include/fltk-devel/FL/Fl_Multi_Browser.H
 include/fltk-devel/FL/Fl_Multi_Label.H
 include/fltk-devel/FL/Fl_Multiline_Input.H
 include/fltk-devel/FL/Fl_Multiline_Output.H
 include/fltk-devel/FL/Fl_Native_File_Chooser.H
 include/fltk-devel/FL/Fl_Nice_Slider.H
 include/fltk-devel/FL/Fl_Object.H
 include/fltk-devel/FL/Fl_Output.H
 include/fltk-devel/FL/Fl_Overlay_Window.H
 include/fltk-devel/FL/Fl_PNG_Image.H
 include/fltk-devel/FL/Fl_PNM_Image.H
 include/fltk-devel/FL/Fl_Pack.H
 include/fltk-devel/FL/Fl_Paged_Device.H
 include/fltk-devel/FL/Fl_Pixmap.H
 include/fltk-devel/FL/Fl_Plugin.H
 include/fltk-devel/FL/Fl_Positioner.H
 include/fltk-devel/FL/Fl_PostScript.H
 include/fltk-devel/FL/Fl_Preferences.H
 include/fltk-devel/FL/Fl_Printer.H
 include/fltk-devel/FL/Fl_Progress.H
 include/fltk-devel/FL/Fl_RGB_Image.H
 include/fltk-devel/FL/Fl_Radio_Button.H
 include/fltk-devel/FL/Fl_Radio_Light_Button.H
 include/fltk-devel/FL/Fl_Radio_Round_Button.H
 include/fltk-devel/FL/Fl_Repeat_Button.H
 include/fltk-devel/FL/Fl_Return_Button.H
 include/fltk-devel/FL/Fl_Roller.H
 include/fltk-devel/FL/Fl_Round_Button.H
 include/fltk-devel/FL/Fl_Round_Clock.H
 include/fltk-devel/FL/Fl_Scroll.H
 include/fltk-devel/FL/Fl_Scrollbar.H
 include/fltk-devel/FL/Fl_Secret_Input.H
 include/fltk-devel/FL/Fl_Select_Browser.H
 include/fltk-devel/FL/Fl_Shared_Image.H
 include/fltk-devel/FL/Fl_Simple_Counter.H
 include/fltk-devel/FL/Fl_Single_Window.H
 include/fltk-devel/FL/Fl_Slider.H
 include/fltk-devel/FL/Fl_Spinner.H
 include/fltk-devel/FL/Fl_Sys_Menu_Bar.H
 include/fltk-devel/FL/Fl_Table.H
 include/fltk-devel/FL/Fl_Table_Row.H
 include/fltk-devel/FL/Fl_Tabs.H
 include/fltk-devel/FL/Fl_Text_Buffer.H
 include/fltk-devel/FL/Fl_Text_Display.H
 include/fltk-devel/FL/Fl_Text_Editor.H
 include/fltk-devel/FL/Fl_Tile.H
 include/fltk-devel/FL/Fl_Tiled_Image.H
 include/fltk-devel/FL/Fl_Timer.H
 include/fltk-devel/FL/Fl_Toggle_Button.H
 include/fltk-devel/FL/Fl_Toggle_Light_Button.H
 include/fltk-devel/FL/Fl_Toggle_Round_Button.H
 include/fltk-devel/FL/Fl_Tooltip.H
 include/fltk-devel/FL/Fl_Tree.H
 include/fltk-devel/FL/Fl_Tree_Item.H
 include/fltk-devel/FL/Fl_Tree_Item_Array.H
 include/fltk-devel/FL/Fl_Tree_Prefs.H
 include/fltk-devel/FL/Fl_Valuator.H
 include/fltk-devel/FL/Fl_Value_Input.H
 include/fltk-devel/FL/Fl_Value_Output.H
 include/fltk-devel/FL/Fl_Value_Slider.H
 include/fltk-devel/FL/Fl_Widget.H
 include/fltk-devel/FL/Fl_Window.H
 include/fltk-devel/FL/Fl_Wizard.H
 include/fltk-devel/FL/Fl_XBM_Image.H
 include/fltk-devel/FL/Fl_XPM_Image.H
 include/fltk-devel/FL/Makefile.in
 include/fltk-devel/FL/README.Xcode
 include/fltk-devel/FL/dirent.h
 include/fltk-devel/FL/filename.H
 include/fltk-devel/FL/fl_ask.H
 include/fltk-devel/FL/fl_draw.H
 include/fltk-devel/FL/fl_message.H
 include/fltk-devel/FL/fl_show_colormap.H
 include/fltk-devel/FL/fl_show_input.H
 include/fltk-devel/FL/fl_types.h
 include/fltk-devel/FL/fl_utf8.h
 include/fltk-devel/FL/forms.H
 include/fltk-devel/FL/gl.h
 include/fltk-devel/FL/gl2opengl.h
 include/fltk-devel/FL/gl_draw.H
 include/fltk-devel/FL/glu.h
 include/fltk-devel/FL/glut.H
 include/fltk-devel/FL/mac.H
 include/fltk-devel/FL/math.h
 include/fltk-devel/FL/names.h
 include/fltk-devel/FL/win32.H
 include/fltk-devel/FL/x.H
-lib/FLTK-1.3/FLTKConfig.cmake
-lib/FLTK-1.3/FLTKLibraries-%%CMAKE_BUILD_TYPE%%.cmake
-lib/FLTK-1.3/FLTKLibraries.cmake
-lib/FLTK-1.3/UseFLTK.cmake
+lib/fltk-devel/FLTK-Targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/fltk-devel/FLTK-Targets.cmake
+lib/fltk-devel/FLTKConfig.cmake
+lib/fltk-devel/UseFLTK.cmake
 lib/fltk-devel/libfltk.a
 lib/fltk-devel/libfltk.so
 lib/fltk-devel/libfltk.so.1.3
-lib/fltk-devel/libfltk.so.2
+lib/fltk-devel/libfltk.so.1.3.2
 lib/fltk-devel/libfltk_forms.a
 lib/fltk-devel/libfltk_forms.so
 lib/fltk-devel/libfltk_forms.so.1.3
-lib/fltk-devel/libfltk_forms.so.2
+lib/fltk-devel/libfltk_forms.so.1.3.2
 lib/fltk-devel/libfltk_gl.a
 lib/fltk-devel/libfltk_gl.so
 lib/fltk-devel/libfltk_gl.so.1.3
-lib/fltk-devel/libfltk_gl.so.2
+lib/fltk-devel/libfltk_gl.so.1.3.2
 lib/fltk-devel/libfltk_images.a
 lib/fltk-devel/libfltk_images.so
 lib/fltk-devel/libfltk_images.so.1.3
-lib/fltk-devel/libfltk_images.so.2
+lib/fltk-devel/libfltk_images.so.1.3.2
 lib/libfltk-devel.so
 man/man1/fltk-config-devel.1.gz
 man/man1/fluid-devel.1.gz
 man/man3/fltk-devel.3.gz
 man/man6/blocks-devel.6.gz
 man/man6/checkers-devel.6.gz
 man/man6/sudoku-devel.6.gz
-@dirrm lib/fltk-devel
-@dirrm lib/FLTK-1.3
-@dirrm include/fltk-devel/FL
-@dirrm include/fltk-devel
-@dirrm bin/fltk-devel