diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index 202e808982e6..564742540d47 100644 --- a/graphics/exiv2/Makefile +++ b/graphics/exiv2/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= exiv2 -DISTVERSION= 0.26 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -trunk +DISTVERSION= 0.27.0 +DISTVERSIONSUFFIX= a-Source PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.exiv2.org/builds/ @@ -23,12 +22,17 @@ USE_LDCONFIG= yes LDFLAGS+= -lintl CMAKE_ON= EXIV2_ENABLE_VIDEO \ - EXIV2_ENABLE_BUILD_PO -CMAKE_OFF= EXIV2_ENABLE_BUILD_SAMPLES \ - EXIV2_ENABLE_LIBXMP + EXIV2_BUILD_PO +CMAKE_OFF= EXIV2_ENABLE_LIBXMP + +OPTIONS_DEFINE= SAMPLE +OPTIONS_SUB= yes + +SAMPLE_DESC= Include samle applications +SAMPLE_CMAKE_BOOL= EXIV2_BUILD_SAMPLES PATHFIX_CMAKELISTSTXT= CMakeChecks.txt -WRKSRC= ${WRKDIR}/${PORTNAME}-trunk +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source .include diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo index fdbd47483a83..aa82b1230a3f 100644 --- a/graphics/exiv2/distinfo +++ b/graphics/exiv2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523892704 -SHA256 (exiv2-0.26-trunk.tar.gz) = c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb -SIZE (exiv2-0.26-trunk.tar.gz) = 5677925 +TIMESTAMP = 1550640374 +SHA256 (exiv2-0.27.0a-Source.tar.gz) = a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f +SIZE (exiv2-0.27.0a-Source.tar.gz) = 27168207 diff --git a/graphics/exiv2/files/patch-src_CMakeLists.txt b/graphics/exiv2/files/patch-src_CMakeLists.txt deleted file mode 100644 index e6156750e053..000000000000 --- a/graphics/exiv2/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -FreeBSD does hat have -ldl. - -Instead of unconditionally passing 'dl' to the linker, use cmakes 'CMAKE_DL_LIBS' [1] -which handles that properly on all systems. - -[1] https://cmake.org/cmake/help/v3.6/variable/CMAKE_DL_LIBS.html - ---- src/CMakeLists.txt.orig 2017-03-27 09:04:12 UTC -+++ src/CMakeLists.txt -@@ -265,9 +265,9 @@ if ( MSVC ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} ) - else() - if ( UNIX AND NOT FREEBSD ) -- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} ) -- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} ) -- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${EXPAT_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${CURL_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${SSH_LIBRARIES} ) - else() - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} ) diff --git a/graphics/exiv2/files/patch-src_actions.cpp b/graphics/exiv2/files/patch-src_actions.cpp deleted file mode 100644 index 8d9505285216..000000000000 --- a/graphics/exiv2/files/patch-src_actions.cpp +++ /dev/null @@ -1,16 +0,0 @@ -FreeBSD does not know either -* PTHREAD_RECURSIVE_MUTEX_INITIALIZER nor -* PTHREAD_RECUSRIVE_MUTEX_INITIALIZER_NP - - ---- src/actions.cpp.orig 2017-03-08 20:42:28 UTC -+++ src/actions.cpp -@@ -2048,6 +2048,8 @@ namespace { - #if defined(__APPLE__) - /* This is the critical section object (statically allocated). */ - static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; -+ #elif defined(__FreeBSD__) -+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; - #else - static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - #endif diff --git a/graphics/exiv2/pkg-plist b/graphics/exiv2/pkg-plist index f8ca94c94661..b34eb5e13a7d 100644 --- a/graphics/exiv2/pkg-plist +++ b/graphics/exiv2/pkg-plist @@ -1,6 +1,40 @@ +%%SAMPLE%%bin/addmoddel +%%SAMPLE%%bin/convert-test +%%SAMPLE%%bin/easyaccess-test +%%SAMPLE%%bin/exifcomment +%%SAMPLE%%bin/exifdata +%%SAMPLE%%bin/exifdata-test +%%SAMPLE%%bin/exifprint +%%SAMPLE%%bin/exifvalue bin/exiv2 +%%SAMPLE%%bin/exiv2json +%%SAMPLE%%bin/geotag +%%SAMPLE%%bin/ini-test +%%SAMPLE%%bin/iotest +%%SAMPLE%%bin/iptceasy +%%SAMPLE%%bin/iptcprint +%%SAMPLE%%bin/iptctest +%%SAMPLE%%bin/key-test +%%SAMPLE%%bin/largeiptc-test +%%SAMPLE%%bin/metacopy +%%SAMPLE%%bin/mmap-test +%%SAMPLE%%bin/mrwthumb +%%SAMPLE%%bin/path-test +%%SAMPLE%%bin/prevtest +%%SAMPLE%%bin/stringto-test +%%SAMPLE%%bin/taglist +%%SAMPLE%%bin/tiff-test +%%SAMPLE%%bin/werror-test +%%SAMPLE%%bin/write-test +%%SAMPLE%%bin/write2-test +%%SAMPLE%%bin/xmpdump +%%SAMPLE%%bin/xmpparse +%%SAMPLE%%bin/xmpparser-test +%%SAMPLE%%bin/xmpprint +%%SAMPLE%%bin/xmpsample include/exiv2/asfvideo.hpp include/exiv2/basicio.hpp +include/exiv2/bigtiffimage.hpp include/exiv2/bmpimage.hpp include/exiv2/config.h include/exiv2/convert.hpp @@ -12,6 +46,7 @@ include/exiv2/epsimage.hpp include/exiv2/error.hpp include/exiv2/exif.hpp include/exiv2/exiv2.hpp +include/exiv2/exiv2lib_export.h include/exiv2/exv_conf.h include/exiv2/futils.hpp include/exiv2/gifimage.hpp @@ -35,7 +70,8 @@ include/exiv2/rafimage.hpp include/exiv2/riffvideo.hpp include/exiv2/rw2image.hpp include/exiv2/rwlock.hpp -include/exiv2/svn_version.h +include/exiv2/slice.hpp +include/exiv2/ssh.hpp include/exiv2/tags.hpp include/exiv2/tgaimage.hpp include/exiv2/tiffimage.hpp @@ -44,15 +80,19 @@ include/exiv2/utilsvideo.hpp include/exiv2/value.hpp include/exiv2/version.hpp include/exiv2/webpimage.hpp -include/exiv2/xmp.hpp +include/exiv2/xmp_exiv2.hpp include/exiv2/xmpsidecar.hpp lib/libexiv2.so -lib/libexiv2.so.26 -lib/libexiv2.so.26.0.0 -libdata/pkgconfig/exiv2.lsm +lib/libexiv2.so.0.27.0 +lib/libexiv2.so.27 +lib/libxmp.a libdata/pkgconfig/exiv2.pc man/man1/exiv2.1.gz +%%SAMPLE%%man/man1/exiv2samples.1.gz +%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake +%%DATADIR%%/cmake/exiv2Config.cmake share/locale/bs/LC_MESSAGES/exiv2.mo +share/locale/ca/LC_MESSAGES/exiv2.mo share/locale/de/LC_MESSAGES/exiv2.mo share/locale/es/LC_MESSAGES/exiv2.mo share/locale/fi/LC_MESSAGES/exiv2.mo