4 files changed, 12 insertions, 157 deletions

diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index 5afe484ca86a..fa4fd853dae1 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -2,7 +2,7 @@
 #   $MCom: ports/textproc/exempi/Makefile,v 1.1 2008/02/26 18:50:26 ahze Exp $
 
 PORTNAME=	exempi
-PORTVERSION=	2.2.2
+DISTVERSION=	2.5.2
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://libopenraw.freedesktop.org/download/
@@ -10,15 +10,16 @@ MASTER_SITES=	http://libopenraw.freedesktop.org/download/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Port of Adobe XMP SDK to work on UNIX
 
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-unittest=no
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
-USES=		pathfix iconv libtool tar:bzip2
+USES=		gmake iconv libtool localbase pathfix tar:bzip2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
+GNU_CONFIGURE=	yes
+
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} NOCONFIGURE=1 ./autogen.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
diff --git a/textproc/exempi/distinfo b/textproc/exempi/distinfo
index 1d72a15e0f36..f4ec15b0959a 100644
--- a/textproc/exempi/distinfo
+++ b/textproc/exempi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (exempi-2.2.2.tar.bz2) = 0e7ad0e5e61b6828e38d31a8cc59c26c9adeed7edf4b26708c400beb6a686c07
-SIZE (exempi-2.2.2.tar.bz2) = 3380662
+TIMESTAMP = 1626540964
+SHA256 (exempi-2.5.2.tar.bz2) = 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5
+SIZE (exempi-2.5.2.tar.bz2) = 3658606
diff --git a/textproc/exempi/files/patch-c++11 b/textproc/exempi/files/patch-c++11
deleted file mode 100644
index d4e4f3e4d902..000000000000
--- a/textproc/exempi/files/patch-c++11
+++ /dev/null
@@ -1,147 +0,0 @@
-Fix type mismatch in calls to XMPMeta::GetProperty
-
-kXMP_NoOptions is (XMP_OptionBits) whereas the final argument to
-XMPMeta::GetProperty takes (XMP_OptionBits*)
-
-https://cgit.freedesktop.org/exempi/commit/?id=b6ff77dd74a1
-
---- source/XMPFiles/FormatSupport/ID3_Support.hpp.orig	2014-08-31 20:39:29 UTC
-+++ source/XMPFiles/FormatSupport/ID3_Support.hpp
-@@ -700,28 +700,28 @@ namespace ID3_Support 
- 			LFA_WriteUns8( file, 'G' );
- 
- 			// title //////////////////////////////////////////////////////
--			if ( meta->GetLocalizedText( kXMP_NS_DC, "title", "", "x-default", 0, &utf8, kXMP_NoOptions ))
-+			if ( meta->GetLocalizedText( kXMP_NS_DC, "title", "", "x-default", 0, &utf8, 0 ))
- 			{
- 				LFA_Seek( file, -128 + 3, SEEK_END);
- 				ReconcileUtils::UTF8ToLatin1( utf8.c_str(), utf8.size(), &latin1 );
- 				LFA_Write( file, latin1.c_str(), MIN( 30, (XMP_Int32)latin1.size() ) );
- 			}
- 			// artist //////////////////////////////////////////////////////
--			if ( meta->GetProperty( kXMP_NS_DM, "artist", &utf8, kXMP_NoOptions ))
-+			if ( meta->GetProperty( kXMP_NS_DM, "artist", &utf8, 0 ))
- 			{
- 				LFA_Seek( file, -128 + 33, SEEK_END);
- 				ReconcileUtils::UTF8ToLatin1( utf8.c_str(), utf8.size(), &latin1 );
- 				LFA_Write( file, latin1.c_str(), MIN( 30, (XMP_Int32)latin1.size() ) );
- 			}
- 			// album //////////////////////////////////////////////////////
--			if ( meta->GetProperty( kXMP_NS_DM, "album", &utf8, kXMP_NoOptions ))
-+			if ( meta->GetProperty( kXMP_NS_DM, "album", &utf8, 0 ))
- 			{
- 				LFA_Seek( file, -128 + 63, SEEK_END);
- 				ReconcileUtils::UTF8ToLatin1( utf8.c_str(), utf8.size(), &latin1 );
- 				LFA_Write( file, latin1.c_str(), MIN( 30, (XMP_Int32)latin1.size() ) );
- 			}
- 			// year //////////////////////////////////////////////////////
--			if ( meta->GetProperty( kXMP_NS_XMP, "CreateDate", &utf8, kXMP_NoOptions ))
-+			if ( meta->GetProperty( kXMP_NS_XMP, "CreateDate", &utf8, 0 ))
- 			{
- 				XMP_DateTime dateTime;
- 				SXMPUtils::ConvertToDate( utf8, &dateTime );
-@@ -733,14 +733,14 @@ namespace ID3_Support 
- 				}
- 			}
- 			// comment (write 30 bytes first, see truncation later) ////////////
--			if ( meta->GetProperty( kXMP_NS_DM, "logComment", &utf8, kXMP_NoOptions ))
-+			if ( meta->GetProperty( kXMP_NS_DM, "logComment", &utf8, 0 ))
- 			{
- 				LFA_Seek ( file, -128 + 97, SEEK_END );
- 				ReconcileUtils::UTF8ToLatin1 ( utf8.c_str(), utf8.size(), &latin1 );
- 				LFA_Write ( file, latin1.c_str(), MIN ( 30, (XMP_Int32)latin1.size() ) );
- 			}
- 			// genre ////////////////////////////////////////////////////////////////
--			if ( meta->GetProperty( kXMP_NS_DM, "genre", &utf8, kXMP_NoOptions ))
-+			if ( meta->GetProperty( kXMP_NS_DM, "genre", &utf8, 0 ))
- 			{
- 				XMP_Uns8 genreNo = 0;
- 
-@@ -760,7 +760,7 @@ namespace ID3_Support 
- 			}
- 			
- 			// trackNo ////////////////////////////////////////////////////////////
--			if ( meta->GetProperty( kXMP_NS_DM, "trackNumber", &utf8, kXMP_NoOptions ))
-+			if ( meta->GetProperty( kXMP_NS_DM, "trackNumber", &utf8, 0 ))
- 			{
- 				XMP_Uns8 trackNo = 0;
- 				try
---- source/XMPFiles/FormatSupport/RIFF_Support.cpp.orig	2014-08-31 20:39:29 UTC
-+++ source/XMPFiles/FormatSupport/RIFF_Support.cpp
-@@ -604,7 +604,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* ha
- 	// prepare buffer, need to know CodingHistory size as the only variable
- 	XMP_Int32 bextBufferSize = MIN_BEXT_SIZE - 8; // -8 because of header
- 	std::string value;
--	if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, kXMP_NoOptions ))
-+	if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, 0 ))
- 	{
- 		bextBufferSize += ((XMP_StringLen)value.size()) + 1 ; // add to size (and a trailing zero)
- 	}
-@@ -616,35 +616,35 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* ha
- 
- 	// grab props, write into buffer, remove from XMP ///////////////////////////
- 	// bextDescription ------------------------------------------------
--	if ( xmp->GetProperty( bextDescription.ns, bextDescription.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextDescription.ns, bextDescription.prop, &value, 0 ) )
- 	{
- 		setBextField( &value, (XMP_Uns8*) buffer, 0, 256 );
- 		xmp->DeleteProperty( bextDescription.ns, bextDescription.prop)					;
- 		chunkUsed = true;
- 	}
- 	// bextOriginator -------------------------------------------------
--	if ( xmp->GetProperty( bextOriginator.ns , bextOriginator.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextOriginator.ns , bextOriginator.prop, &value, 0 ) )
- 	{
- 		setBextField( &value, (XMP_Uns8*) buffer, 256, 32 );
- 		xmp->DeleteProperty( bextOriginator.ns , bextOriginator.prop );
- 		chunkUsed = true;
- 	}
- 	// bextOriginatorRef ----------------------------------------------
--	if ( xmp->GetProperty( bextOriginatorRef.ns , bextOriginatorRef.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextOriginatorRef.ns , bextOriginatorRef.prop, &value, 0 ) )
- 	{
- 		setBextField( &value, (XMP_Uns8*) buffer, 256+32, 32 );
- 		xmp->DeleteProperty( bextOriginatorRef.ns , bextOriginatorRef.prop );
- 		chunkUsed = true;
- 	}
- 	// bextOriginationDate --------------------------------------------
--	if ( xmp->GetProperty( bextOriginationDate.ns , bextOriginationDate.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextOriginationDate.ns , bextOriginationDate.prop, &value, 0 ) )
- 	{
- 		setBextField( &value, (XMP_Uns8*) buffer, 256+32+32, 10 );
- 		xmp->DeleteProperty( bextOriginationDate.ns , bextOriginationDate.prop );
- 		chunkUsed = true;
- 	}
- 	// bextOriginationTime --------------------------------------------
--	if ( xmp->GetProperty( bextOriginationTime.ns , bextOriginationTime.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextOriginationTime.ns , bextOriginationTime.prop, &value, 0 ) )
- 	{
- 		setBextField( &value, (XMP_Uns8*) buffer, 256+32+32+10, 8 );
- 		xmp->DeleteProperty( bextOriginationTime.ns , bextOriginationTime.prop );
-@@ -652,7 +652,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* ha
- 	}
- 	// bextTimeReference ----------------------------------------------
- 	// thanx to friendly byte order, all 8 bytes can be written in one go:
--	if ( xmp->GetProperty( bextTimeReference.ns, bextTimeReference.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextTimeReference.ns, bextTimeReference.prop, &value, 0 ) )
- 	{
- 		try
- 		{
-@@ -675,7 +675,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* ha
- 	xmp->DeleteProperty( bextVersion.ns, bextVersion.prop );
- 
- 	// bextUMID -------------------------------------------------------
--	if ( xmp->GetProperty( bextUMID.ns, bextUMID.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextUMID.ns, bextUMID.prop, &value, 0 ) )
- 	{
- 		std::string rawStr;
- 	
-@@ -694,7 +694,7 @@ static void exportXMPtoBextChunk( RIFF_MetaHandler* ha
- 	}
- 
- 	// bextCodingHistory ----------------------------------------------
--	if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, kXMP_NoOptions ) )
-+	if ( xmp->GetProperty( bextCodingHistory.ns, bextCodingHistory.prop, &value, 0 ) )
- 	{
- 		std::string ascii;
- 		convertToASCII( value.data(), (XMP_StringLen) value.size() , &ascii, (XMP_StringLen) value.size() );
diff --git a/textproc/exempi/pkg-plist b/textproc/exempi/pkg-plist
index 3ccf4f240dc0..cc5fea78b8b2 100644
--- a/textproc/exempi/pkg-plist
+++ b/textproc/exempi/pkg-plist
@@ -5,7 +5,7 @@ include/exempi-2.0/exempi/xmpconsts.h
 include/exempi-2.0/exempi/xmperrors.h
 lib/libexempi.a
 lib/libexempi.so
-lib/libexempi.so.3
-lib/libexempi.so.3.2.4
+lib/libexempi.so.8
+lib/libexempi.so.8.0.2
 libdata/pkgconfig/exempi-2.0.pc
 man/man1/exempi.1.gz