git: 51b82569b873 - main - graphics/libexif: Convert REINPLACE_CMD to patch file

Po-Chuan Hsieh sunpoet at FreeBSD.org
Sun Sep 19 06:07:01 UTC 2021


The branch main has been updated by sunpoet:

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

commit 51b82569b873908a79f9c14a664dac8723556cfd
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-09-19 05:27:41 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-09-19 05:59:47 +0000

    graphics/libexif: Convert REINPLACE_CMD to patch file
---
 graphics/libexif/Makefile                |  9 ++-------
 graphics/libexif/files/patch-Makefile.in | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 34083371f3fe..324b77f68825 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -13,8 +13,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe gmake libtool localbase pathfix pkgconfig tar:xz
 
-CPE_VENDOR=	libexif_project
-
 CONFIGURE_ARGS=	--disable-docs
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -22,6 +20,8 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
+CPE_VENDOR=	libexif_project
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
@@ -29,11 +29,6 @@ NLS_USES=	gettext
 NLS_CONFIGURE_ENV_OFF=	am_cv_func_iconv=no
 NLS_CONFIGURE_ENABLE=	nls
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|doc||g ; \
-		 /^am__installdirs =/s|$$(docdir)||g ; \
-		 /^install-data-am:/s|install-docDATA||g' ${WRKSRC}/Makefile.in
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
diff --git a/graphics/libexif/files/patch-Makefile.in b/graphics/libexif/files/patch-Makefile.in
new file mode 100644
index 000000000000..5097805236c5
--- /dev/null
+++ b/graphics/libexif/files/patch-Makefile.in
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	2020-05-18 19:51:57 UTC
++++ Makefile.in
+@@ -170,7 +170,7 @@ am__uninstall_files_from_dir = { \
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+-am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)"
++am__installdirs = "$(DESTDIR)" "$(DESTDIR)$(pkgconfigdir)"
+ DATA = $(doc_DATA) $(noinst_DATA) $(pkgconfig_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+@@ -393,7 +393,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = m4m po libexif test doc binary-dist contrib
++SUBDIRS = m4m po libexif test binary-dist contrib # doc
+ EXTRA_DIST = @PACKAGE_TARNAME at .spec README-Win32.txt libexif.pc.in \
+ 	libexif-uninstalled.pc.in SECURITY.md
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -881,7 +881,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-docDATA install-pkgconfigDATA
++install-data-am: install-pkgconfigDATA # install-docDATA
+ 
+ install-dvi: install-dvi-recursive
+ 


More information about the dev-commits-ports-all mailing list