diff options
author | Pietro Cerutti <gahr@FreeBSD.org> | 2014-02-14 14:28:54 +0000 |
---|---|---|
committer | Pietro Cerutti <gahr@FreeBSD.org> | 2014-02-14 14:28:54 +0000 |
commit | daf10095aab8e826b68d0a20f8acdd9bae1fb648 (patch) | |
tree | b1d14ebca4b81ecb0364ea6880af7b179555f236 /x11-toolkits/fltk-devel | |
parent | - STAGE-clean (diff) |
- Update to snapshot 10102
Notes
Notes:
svn path=/head/; revision=344210
Diffstat (limited to 'x11-toolkits/fltk-devel')
-rw-r--r-- | x11-toolkits/fltk-devel/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/fltk-devel/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/fltk-devel/files/patch-CMakeLists.txt | 33 | ||||
-rw-r--r-- | x11-toolkits/fltk-devel/files/patch-CMake_install.cmake | 11 | ||||
-rw-r--r-- | x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake | 15 | ||||
-rw-r--r-- | x11-toolkits/fltk-devel/pkg-plist | 10 |
6 files changed, 35 insertions, 42 deletions
diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile index 22f33406152c..8307df25cb81 100644 --- a/x11-toolkits/fltk-devel/Makefile +++ b/x11-toolkits/fltk-devel/Makefile @@ -30,7 +30,7 @@ CMAKE_ARGS+= -DOPTION_BUILD_SHARED_LIBS:BOOL=ON \ -DOPTION_PREFIX_INCLUDE:PATH=${PREFIX}/include/fltk-devel \ -DOPTION_PREFIX_LIB:PATH=${PREFIX}/lib/fltk-devel -SNAPSHOT_VERS= 10022 +SNAPSHOT_VERS= 10102 PORTEXAMPLES= * EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX} @@ -45,6 +45,6 @@ CMAKE_ARGS+= -DOPTION_BUILD_EXAMPLES:BOOL=OFF .endif post-install: - ${LN} -s fltk-devel/libfltk.so ${STAGEDIR}${PREFIX}/lib/libfltk-devel.so + ${LN} -sf fltk-devel/libfltk.so ${STAGEDIR}${PREFIX}/lib/libfltk-devel.so .include <bsd.port.mk> diff --git a/x11-toolkits/fltk-devel/distinfo b/x11-toolkits/fltk-devel/distinfo index 3189d40850d6..6e3f697b1d94 100644 --- a/x11-toolkits/fltk-devel/distinfo +++ b/x11-toolkits/fltk-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (fltk-1.3.x-r10022.tar.gz) = c60fdd9085ccbb811437e9e0412e3acc3afd23fe110bb34cf7bed1aecd238aeb -SIZE (fltk-1.3.x-r10022.tar.gz) = 4354986 +SHA256 (fltk-1.3.x-r10102.tar.gz) = 56c636d2786f8518ae99dccf1316fdb3480de03f9d0f8e7a370d5e4221db5a72 +SIZE (fltk-1.3.x-r10102.tar.gz) = 4445755 diff --git a/x11-toolkits/fltk-devel/files/patch-CMakeLists.txt b/x11-toolkits/fltk-devel/files/patch-CMakeLists.txt deleted file mode 100644 index 733734d4260e..000000000000 --- a/x11-toolkits/fltk-devel/files/patch-CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- CMakeLists.txt.orig 2013-09-11 15:54:40.000000000 +0300 -+++ CMakeLists.txt 2013-12-23 19:35:33.000000000 +0200 -@@ -54,6 +54,12 @@ - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") - endif(APPLE) - -+if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD) -+ set(HAVE_STRTOLL 1) -+ set(HAVE_STRCASECMP 1) -+ set(HAVE_DIRENT_H 1) -+endif() -+ - if(WIN32) - if(MSVC) - add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -129,7 +135,7 @@ - mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H) - - # where to find freetype headers --find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2) -+find_path(FREETYPE_PATH config/ftheader.h PATH_SUFFIXES freetype2) - if(FREETYPE_PATH) - include_directories(${FREETYPE_PATH}) - endif(FREETYPE_PATH) -@@ -681,7 +687,7 @@ - install(FILES - ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man - DESTINATION ${PREFIX_MAN}/man${LEVEL} -- RENAME ${FILE}.${LEVEL} -+ RENAME ${FILE}-devel.${LEVEL} - ) - endmacro(INSTALL_MAN FILE LEVEL) - diff --git a/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake b/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake new file mode 100644 index 000000000000..890bebe72368 --- /dev/null +++ b/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake @@ -0,0 +1,11 @@ +--- 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 @@ + install(FILES + ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man + DESTINATION ${PREFIX_MAN}/man${LEVEL} +- RENAME ${FILE}.${LEVEL} ++ RENAME ${FILE}-devel.${LEVEL} + ) + endmacro(INSTALL_MAN FILE LEVEL) + diff --git a/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake b/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake new file mode 100644 index 000000000000..295e93a0e435 --- /dev/null +++ b/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake @@ -0,0 +1,15 @@ +--- 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) + ++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) diff --git a/x11-toolkits/fltk-devel/pkg-plist b/x11-toolkits/fltk-devel/pkg-plist index 5dfa56f2a3af..e1414d0dc009 100644 --- a/x11-toolkits/fltk-devel/pkg-plist +++ b/x11-toolkits/fltk-devel/pkg-plist @@ -148,23 +148,23 @@ 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/libfltk-devel.so lib/fltk-devel/libfltk.a lib/fltk-devel/libfltk.so -lib/fltk-devel/libfltk.so.0 lib/fltk-devel/libfltk.so.1.3 +lib/fltk-devel/libfltk.so.2 lib/fltk-devel/libfltk_forms.a lib/fltk-devel/libfltk_forms.so -lib/fltk-devel/libfltk_forms.so.0 lib/fltk-devel/libfltk_forms.so.1.3 +lib/fltk-devel/libfltk_forms.so.2 lib/fltk-devel/libfltk_gl.a lib/fltk-devel/libfltk_gl.so -lib/fltk-devel/libfltk_gl.so.0 lib/fltk-devel/libfltk_gl.so.1.3 +lib/fltk-devel/libfltk_gl.so.2 lib/fltk-devel/libfltk_images.a lib/fltk-devel/libfltk_images.so -lib/fltk-devel/libfltk_images.so.0 lib/fltk-devel/libfltk_images.so.1.3 +lib/fltk-devel/libfltk_images.so.2 +lib/libfltk-devel.so man/man1/fltk-config-devel.1.gz man/man1/fluid-devel.1.gz man/man3/fltk-devel.3.gz |