system/mdocml: Updated for version 1.13.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 27 insertions, 30 deletions

diff --git a/system/mdocml/README b/system/mdocml/README
index 40c03d56a4..4b350fe9fb 100644
--- a/system/mdocml/README
+++ b/system/mdocml/README
@@ -8,3 +8,13 @@ XHTML, HTML, PostScript, and PDF. It also includes preconv, for recoding
 multibyte manuals; demandoc, for emitting only text parts of manuals; mandocdb,
 for indexing manuals; and apropos, whatis, and man.cgi (via catman) for
 semantic search of manual content.
+
+There is an environment variable called REPLACE_MAN, that if set to a non-empty
+string, will instruct the slackbuild script to replace the stock man package
+(you should remove(pkg) it first, though).
+
+After installing, make sure to (re)create the mandoc specific "whatis"
+database(s) in your manpath(s), eg.:
+# mandocdb /usr/man /usr/local/man
+... or, if you've chosen to replace man, then:
+# makewhatis /usr/man /usr/local/man
diff --git a/system/mdocml/configure-noconflict.local.gz b/system/mdocml/configure-noconflict.local.gz
new file mode 100644
index 0000000000..4a3d54b308
--- /dev/null
+++ b/system/mdocml/configure-noconflict.local.gz
diff --git a/system/mdocml/configure-replace.local.gz b/system/mdocml/configure-replace.local.gz
new file mode 100644
index 0000000000..9fb0515791
--- /dev/null
+++ b/system/mdocml/configure-replace.local.gz
diff --git a/system/mdocml/mansearch_c-regcomp_compat.diff.gz b/system/mdocml/mansearch_c-regcomp_compat.diff.gz
new file mode 100644
index 0000000000..49dc506d71
--- /dev/null
+++ b/system/mdocml/mansearch_c-regcomp_compat.diff.gz
diff --git a/system/mdocml/mdocml.SlackBuild b/system/mdocml/mdocml.SlackBuild
index be2904fee5..db389491b4 100644
--- a/system/mdocml/mdocml.SlackBuild
+++ b/system/mdocml/mdocml.SlackBuild
@@ -24,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mdocml
-VERSION=${VERSION:-1.13.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.13.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,31 +70,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# XXX We can get back to "Slackware Linux" for OSNAME with 1.13.2
-CFLAGS=$SLKCFLAGS' -DOSNAME="\"Slackware\""' \
+if [ -z "${REPLACE_MAN}" ];then
+	gzip -dc "${CWD}"/configure-noconflict.local.gz >./configure.local
+else
+	gzip -dc "${CWD}"/configure-replace.local.gz >./configure.local
+fi
+zcat "${CWD}"/mansearch_c-regcomp_compat.diff.gz |patch -p0
+./configure
+CFLAGS=$SLKCFLAGS \
 	make
-make install DESTDIR=$PKG PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX}/mdocml
-
-mkdir -m755 -p $PKG/etc/
-install -m 644 -o root -g root $CWD/mandoc.conf.new $PKG/etc/
-
-# don't conflict with stock man
-mv $PKG/usr/sbin/makewhatis $PKG/usr/sbin/makewhatis-mdocml
-mv $PKG/usr/man/man8/makewhatis.8 $PKG/usr/man/man8/makewhatis-mdocml.8
-mv $PKG/usr/bin/whatis $PKG/usr/bin/whatis-mdocml
-mv $PKG/usr/man/man1/whatis.1 $PKG/usr/man/man1/whatis-mdocml.1
-mv $PKG/usr/bin/apropos $PKG/usr/bin/apropos-mdocml
-rm -f $PKG/usr/man/man1/apropos.1
-ln -s whatis-mdocml.1 $PKG/usr/man/man1/apropos-mdocml.1
-
-# don't conflict with stock groff
-mv $PKG/usr/bin/preconv $PKG/usr/bin/preconv-mdocml
-mv $PKG/usr/man/man1/preconv.1 $PKG/usr/man/man1/preconv-mdocml.1
-mv $PKG/usr/man/man7/man.7 $PKG/usr/man/man7/man-mdocml.7
-mv $PKG/usr/man/man7/mdoc.7 $PKG/usr/man/man7/mdoc-mdocml.7
-mv $PKG/usr/man/man7/roff.7 $PKG/usr/man/man7/roff-mdocml.7
-mv $PKG/usr/man/man7/tbl.7 $PKG/usr/man/man7/tbl-mdocml.7
-mv $PKG/usr/man/man7/eqn.7 $PKG/usr/man/man7/eqn-mdocml.7
+make install \
+	DESTDIR=$PKG \
+	PREFIX=/usr \
+	LIBDIR=/usr/lib${LIBDIRSUFFIX}
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -108,7 +96,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mdocml/mdocml.info b/system/mdocml/mdocml.info
index e30c7eee9e..ce44097ded 100644
--- a/system/mdocml/mdocml.info
+++ b/system/mdocml/mdocml.info
@@ -1,8 +1,8 @@
 PRGNAM="mdocml"
-VERSION="1.13.1"
+VERSION="1.13.3"
 HOMEPAGE="http://mdocml.bsd.lv/"
-DOWNLOAD="http://mdocml.bsd.lv/snapshots/mdocml-1.13.1.tar.gz"
-MD5SUM="8f9c366a95a568026f14eab45f3dfa9b"
+DOWNLOAD="http://mdocml.bsd.lv/snapshots/mdocml-1.13.3.tar.gz"
+MD5SUM="7be80e1116a11abe2aabd6b2f04434ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""