system/mdocml: Updated for version 1.13.1.

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

5 files changed, 91 insertions, 29 deletions

diff --git a/system/mdocml/doinst.sh b/system/mdocml/doinst.sh
new file mode 100644
index 0000000000..a4357e61d3
--- /dev/null
+++ b/system/mdocml/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/mandoc.conf.new
diff --git a/system/mdocml/mandoc.conf.new b/system/mdocml/mandoc.conf.new
new file mode 100644
index 0000000000..1bfd5d2e89
--- /dev/null
+++ b/system/mdocml/mandoc.conf.new
@@ -0,0 +1,55 @@
+#	$OpenBSD: man.conf,v 1.20 2014/02/24 20:11:53 espie Exp $
+
+# Sheer, raging paranoia...
+_version	BSD.2
+
+# The whatis/apropos database.
+_whatdb		/usr/share/man/whatis.db
+_whatdb		/usr/local/man/whatis.db
+_whatdb		/usr/X11R6/man/whatis.db
+
+# Subdirectories for paths ending in '/', IN SEARCH ORDER.
+_subdir		{cat,man}1 {cat,man}8 {cat,man}6 {cat,man}2 {cat,man}3 {cat,man}5 {cat,man}7 {cat,man}4 {cat,man}9 {cat,man}3p {cat,man}3f {cat,man}n
+
+# Files typed by suffix and their commands.
+# Note the order: .Z must come after .[1-9n].Z, or it will match first.
+_suffix		.0
+_build		.0.Z		/bin/zcat %s
+_build		.0.gz		/bin/zcat %s
+_build		.[1-9n]		/usr/bin/mandoc %s
+_build		.[1-9n].Z	/bin/zcat %s | /usr/bin/mandoc
+_build		.[1-9n].gz	/bin/zcat %s | /usr/bin/mandoc
+_build		.[1-9][a-z]	/usr/bin/mandoc %s
+_build		.[1-9][a-z].Z	/bin/zcat %s | /usr/bin/mandoc
+_build		.[1-9][a-z].gz	/bin/zcat %s | /usr/bin/mandoc
+_build		.tbl		/usr/bin/mandoc %s
+_build		.tbl.Z		/bin/zcat %s | /usr/bin/mandoc
+_build		.tbl.gz		/bin/zcat %s | /usr/bin/mandoc
+
+# Sections and their directories.
+# All paths ending in '/' are the equivalent of entries specifying that
+# directory with all of the subdirectories listed for the keyword _subdir.
+
+# default
+_default	/usr/{share,X11R6,local,ports/infrastructure}/man/
+
+# Other sections that represent complete man subdirectories.
+X11		/usr/X11R6/man/
+X11R6		/usr/X11R6/man/
+local		/usr/local/man/
+
+# Specific section/directory combinations.
+1		/usr/{share,X11R6,local}/man/{cat,man}1
+2		/usr/{share,X11R6,local}/man/{cat,man}2
+3		/usr/{share,X11R6,local}/man/{cat,man}3
+3F		/usr/local/man/{cat,man}3f
+3f		/usr/local/man/{cat,man}3f
+3P		/usr/{share,local}/man/{cat,man}3p
+3p		/usr/{share,local}/man/{cat,man}3p
+4		/usr/{share,X11R6,local}/man/{cat,man}4
+5		/usr/{share,X11R6,local}/man/{cat,man}5
+6		/usr/{share,X11R6,local}/man/{cat,man}6
+7		/usr/{share,X11R6,local}/man/{cat,man}7
+8		/usr/{share,X11R6,local}/man/{cat,man}8
+9		/usr/share/man/{cat,man}9
+n		/usr/local/man/{cat,man}n
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}
diff --git a/system/mdocml/mdocml.info b/system/mdocml/mdocml.info
index a5f745de03..e30c7eee9e 100644
--- a/system/mdocml/mdocml.info
+++ b/system/mdocml/mdocml.info
@@ -1,8 +1,8 @@
 PRGNAM="mdocml"
-VERSION="1.12.3"
+VERSION="1.13.1"
 HOMEPAGE="http://mdocml.bsd.lv/"
-DOWNLOAD="http://mdocml.bsd.lv/snapshots/mdocml-1.12.3.tar.gz"
-MD5SUM="5e805fc6b261b8374ce21d191721bf80"
+DOWNLOAD="http://mdocml.bsd.lv/snapshots/mdocml-1.13.1.tar.gz"
+MD5SUM="8f9c366a95a568026f14eab45f3dfa9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mdocml/patches/00-Makefile_Linux.diff b/system/mdocml/patches/00-Makefile_Linux.diff
deleted file mode 100644
index 4f411d6b80..0000000000
--- a/system/mdocml/patches/00-Makefile_Linux.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2014-01-06 15:05:19.565762653 +0100
-+++ Makefile	2014-01-06 15:05:28.701192221 +0100
-@@ -29,7 +29,7 @@ CFLAGS	 	+= -DUSE_WCHAR
- # for example on Mac OS X.
- STATIC		 = -static
- # Linux requires -pthread to statically link with libdb.
--#STATIC		+= -pthread
-+STATIC		+= -pthread
- 
- CFLAGS		+= -g -DHAVE_CONFIG_H
- CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
-@@ -54,7 +54,7 @@ INSTALL_MAN	 = $(INSTALL_DATA)
- # However, if you don't have -ldb at all (or it's not native), then
- # comment out apropos and mandocdb. 
- #
--#DBLIB		 = -ldb
-+DBLIB		 = -ldb
- DBBIN		 = apropos mandocdb man.cgi catman whatis
- DBLN		 = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln
-