Attachment #202269 for bug #235943

Lines 2-10 Link Here

(-)Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= exiv2	4	PORTNAME= exiv2
5	DISTVERSION= 0.26	5	DISTVERSION= 0.27.0
6	PORTREVISION= 1	6	DISTVERSIONSUFFIX= a-Source
7	DISTVERSIONSUFFIX= -trunk
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= graphics	8	CATEGORIES= graphics
10	MASTER_SITES= http://www.exiv2.org/builds/	9	MASTER_SITES= http://www.exiv2.org/builds/
Lines 29-34 Link Here
29		28
30	PATHFIX_CMAKELISTSTXT= CMakeChecks.txt	29	PATHFIX_CMAKELISTSTXT= CMakeChecks.txt
31		30
32	WRKSRC= ${WRKDIR}/${PORTNAME}-trunk	31	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source
33		32
34	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1523892704	1	TIMESTAMP = 1550859075
2	SHA256 (exiv2-0.26-trunk.tar.gz) = c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb	2	SHA256 (exiv2-0.27.0a-Source.tar.gz) = a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f
3	SIZE (exiv2-0.26-trunk.tar.gz) = 5677925	3	SIZE (exiv2-0.27.0a-Source.tar.gz) = 27168207




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} )




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




bin/exiv2
bin/addmoddel
bin/convert-test
bin/easyaccess-test
bin/exifcomment
bin/exifdata
bin/exifdata-test
bin/exifprint
bin/exifvalue
bin/exiv2json
bin/geotag
bin/ini-test
bin/iotest
bin/iptceasy
bin/iptcprint
bin/iptctest
bin/key-test
bin/largeiptc-test
bin/metacopy
bin/mmap-test
bin/mrwthumb
bin/path-test
bin/prevtest
bin/stringto-test
bin/taglist
bin/tiff-test
bin/werror-test
bin/write-test
bin/write2-test
bin/xmpdump
bin/xmpparse
bin/xmpparser-test
bin/xmpprint
bin/xmpsample
include/exiv2/bigtiffimage.hpp
include/exiv2/exiv2lib_export.h
include/exiv2/slice.hpp
include/exiv2/ssh.hpp
include/exiv2/xmp_exiv2.hpp
include/exiv2/asfvideo.hpp
include/exiv2/basicio.hpp
include/exiv2/bmpimage.hpp

include/exiv2/riffvideo.hpp
include/exiv2/rw2image.hpp
include/exiv2/rwlock.hpp
include/exiv2/svn_version.h
include/exiv2/tags.hpp
include/exiv2/tgaimage.hpp
include/exiv2/tiffimage.hpp

include/exiv2/value.hpp
include/exiv2/version.hpp
include/exiv2/webpimage.hpp
include/exiv2/xmp.hpp
include/exiv2/xmpsidecar.hpp
lib/libexiv2.so
lib/libexiv2.so.0.27.0
lib/libexiv2.so.27
lib/libxmp.a
libdata/pkgconfig/exiv2.pc
man/man1/exiv2.1.gz
man/man1/exiv2samples.1.gz
%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/cmake/exiv2Config.cmake
share/locale/fi/LC_MESSAGES/exiv2.mo
share/locale/fr/LC_MESSAGES/exiv2.mo
share/locale/gl/LC_MESSAGES/exiv2.mo
share/locale/ms/LC_MESSAGES/exiv2.mo
share/locale/pl/LC_MESSAGES/exiv2.mo
share/locale/pt/LC_MESSAGES/exiv2.mo
share/locale/ru/LC_MESSAGES/exiv2.mo
share/locale/sk/LC_MESSAGES/exiv2.mo
share/locale/sv/LC_MESSAGES/exiv2.mo
share/locale/ug/LC_MESSAGES/exiv2.mo
share/locale/uk/LC_MESSAGES/exiv2.mo
share/locale/vi/LC_MESSAGES/exiv2.mo

Return to bug 235943

Lines 1-22 Link Here

(-)files/patch-src_CMakeLists.txt (-22 lines)
1	FreeBSD does hat have -ldl.
2
3	Instead of unconditionally passing 'dl' to the linker, use cmakes 'CMAKE_DL_LIBS' [1]
4	which handles that properly on all systems.
5
6	[1] https://cmake.org/cmake/help/v3.6/variable/CMAKE_DL_LIBS.html
7
8	--- src/CMakeLists.txt.orig 2017-03-27 09:04:12 UTC
9	+++ src/CMakeLists.txt
10	@@ -265,9 +265,9 @@ if ( MSVC )
11	TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
12	else()
13	if ( UNIX AND NOT FREEBSD )
14	- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} )
15	- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} )
16	- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} )
17	+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${EXPAT_LIBRARIES} )
18	+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${CURL_LIBRARIES} )
19	+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${SSH_LIBRARIES} )
20	else()
21	TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )
22	TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} )

Lines 1-16 Link Here

(-)files/patch-src_actions.cpp (-16 lines)
1	FreeBSD does not know either
2	* PTHREAD_RECURSIVE_MUTEX_INITIALIZER nor
3	* PTHREAD_RECUSRIVE_MUTEX_INITIALIZER_NP
4
5
6	--- src/actions.cpp.orig 2017-03-08 20:42:28 UTC
7	+++ src/actions.cpp
8	@@ -2048,6 +2048,8 @@ namespace {
9	#if defined(__APPLE__)
10	/* This is the critical section object (statically allocated). */
11	static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
12	+ #elif defined(__FreeBSD__)
13	+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER;
14	#else
15	static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
16	#endif

Lines 1-4 Link Here

(-)pkg-plist (-20 / +44 lines)
1	bin/exiv2	1	bin/exiv2
		2	bin/addmoddel
		3	bin/convert-test
		4	bin/easyaccess-test
		5	bin/exifcomment
		6	bin/exifdata
		7	bin/exifdata-test
		8	bin/exifprint
		9	bin/exifvalue
		10	bin/exiv2json
		11	bin/geotag
		12	bin/ini-test
		13	bin/iotest
		14	bin/iptceasy
		15	bin/iptcprint
		16	bin/iptctest
		17	bin/key-test
		18	bin/largeiptc-test
		19	bin/metacopy
		20	bin/mmap-test
		21	bin/mrwthumb
		22	bin/path-test
		23	bin/prevtest
		24	bin/stringto-test
		25	bin/taglist
		26	bin/tiff-test
		27	bin/werror-test
		28	bin/write-test
		29	bin/write2-test
		30	bin/xmpdump
		31	bin/xmpparse
		32	bin/xmpparser-test
		33	bin/xmpprint
		34	bin/xmpsample
		35	include/exiv2/bigtiffimage.hpp
		36	include/exiv2/exiv2lib_export.h
		37	include/exiv2/slice.hpp
		38	include/exiv2/ssh.hpp
		39	include/exiv2/xmp_exiv2.hpp
2	include/exiv2/asfvideo.hpp	40	include/exiv2/asfvideo.hpp
3	include/exiv2/basicio.hpp	41	include/exiv2/basicio.hpp
4	include/exiv2/bmpimage.hpp	42	include/exiv2/bmpimage.hpp
Lines 35-41 Link Here
35	include/exiv2/riffvideo.hpp	73	include/exiv2/riffvideo.hpp
36	include/exiv2/rw2image.hpp	74	include/exiv2/rw2image.hpp
37	include/exiv2/rwlock.hpp	75	include/exiv2/rwlock.hpp
38	include/exiv2/svn_version.h
39	include/exiv2/tags.hpp	76	include/exiv2/tags.hpp
40	include/exiv2/tgaimage.hpp	77	include/exiv2/tgaimage.hpp
41	include/exiv2/tiffimage.hpp	78	include/exiv2/tiffimage.hpp
Lines 44-69 Link Here
44	include/exiv2/value.hpp	81	include/exiv2/value.hpp
45	include/exiv2/version.hpp	82	include/exiv2/version.hpp
46	include/exiv2/webpimage.hpp	83	include/exiv2/webpimage.hpp
47	include/exiv2/xmp.hpp
48	include/exiv2/xmpsidecar.hpp	84	include/exiv2/xmpsidecar.hpp
49	lib/libexiv2.so	85	lib/libexiv2.so
50	lib/libexiv2.so.26	86	lib/libexiv2.so.0.27.0
51	lib/libexiv2.so.26.0.0	87	lib/libexiv2.so.27
52	libdata/pkgconfig/exiv2.lsm	88	lib/libxmp.a
53	libdata/pkgconfig/exiv2.pc	89	libdata/pkgconfig/exiv2.pc
54	man/man1/exiv2.1.gz	90	man/man1/exiv2.1.gz
55	share/locale/bs/LC_MESSAGES/exiv2.mo	91	man/man1/exiv2samples.1.gz
56	share/locale/de/LC_MESSAGES/exiv2.mo	92	%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
57	share/locale/es/LC_MESSAGES/exiv2.mo	93	%%DATADIR%%/cmake/exiv2Config.cmake
58	share/locale/fi/LC_MESSAGES/exiv2.mo
59	share/locale/fr/LC_MESSAGES/exiv2.mo
60	share/locale/gl/LC_MESSAGES/exiv2.mo
61	share/locale/ms/LC_MESSAGES/exiv2.mo
62	share/locale/pl/LC_MESSAGES/exiv2.mo
63	share/locale/pt/LC_MESSAGES/exiv2.mo
64	share/locale/ru/LC_MESSAGES/exiv2.mo
65	share/locale/sk/LC_MESSAGES/exiv2.mo
66	share/locale/sv/LC_MESSAGES/exiv2.mo
67	share/locale/ug/LC_MESSAGES/exiv2.mo
68	share/locale/uk/LC_MESSAGES/exiv2.mo
69	share/locale/vi/LC_MESSAGES/exiv2.mo