1 files changed, 19 insertions, 6 deletions
diff --git a/system/mdocml/mdocml.SlackBuild b/system/mdocml/mdocml.SlackBuild
index c77f973c5e..329b4071eb 100644
--- a/system/mdocml/mdocml.SlackBuild
+++ b/system/mdocml/mdocml.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mdocml
-VERSION=${VERSION:-1.12.3}
+VERSION=${VERSION:-1.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,12 +68,23 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p0 <$CWD/patches/00-Makefile_Linux.diff
+# XXX We can get back to "Slackware Linux" for OSNAME with 1.13.2
+CFLAGS=$SLKCFLAGS' -DOSNAME="\"Slackware\""' \
+	make
+make install DESTDIR=$PKG PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX}/mdocml
 
-CFLAGS="$SLKCFLAGS "'-DOSNAME="\"Slackware Linux\""' make
-make install DESTDIR=$PKG PREFIX=/usr
+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
+mv $PKG/usr/man/man1/apropos.1 $PKG/usr/man/man1/apropos-mdocml.1
 
 # don't conflict with stock groff
 mv $PKG/usr/bin/preconv $PKG/usr/bin/preconv-mdocml
@@ -81,7 +92,8 @@ 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
 
 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
@@ -95,6 +107,7 @@ 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}