diff options
| author |   Kent Fredric <kentfredric@gmail.com> | 2016-04-14 05:39:36 +1200 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-04-15 21:55:31 +0200 |
| commit | f58c0f6d0c3fac33eb1957ff908d65d2f74ca36a (patch) | |
| tree | fc796806ae8a9caf450296d70c4c4801f5db4739 /app-text/htmldoc/files/htmldoc-destdir.patch | |
| parent | dev-perl/Test-Memory-Cycle: Bump to version 1.60.0 (diff) | |
| download | gentoo-f58c0f6d0c3fac33eb1957ff908d65d2f74ca36a.tar.gz gentoo-f58c0f6d0c3fac33eb1957ff908d65d2f74ca36a.tar.bz2 gentoo-f58c0f6d0c3fac33eb1957ff908d65d2f74ca36a.zip | |
app-text/htmldoc: Bump to version 1.8.29
This bump includes 2 patches:
- One to patch out the complete lack of DESTDIR support upstream
- The other is to patch an annoying defect where failures in child
Make targets result in "make" returning true, and the build finishing
and installing in a broken state.
Upstream have dropped SSL Support.
This will hopefully resolve several bugs:
- https://bugs.gentoo.org/572262 - Toralf
- https://bugs.gentoo.org/549960 - Toralf
- https://bugs.gentoo.org/527624 - Diego
Thanks to Toralf Förster and Diego Elio Pettenò for reporting the bugs.
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="alpha amd64 amd64-fbsd arm arm64 hppa ia64 m68k mips nios2 ppc ppc64 riscv s390 sh sparc sparc-fbsd x86 x86-fbsd"
Diffstat (limited to 'app-text/htmldoc/files/htmldoc-destdir.patch')
| -rw-r--r-- | app-text/htmldoc/files/htmldoc-destdir.patch | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/app-text/htmldoc/files/htmldoc-destdir.patch b/app-text/htmldoc/files/htmldoc-destdir.patch new file mode 100644 index 000000000000..488bb0beb31a --- /dev/null +++ b/app-text/htmldoc/files/htmldoc-destdir.patch @@ -0,0 +1,91 @@ +diff -Naur htmldoc-1.8.29/data/Makefile htmldoc-1.8.29b/data/Makefile +--- htmldoc-1.8.29/data/Makefile 2011-12-23 06:23:11.000000000 +0000 ++++ htmldoc-1.8.29b/data/Makefile 2016-04-13 16:59:35.074270457 +0000 +@@ -41,11 +41,11 @@ + # + + install: +- if [ ! -d $(datadir)/htmldoc/data ]; then\ +- $(MKDIR) $(datadir)/htmldoc/data;\ ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ + fi +- $(CP) $(FILES) $(datadir)/htmldoc/data +- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* ++ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* + + + # +diff -Naur htmldoc-1.8.29/doc/Makefile htmldoc-1.8.29b/doc/Makefile +--- htmldoc-1.8.29/doc/Makefile 2016-01-02 22:58:41.000000000 +0000 ++++ htmldoc-1.8.29b/doc/Makefile 2016-04-13 16:57:46.628550948 +0000 +@@ -45,16 +45,16 @@ + # + + install: $(DOCUMENTS) +- if test ! -d $(datadir)/doc/htmldoc; then\ +- $(MKDIR) $(datadir)/doc/htmldoc;\ ++ if test ! -d $(DESTDIR)$(datadir)/doc/htmldoc; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\ + fi +- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc +- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* +- if test ! -d $(mandir)/man1; then\ +- $(MKDIR) $(mandir)/man1;\ ++ $(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/* ++ if test ! -d $(DESTDIR)$(mandir)/man1; then\ ++ $(MKDIR) $(DESTDIR)$(mandir)/man1;\ + fi +- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 +- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 ++ $(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1 ++ $(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1 + + + # +diff -Naur htmldoc-1.8.29/fonts/Makefile htmldoc-1.8.29b/fonts/Makefile +--- htmldoc-1.8.29/fonts/Makefile 2011-12-23 06:23:11.000000000 +0000 ++++ htmldoc-1.8.29b/fonts/Makefile 2016-04-13 16:56:35.317733427 +0000 +@@ -62,15 +62,15 @@ + # + + install: +- echo "Installing font files in $(datadir)/htmldoc/fonts..." +- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ +- $(MKDIR) $(datadir)/htmldoc/fonts;\ ++ echo "Installing font files in $(DESTDIR)$(datadir)/htmldoc/fonts..." ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/fonts ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\ + fi + for font in $(FONTS); do \ +- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ +- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \ + done +- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/* ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/fonts/* + + + # +diff -Naur htmldoc-1.8.29/htmldoc/Makefile htmldoc-1.8.29b/htmldoc/Makefile +--- htmldoc-1.8.29/htmldoc/Makefile 2016-01-02 21:46:20.000000000 +0000 ++++ htmldoc-1.8.29b/htmldoc/Makefile 2016-04-13 16:56:35.318733424 +0000 +@@ -38,11 +38,11 @@ + # + + install: all +- if [ ! -d $(bindir) ]; then\ +- $(MKDIR) $(bindir);\ ++ if [ ! -d $(DESTDIR)$(bindir) ]; then\ ++ $(MKDIR) $(DESTDIR)$(bindir);\ + fi +- cp htmldoc$(EXEEXT) $(bindir) +- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT) ++ cp htmldoc$(EXEEXT) $(DESTDIR)$(bindir) ++ chmod ugo+rx $(DESTDIR)$(bindir)/htmldoc$(EXEEXT) + + + # |