git: aee82b5bb539 - main - textproc/exempi: update to 2.6.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Sat, 24 Jun 2023 00:46:28 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aee82b5bb5393798c8312d259de78ca97fe9995c

commit aee82b5bb5393798c8312d259de78ca97fe9995c
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2023-06-24 00:41:49 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2023-06-24 00:41:49 +0000

    textproc/exempi: update to 2.6.3
    
    Previous patches incorporated into the release or obviated.
    
    While here:
    - force C++11, as the project expects it, and to override clang 16's default C++17
    - add LICENSE{,_FILE}
---
 textproc/exempi/Makefile                           | 12 +++----
 textproc/exempi/distinfo                           |  6 ++--
 textproc/exempi/files/patch-exempi_Makefile.in     | 19 -----------
 .../exempi/files/patch-samples_source_Makefile.in  | 19 -----------
 .../files/patch-samples_source_common_DumpFile.cpp | 38 ----------------------
 textproc/exempi/pkg-plist                          |  2 +-
 6 files changed, 10 insertions(+), 86 deletions(-)

diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index a4a8e6649b04..9a876bc4d7aa 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	exempi
-DISTVERSION=	2.6.2
-PORTREVISION=	1
+DISTVERSION=	2.6.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://libopenraw.freedesktop.org/download/
 
@@ -8,17 +7,18 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Port of Adobe XMP SDK to work on UNIX
 WWW=		http://libopenraw.freedesktop.org/wiki/Exempi
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-USES=		cpe gmake iconv libtool localbase pathfix tar:bzip2
+USES=		cpe compiler:c++11-lang gmake iconv libtool localbase pathfix tar:xz
 CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
-
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} NOCONFIGURE=1 ./autogen.sh
+USE_CXXSTD=	c++11
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
diff --git a/textproc/exempi/distinfo b/textproc/exempi/distinfo
index 71962d2f3145..d52cd001e737 100644
--- a/textproc/exempi/distinfo
+++ b/textproc/exempi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659086948
-SHA256 (exempi-2.6.2.tar.bz2) = 4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d
-SIZE (exempi-2.6.2.tar.bz2) = 3709476
+TIMESTAMP = 1687564983
+SHA256 (exempi-2.6.3.tar.xz) = 80b3aa0b7f54978c6a49cc5f5f1d3b6e9524b59de74ef92b3bf0abeba4c28fb1
+SIZE (exempi-2.6.3.tar.xz) = 2842408
diff --git a/textproc/exempi/files/patch-exempi_Makefile.in b/textproc/exempi/files/patch-exempi_Makefile.in
deleted file mode 100644
index a644ce876a26..000000000000
--- a/textproc/exempi/files/patch-exempi_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- exempi/Makefile.in.orig	2022-07-29 09:33:18 UTC
-+++ exempi/Makefile.in
-@@ -128,7 +128,6 @@ bin_PROGRAMS = exempi$(EXEEXT)
- build_triplet = @build@
- host_triplet = @host@
- bin_PROGRAMS = exempi$(EXEEXT)
--@UNIX_ENV_TRUE@am__append_1 = -lrt
- @WITH_UNIT_TEST_TRUE@check_PROGRAMS = testexempicore$(EXEEXT) \
- @WITH_UNIT_TEST_TRUE@	testserialise$(EXEEXT) \
- @WITH_UNIT_TEST_TRUE@	testwritenewprop$(EXEEXT) \
-@@ -801,7 +800,7 @@ libexempi_la_LIBADD = $(top_builddir)/source/libxmpcom
- 	$(top_builddir)/XMPCore/source/libXMPCore.la \
- 	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
- 	$(top_builddir)/third-party/zuid/interfaces/libmd5.la -lexpat \
--	-lz -ldl $(am__append_1)
-+	-lz $(am__append_1)
- libexempi_la_LDFLAGS = -version-info @EXEMPI_VERSION_INFO@
- dist_man1_MANS = exempi.1
- 
diff --git a/textproc/exempi/files/patch-samples_source_Makefile.in b/textproc/exempi/files/patch-samples_source_Makefile.in
deleted file mode 100644
index 9afce776b44c..000000000000
--- a/textproc/exempi/files/patch-samples_source_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- samples/source/Makefile.in.orig	2022-07-29 09:33:18 UTC
-+++ samples/source/Makefile.in
-@@ -129,7 +129,6 @@ noinst_PROGRAMS = xmpcoverage$(EXEEXT) xmpfilescoverag
- 	dumpxmp$(EXEEXT) dumpmainxmp$(EXEEXT) customschema$(EXEEXT) \
- 	modifyingxmp$(EXEEXT) readingxmp$(EXEEXT) \
- 	xmpcommandtool$(EXEEXT)
--@UNIX_ENV_TRUE@am__append_1 = -lrt
- subdir = samples/source
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
-@@ -438,7 +437,7 @@ XMPLIBS = $(top_builddir)/XMPCore/source/libXMPCore.la
- XMPLIBS = $(top_builddir)/XMPCore/source/libXMPCore.la \
- 	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
- 	$(top_builddir)/source/libxmpcommon.la -lexpat -lz \
--	$(top_builddir)/third-party/zuid/interfaces/libmd5.la -ldl \
-+	$(top_builddir)/third-party/zuid/interfaces/libmd5.la \
- 	$(am__append_1)
- noinst_LTLIBRARIES = libsamplescommon.la
- libsamplescommon_la_SOURCES = common/DumpFile.cpp common/DumpFile.h \
diff --git a/textproc/exempi/files/patch-samples_source_common_DumpFile.cpp b/textproc/exempi/files/patch-samples_source_common_DumpFile.cpp
deleted file mode 100644
index 1587cd397d00..000000000000
--- a/textproc/exempi/files/patch-samples_source_common_DumpFile.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- samples/source/common/DumpFile.cpp.orig	2022-06-25 21:43:18 UTC
-+++ samples/source/common/DumpFile.cpp
-@@ -2476,7 +2476,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st
- 					DumpTIFF(tiffContent, tiffLength, offset, "HEIF Exif", "HEIF:Exif");
- 					LFA_Seek(file, keep, SEEK_SET, &ok);
- 					assertMsg("seek failed", ok);
--					exif_item_id = NULL;
-+					exif_item_id = 0;
- 				}
- 			}
- 			//Get the data for xmp - using value from mime_item_id
-@@ -2494,7 +2494,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st
- 					DumpXMP(xmpContent, xmpLength, offset, "XMP");
- 					LFA_Seek(file, keep, SEEK_SET, &ok);
- 					assertMsg("seek failed", ok);
--					mime_item_id = NULL;
-+					mime_item_id = 0;
- 				}
- 			}
- 			break;
-@@ -2646,7 +2646,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st
- 					DumpTIFF(tiffContent, tiffLength, offset, "HEIF Exif", "HEIF:Exif");
- 					LFA_Seek(file, keep, SEEK_SET, &ok);
- 					assertMsg("seek failed", ok);
--					exif_item_id = NULL;
-+					exif_item_id = 0;
- 				}
- 			}
- 			//Get the data for xmp - using value from mime_item_id
-@@ -2664,7 +2664,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st
- 					DumpXMP(xmpContent, xmpLength, offset, "XMP");
- 					LFA_Seek(file, keep, SEEK_SET, &ok);
- 					assertMsg("seek failed", ok);
--					mime_item_id = NULL;
-+					mime_item_id = 0;
- 				}
- 			}
- 
diff --git a/textproc/exempi/pkg-plist b/textproc/exempi/pkg-plist
index 4fe1dcf8844c..a60ddd8d4ea5 100644
--- a/textproc/exempi/pkg-plist
+++ b/textproc/exempi/pkg-plist
@@ -6,6 +6,6 @@ include/exempi-2.0/exempi/xmperrors.h
 lib/libexempi.a
 lib/libexempi.so
 lib/libexempi.so.8
-lib/libexempi.so.8.1.2
+lib/libexempi.so.8.1.3
 libdata/pkgconfig/exempi-2.0.pc
 man/man1/exempi.1.gz