svn commit: r370439 - in head/x11-toolkits/fltk-devel: . files
Pietro Cerutti
gahr at FreeBSD.org
Wed Oct 8 12:55:41 UTC 2014
Author: gahr
Date: Wed Oct 8 12:55:38 2014
New Revision: 370439
URL: https://svnweb.freebsd.org/changeset/ports/370439
QAT: https://qat.redports.org/buildarchive/r370439/
Log:
- Update to snapshot 10350
* Release notes: http://www.fltk.org/articles.php?L1387
Added:
head/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake (contents, props changed)
head/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt (contents, props changed)
Modified:
head/x11-toolkits/fltk-devel/Makefile
head/x11-toolkits/fltk-devel/distinfo
head/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake
head/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake
head/x11-toolkits/fltk-devel/pkg-plist
Modified: head/x11-toolkits/fltk-devel/Makefile
==============================================================================
--- head/x11-toolkits/fltk-devel/Makefile Wed Oct 8 12:44:28 2014 (r370438)
+++ head/x11-toolkits/fltk-devel/Makefile Wed Oct 8 12:55:38 2014 (r370439)
@@ -27,20 +27,21 @@ 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>
Modified: head/x11-toolkits/fltk-devel/distinfo
==============================================================================
--- head/x11-toolkits/fltk-devel/distinfo Wed Oct 8 12:44:28 2014 (r370438)
+++ head/x11-toolkits/fltk-devel/distinfo Wed Oct 8 12:55:38 2014 (r370439)
@@ -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
Modified: head/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake
==============================================================================
--- head/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake Wed Oct 8 12:44:28 2014 (r370438)
+++ head/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake Wed Oct 8 12:55:38 2014 (r370439)
@@ -1,9 +1,18 @@
---- 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}
)
Added: head/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake Wed Oct 8 12:55:38 2014 (r370439)
@@ -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}")
Modified: head/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake
==============================================================================
--- head/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake Wed Oct 8 12:44:28 2014 (r370438)
+++ head/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake Wed Oct 8 12:55:38 2014 (r370439)
@@ -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)
Added: head/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt Wed Oct 8 12:55:38 2014 (r370439)
@@ -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
+ )
Modified: head/x11-toolkits/fltk-devel/pkg-plist
==============================================================================
--- head/x11-toolkits/fltk-devel/pkg-plist Wed Oct 8 12:44:28 2014 (r370438)
+++ head/x11-toolkits/fltk-devel/pkg-plist Wed Oct 8 12:55:38 2014 (r370439)
@@ -145,26 +145,26 @@ 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
@@ -172,8 +172,3 @@ man/man3/fltk-devel.3.gz
man/man6/blocks-devel.6.gz
man/man6/checkers-devel.6.gz
man/man6/sudoku-devel.6.gz
- at dirrm lib/fltk-devel
- at dirrm lib/FLTK-1.3
- at dirrm include/fltk-devel/FL
- at dirrm include/fltk-devel
- at dirrm bin/fltk-devel
More information about the svn-ports-all
mailing list