Page MenuHomeFreeBSD
Files F141052583

D7283.id18663.diff
No OneTemporary
Actions

D7283.id18663.diff
View Options

Index: graphics/exiv2/Makefile
===================================================================
--- graphics/exiv2/Makefile
+++ graphics/exiv2/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= exiv2
-PORTVERSION= 0.24
-PORTREVISION= 2
+PORTVERSION= 0.25
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://www.exiv2.org/
@@ -16,13 +15,12 @@
LIB_DEPENDS= libexpat.so:textproc/expat2
-GNU_CONFIGURE= yes
-USES= cpe gettext gmake iconv libtool
+USES= cmake:outsource cpe gettext iconv
USE_LDCONFIG= yes
-MAKE_JOBS_UNSAFE=yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+CMAKE_ARGS= -DEXIV2_ENABLE_VIDEO:BOOL=TRUE \
+ -DEXIV2_ENABLE_BUILD_PO:BOOL=TRUE \
+ -DEXIV2_ENABLE_BUILD_SAMPLES:BOOL=FALSE
.include <bsd.port.options.mk>
@@ -31,14 +29,11 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's,LDFLAGS -no-undefined -lpsapi",& ;; \
- dragonfly* | freebsd*),' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e \
- 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \
- ${WRKSRC}/src/Makefile
-
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/exiv2 \
- ${STAGEDIR}${PREFIX}/lib/libexiv2.so.13
+# Do not link against -ldl
+ @${REINPLACE_CMD} -e '/TARGET_LINK_LIBRARIES/s| dl | |g' \
+ ${PATCH_WRKSRC}/src/CMakeLists.txt
+# Correct pkgconfig file location [pathfix.mk does not catch this]
+ @${REINPLACE_CMD} -e '/lib.pkgconfig/s|lib|libdata|g' \
+ ${PATCH_WRKSRC}/config/CMakeChecks.txt
.include <bsd.port.mk>
Index: graphics/exiv2/distinfo
===================================================================
--- graphics/exiv2/distinfo
+++ graphics/exiv2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (exiv2-0.24.tar.gz) = f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e
-SIZE (exiv2-0.24.tar.gz) = 4635028
+TIMESTAMP = 1469188288
+SHA256 (exiv2-0.25.tar.gz) = c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
+SIZE (exiv2-0.25.tar.gz) = 5434325
Index: graphics/exiv2/files/patch-src-Makefile
===================================================================
--- graphics/exiv2/files/patch-src-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.orig 2013-12-01 12:13:42 UTC
-+++ src/Makefile
-@@ -215,7 +215,7 @@ ifdef DEP_TRACKING
- endif
-
- # Be sure to rewrite exv_conf.h before compiling anything
--$(SRC): exv_conf.h
-+$(SRC) $(EXIV2SRC): exv_conf.h
-
- exv_conf.h: $(top_srcdir)/config/config.h
- LC_ALL=C sed 's/#define \([A-Z]\)/#define EXV_\1/; s/#undef \([A-Z]\)/#undef EXV_\1/' < $< > $@
-@@ -231,7 +231,7 @@ lib: $(OBJ)
-
- $(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
- -mkdir ../bin >/dev/null 2>&1
-- @$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
-+ @$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir) $(LIBS)
-
- install-header:
- $(INSTALL_DIRS) $(DESTDIR)$(incdir)
Index: graphics/exiv2/pkg-plist
===================================================================
--- graphics/exiv2/pkg-plist
+++ graphics/exiv2/pkg-plist
@@ -2,6 +2,7 @@
include/exiv2/asfvideo.hpp
include/exiv2/basicio.hpp
include/exiv2/bmpimage.hpp
+include/exiv2/config.h
include/exiv2/convert.hpp
include/exiv2/cr2image.hpp
include/exiv2/crwimage.hpp
@@ -12,8 +13,10 @@
include/exiv2/exif.hpp
include/exiv2/exiv2.hpp
include/exiv2/exv_conf.h
+include/exiv2/exv_msvc.h
include/exiv2/futils.hpp
include/exiv2/gifimage.hpp
+include/exiv2/http.hpp
include/exiv2/image.hpp
include/exiv2/iptc.hpp
include/exiv2/jp2image.hpp
@@ -31,24 +34,34 @@
include/exiv2/rafimage.hpp
include/exiv2/riffvideo.hpp
include/exiv2/rw2image.hpp
+include/exiv2/svn_version.h
include/exiv2/tags.hpp
include/exiv2/tgaimage.hpp
include/exiv2/tiffimage.hpp
include/exiv2/types.hpp
+include/exiv2/utilsvideo.hpp
include/exiv2/value.hpp
include/exiv2/version.hpp
include/exiv2/xmp.hpp
include/exiv2/xmpsidecar.hpp
-lib/libexiv2.a
lib/libexiv2.so
-lib/libexiv2.so.13
-lib/libexiv2.so.13.0.0
+lib/libexiv2.so.14
+lib/libexiv2.so.14.0.0
+libdata/pkgconfig/exiv2.lsm
libdata/pkgconfig/exiv2.pc
man/man1/exiv2.1.gz
+share/locale/bs/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
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

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 1, 6:15 AM (3 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27430916
Default Alt Text
D7283.id18663.diff (4 KB)

Event Timeline