svn commit: r551179 - in head/multimedia/libmediainfo: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Oct 2 13:17:43 UTC 2020
Author: sunpoet
Date: Fri Oct 2 13:17:41 2020
New Revision: 551179
URL: https://svnweb.freebsd.org/changeset/ports/551179
Log:
Convert REINPLACE_CMD to patch file
Added:
head/multimedia/libmediainfo/files/
head/multimedia/libmediainfo/files/patch-configure (contents, props changed)
Modified:
head/multimedia/libmediainfo/Makefile
Modified: head/multimedia/libmediainfo/Makefile
==============================================================================
--- head/multimedia/libmediainfo/Makefile Fri Oct 2 13:17:36 2020 (r551178)
+++ head/multimedia/libmediainfo/Makefile Fri Oct 2 13:17:41 2020 (r551179)
@@ -39,13 +39,6 @@ MMS_LIB_DEPENDS= libmms.so:net/libmms
TINYXML2_CONFIGURE_ON= --with-libtinyxml2=yes
TINYXML2_LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2
-post-patch:
- @${REINPLACE_CMD} \
- -e 's|lib/pkgconfig/|libdata/pkgconfig/|g' \
- -e 's|-DMEDIAINFO_LIBMMS_FROMSOURCE||g' \
- -e 's|with_libmms/pkgconfig/|with_libmms/libdata/pkgconfig/|' \
- -e 's|src/.libs|lib|g' ${WRKSRC}/configure
-
post-install:
${INSTALL_DATA} ${WRKSRC}/libmediainfo.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libmediainfo.pc
${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/
Added: head/multimedia/libmediainfo/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/libmediainfo/files/patch-configure Fri Oct 2 13:17:41 2020 (r551179)
@@ -0,0 +1,36 @@
+--- configure.orig 2020-08-10 23:41:20 UTC
++++ configure
+@@ -17656,8 +17656,8 @@ if test -d $with_libcurl; then
+ if test -f $with_libcurl/libcurl.pc; then
+ libcurlpcfile="$with_libcurl/libcurl.pc"
+ else
+- if test -f "$with_libcurl/lib/pkgconfig/libcurl.pc"; then
+- libcurlpcfile="$with_libcurl/lib/pkgconfig/libcurl.pc"
++ if test -f "$with_libcurl/libdata/pkgconfig/libcurl.pc"; then
++ libcurlpcfile="$with_libcurl/libdata/pkgconfig/libcurl.pc"
+ else
+ as_fn_error $? "Problem while configuring builtin curl (libcurl.pc not found)" "$LINENO" 5
+ fi
+@@ -17739,16 +17739,16 @@ else
+ fi
+
+ if test -d $with_libmms; then
+- CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_FROMSOURCE -I$with_libmms/src $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)"
+- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)"
++ CXXFLAGS="$CXXFLAGS -I$with_libmms/src $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)"
++ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)"
+ if test "$enable_staticlibs" = "yes"; then
+ using_libmms="custom (static)"
+- LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)"
+- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)"
++ LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)"
++ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)"
+ else
+ using_libmms="custom"
+- LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)"
+- MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)"
++ LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)"
++ MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)"
+ fi
+ elif test "$with_libmms" = "no"; then
+ CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_NO"
More information about the svn-ports-head
mailing list