2 files changed, 7 insertions, 34 deletions
diff --git a/source/ap/groff/groff.SlackBuild b/source/ap/groff/groff.SlackBuild
index 3cdb36f9c..b67eff1e6 100755
--- a/source/ap/groff/groff.SlackBuild
+++ b/source/ap/groff/groff.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2005-2008, 2009, 2010, 2011, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2008, 2009, 2010, 2011, 2016, 2018, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=groff
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -88,6 +88,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-appresdir=/etc/X11/app-defaults \
   --mandir=/usr/man \
   --infodir=/usr/info \
+  --with-x \
+  --with-appdefdir=/etc/X11/app-defaults \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
@@ -116,7 +118,9 @@ fi
 rm -rf $PKG/usr/doc/groff-$VERSION/*.ps \
   $PKG/usr/doc/groff-$VERSION/examples \
   $PKG/usr/doc/groff-$VERSION/html \
-  $PKG/usr/doc/groff-$VERSION/pdf
+  $PKG/usr/doc/groff-$VERSION/pdf \
+  $PKG/usr/doc/groff-$VERSION/groff-man-pages* \
+  $PKG/usr/doc/groff-$VERSION/groff.txt
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \+
@@ -126,12 +130,6 @@ rm -rf $PKG/usr/doc/groff-$VERSION/*.ps \
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
-# Do not use color ANSI output by default for man pages.
-# A silly "innovation" if ever there was one, sure to break
-# a ton of existing scripts otherwise...
-zcat $CWD/groff.man.mdoc.local.gz >> $PKG/usr/share/groff/site-tmac/man.local
-zcat $CWD/groff.man.mdoc.local.gz >> $PKG/usr/share/groff/site-tmac/mdoc.local
-
 ( cd $PKG/usr/bin
   rm -rf geqn ; ln -sf eqn geqn
   rm -rf gindxbib ; ln -sf indxbib gindxbib
@@ -151,4 +149,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/groff-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/ap/groff/groff.man.mdoc.local b/source/ap/groff/groff.man.mdoc.local
deleted file mode 100644
index 4de5a0f1a..000000000
--- a/source/ap/groff/groff.man.mdoc.local
+++ /dev/null
@@ -1,24 +0,0 @@
-.
-.if n \{\
-.  \" Map \(oq to ' rather than ` in nroff mode for devices other
-.  \" than utf8.
-.  if !'\*[.T]'utf8' \
-.    tr \[oq]'
-.
-.  \" Disable the use of SGR (ANSI colour) escape sequences by
-.  \" grotty.
-.  if '\V[GROFF_SGR]'' \
-.    output x X tty: sgr 0
-.
-.  \" Map \- to the Unicode HYPHEN-MINUS character, to make
-.  \" searching in man pages easier.
-.  if '\*[.T]'utf8' \
-.    char \- \N'45'
-.
-.  \" Many UTF-8 man pages use "-" instead of "\-" for dashes such as those
-.  \" in command-line options. This is a bug in those pages, but if you want
-.  \" all hyphens to be rendered as the ASCII-compatible HYPHEN-MINUS
-.  \" anyway, then uncomment this.
-.  \" if '\*[.T]'utf8' \
-.  \"   char - \N'45'
-.\}