Attachment #202335 for bug #235943




# $FreeBSD$

PORTNAME=	exiv2
DISTVERSION=	0.27.0
DISTVERSIONSUFFIX=	a-Source
DISTVERSIONSUFFIX=	-trunk
PORTEPOCH=	1
CATEGORIES=	graphics
MASTER_SITES=	http://www.exiv2.org/builds/

LDFLAGS+=	-lintl

CMAKE_ON=	EXIV2_ENABLE_VIDEO \
		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}-${PORTVERSION}-Source

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/graphics/exiv2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1523892704	1	TIMESTAMP = 1550640374
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




%%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

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

include/exiv2/riffvideo.hpp
include/exiv2/rw2image.hpp
include/exiv2/rwlock.hpp
include/exiv2/slice.hpp
include/exiv2/ssh.hpp
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_exiv2.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
%%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

Return to bug 235943

Lines 2-10 Link Here

(-)b/graphics/exiv2/Makefile (-7 / +11 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 23-34 USE_LDCONFIG= yes Link Here
23	LDFLAGS+= -lintl	22	LDFLAGS+= -lintl
24		23
25	CMAKE_ON= EXIV2_ENABLE_VIDEO \	24	CMAKE_ON= EXIV2_ENABLE_VIDEO \
26	EXIV2_ENABLE_BUILD_PO	25	EXIV2_BUILD_PO
27	CMAKE_OFF= EXIV2_ENABLE_BUILD_SAMPLES \	26	CMAKE_OFF= EXIV2_ENABLE_LIBXMP
28	EXIV2_ENABLE_LIBXMP	27
		28	OPTIONS_DEFINE= SAMPLE
		29	OPTIONS_SUB= yes
		30
		31	SAMPLE_DESC= Include samle applications
		32	SAMPLE_CMAKE_BOOL= EXIV2_BUILD_SAMPLES
29		33
30	PATHFIX_CMAKELISTSTXT= CMakeChecks.txt	34	PATHFIX_CMAKELISTSTXT= CMakeChecks.txt
31		35
32	WRKSRC= ${WRKDIR}/${PORTNAME}-trunk	36	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source
33		37
34	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Removed Link Here

(-)a/graphics/exiv2/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} )

Removed Link Here

(-)a/graphics/exiv2/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-6 Link Here

(-)b/graphics/exiv2/pkg-plist (-5 / +45 lines)
		1	%%SAMPLE%%bin/addmoddel
		2	%%SAMPLE%%bin/convert-test
		3	%%SAMPLE%%bin/easyaccess-test
		4	%%SAMPLE%%bin/exifcomment
		5	%%SAMPLE%%bin/exifdata
		6	%%SAMPLE%%bin/exifdata-test
		7	%%SAMPLE%%bin/exifprint
		8	%%SAMPLE%%bin/exifvalue
1	bin/exiv2	9	bin/exiv2
		10	%%SAMPLE%%bin/exiv2json
		11	%%SAMPLE%%bin/geotag
		12	%%SAMPLE%%bin/ini-test
		13	%%SAMPLE%%bin/iotest
		14	%%SAMPLE%%bin/iptceasy
		15	%%SAMPLE%%bin/iptcprint
		16	%%SAMPLE%%bin/iptctest
		17	%%SAMPLE%%bin/key-test
		18	%%SAMPLE%%bin/largeiptc-test
		19	%%SAMPLE%%bin/metacopy
		20	%%SAMPLE%%bin/mmap-test
		21	%%SAMPLE%%bin/mrwthumb
		22	%%SAMPLE%%bin/path-test
		23	%%SAMPLE%%bin/prevtest
		24	%%SAMPLE%%bin/stringto-test
		25	%%SAMPLE%%bin/taglist
		26	%%SAMPLE%%bin/tiff-test
		27	%%SAMPLE%%bin/werror-test
		28	%%SAMPLE%%bin/write-test
		29	%%SAMPLE%%bin/write2-test
		30	%%SAMPLE%%bin/xmpdump
		31	%%SAMPLE%%bin/xmpparse
		32	%%SAMPLE%%bin/xmpparser-test
		33	%%SAMPLE%%bin/xmpprint
		34	%%SAMPLE%%bin/xmpsample
2	include/exiv2/asfvideo.hpp	35	include/exiv2/asfvideo.hpp
3	include/exiv2/basicio.hpp	36	include/exiv2/basicio.hpp
		37	include/exiv2/bigtiffimage.hpp
4	include/exiv2/bmpimage.hpp	38	include/exiv2/bmpimage.hpp
5	include/exiv2/config.h	39	include/exiv2/config.h
6	include/exiv2/convert.hpp	40	include/exiv2/convert.hpp
Lines 12-17 include/exiv2/epsimage.hpp Link Here
12	include/exiv2/error.hpp	46	include/exiv2/error.hpp
13	include/exiv2/exif.hpp	47	include/exiv2/exif.hpp
14	include/exiv2/exiv2.hpp	48	include/exiv2/exiv2.hpp
		49	include/exiv2/exiv2lib_export.h
15	include/exiv2/exv_conf.h	50	include/exiv2/exv_conf.h
16	include/exiv2/futils.hpp	51	include/exiv2/futils.hpp
17	include/exiv2/gifimage.hpp	52	include/exiv2/gifimage.hpp
Lines 35-41 include/exiv2/rafimage.hpp Link Here
35	include/exiv2/riffvideo.hpp	70	include/exiv2/riffvideo.hpp
36	include/exiv2/rw2image.hpp	71	include/exiv2/rw2image.hpp
37	include/exiv2/rwlock.hpp	72	include/exiv2/rwlock.hpp
38	include/exiv2/svn_version.h	73	include/exiv2/slice.hpp
		74	include/exiv2/ssh.hpp
39	include/exiv2/tags.hpp	75	include/exiv2/tags.hpp
40	include/exiv2/tgaimage.hpp	76	include/exiv2/tgaimage.hpp
41	include/exiv2/tiffimage.hpp	77	include/exiv2/tiffimage.hpp
Lines 44-58 include/exiv2/utilsvideo.hpp Link Here
44	include/exiv2/value.hpp	80	include/exiv2/value.hpp
45	include/exiv2/version.hpp	81	include/exiv2/version.hpp
46	include/exiv2/webpimage.hpp	82	include/exiv2/webpimage.hpp
47	include/exiv2/xmp.hpp	83	include/exiv2/xmp_exiv2.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
		91	%%SAMPLE%%man/man1/exiv2samples.1.gz
		92	%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
		93	%%DATADIR%%/cmake/exiv2Config.cmake
55	share/locale/bs/LC_MESSAGES/exiv2.mo	94	share/locale/bs/LC_MESSAGES/exiv2.mo
		95	share/locale/ca/LC_MESSAGES/exiv2.mo
56	share/locale/de/LC_MESSAGES/exiv2.mo	96	share/locale/de/LC_MESSAGES/exiv2.mo
57	share/locale/es/LC_MESSAGES/exiv2.mo	97	share/locale/es/LC_MESSAGES/exiv2.mo
58	share/locale/fi/LC_MESSAGES/exiv2.mo	98	share/locale/fi/LC_MESSAGES/exiv2.mo