summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2020-02-02 11:07:51 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2020-02-02 11:07:51 +0000
commit0bd455131f7d76e5075303c614059772004c08e4 (patch)
tree1127298ee21f131a7cb53f376cd038150694c9b0
parentChange RUN_DEPENDS from rubygem-rubyzip to rubygem-rubyzip20 (diff)
Revert bindtextdomain.so location change in r267248
- Bump PORTREVISION for package change help2man (with NLS enabled) installs bindtextdomain.so to ${PREFIX}/lib/help2man/ now. Reported by: swills
-rw-r--r--misc/help2man/Makefile6
-rw-r--r--misc/help2man/files/patch-Makefile.in18
2 files changed, 20 insertions, 4 deletions
diff --git a/misc/help2man/Makefile b/misc/help2man/Makefile
index 9e669a9ef96b..f65c4299b553 100644
--- a/misc/help2man/Makefile
+++ b/misc/help2man/Makefile
@@ -3,6 +3,7 @@
PORTNAME= help2man
PORTVERSION= 1.47.12
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= GNU
@@ -24,7 +25,7 @@ OPTIONS_DEFINE= NLS
NLS_BUILD_DEPENDS= p5-Locale-gettext>=0:devel/p5-Locale-gettext
NLS_CONFIGURE_ENABLE= nls
-NLS_PLIST_FILES= lib/bindtextdomain.so
+NLS_PLIST_FILES= lib/help2man/bindtextdomain.so
NLS_RUN_DEPENDS= p5-Locale-gettext>=0:devel/p5-Locale-gettext
NLS_USES= gettext
NLS_VARS= CONFIGURE_FAIL_MESSAGE="Rebuild lang/${PERL_PORT} and devel/p5-Locale-gettext manually before contacting maintainer."
@@ -38,7 +39,4 @@ NLS_PLIST_FILES+= man/${lang}/man1/help2man.1.gz \
share/locale/${lang}/LC_MESSAGES/help2man.mo
.endfor
-post-patch:
- @${REINPLACE_CMD} -e '/^pkglibdir/ s|/help2man$$||' ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
diff --git a/misc/help2man/files/patch-Makefile.in b/misc/help2man/files/patch-Makefile.in
new file mode 100644
index 000000000000..377d771ceff1
--- /dev/null
+++ b/misc/help2man/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig 2017-09-22 14:27:08 UTC
++++ Makefile.in
+@@ -60,7 +60,6 @@ all: $(target) man info @extra_make_all@
+ install: all install_base @extra_make_install@
+ install_dirs:
+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+- $(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+
+@@ -77,6 +76,7 @@ install_base: install_dirs
+ fi
+
+ install_preload: install_dirs preload
++ $(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
+
+ install_l10n: install_dirs msg_l10n man_l10n info_l10n