Skip to content

Commit

Permalink
Fix some zziplib man pages
Browse files Browse the repository at this point in the history
There two ways to generate zziplib man pages and both have their
distinct problems. Man page generation via xmlto gets correct man pages
(with a docbook-xsl fix) but some man pages are not being generated,
plus xmlto way is to be deprecated in the future anyway. The other
method is via dbk2man.py but it generates correct amount of man pages
but they are broken in the same way xmlto-generated man pages are
without the docbook-xsl fix (filed
gdraheim/zziplib#56).

So, disable `xmlto` and manually fix incorrect man pages via `sed`.
  • Loading branch information
Mno-hime committed Aug 3, 2018
1 parent 30b6a38 commit bf07a44
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 1 deletion.
2 changes: 2 additions & 0 deletions components/archiver/zziplib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ include $(WS_MAKE_RULES)/ips.mk

PATH=$(PATH.gnu)

COMPONENT_PREP_ACTION= ( cd $(@D); autoreconf -i -f )

CONFIGURE_OPTIONS+= --enable-shared
CONFIGURE_OPTIONS+= --disable-static
CONFIGURE_OPTIONS+= --enable-largefile
Expand Down
2 changes: 1 addition & 1 deletion components/archiver/zziplib/manifests/sample-manifest.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

#
# Copyright 2017 <contributor>
# Copyright 2018 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
Expand Down
11 changes: 11 additions & 0 deletions components/archiver/zziplib/patches/03-disable-xmlto.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- zziplib-0.13.69/configure.ac 2018-03-17 13:46:45.000000000 +0000
+++ zziplib-0.13.69/configure.ac 2018-08-03 07:09:25.865903598 +0000
@@ -90,7 +90,7 @@ AX_PAX_TAR_EXTRACT
AC_PATH_PROGS(PERL, perl5 perl, echo no perl found for)
AC_PATH_PROGS(PYTHON, python, echo no python found for)
AC_PATH_PROGS(MKZIP, zip pkzip, :)
-AC_PATH_PROGS(XMLTO, xmlto, :)
+AC_PATH_PROGS(XMLTO, :, :)

AC_C_INLINE
AC_C_CONST
11 changes: 11 additions & 0 deletions components/archiver/zziplib/patches/04-fix-man-pages.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- zziplib-0.13.69/docs/Makefile.am 2018-03-17 13:46:45.000000000 +0000
+++ zziplib-0.13.69/docs/Makefile.am 2018-08-03 08:44:03.111721716 +0000
@@ -166,6 +166,8 @@ manpages.tar : zziplib.xml zzipmmapped.x
; mv man3_/man3 man3; rm -r man3_; fi \
; echo 'chmod 664 man3/*.3' \
; chmod 664 man3/*.3 \
+ ; echo "sed -i -e 's@^.so @.so man3/@' man3/*.3" \
+ ; sed -i -e 's@^.so @.so man3/@' man3/*.3 \
; echo '$(PAX_TAR_CREATE) "$@" man3/' \
; $(PAX_TAR_CREATE) "$@" man3/ \
; echo '$(DELETE); rm man3/*.3 ; rmdir man3' \

0 comments on commit bf07a44

Please sign in to comment.