Make the mail/mutt and mail/mutt-devel packages more closely resemble each

other to facilitate easier updates of the mail/mutt package when the next
mutt is released.  The changes to mail/mutt include:

  * convert mail/mutt to use bsd.options.mk
  * remove unnecessary patches and use subst.mk instead

Approved by <tron>.

9 files changed, 133 insertions, 201 deletions

diff --git a/mail/mutt/INSTALL b/mail/mutt/INSTALL
new file mode 100644
index 00000000000..cba0b055973
--- /dev/null
+++ b/mail/mutt/INSTALL
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.3 2004/08/05 07:19:25 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${RM} -f @DOCDIR@/samples
+	${LN} -sf ../../examples/mutt @DOCDIR@/samples
+	;;
+
+DEINSTALL)
+	${RM} -f @DOCDIR@/samples
+	;;
+esac
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index c8a88184c60..5f1752ba840 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2004/07/17 00:33:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.121 2004/08/05 07:19:25 jlam Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -13,83 +13,83 @@ MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.mutt.org/
 COMMENT=		Text-based MIME mail client with PGP support
 
-BUILD_USES_MSGFMT=	yes
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+.include "../../mk/bsd.prefs.mk"
+
 WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
+BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK3=		yes
-USE_PKGINSTALL=		yes
-GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
-			--with-docdir=${PREFIX}/share/doc/mutt \
-			--without-included-gettext \
-			--enable-pop --enable-imap
 
-LDFLAGS+=		${_STRIPFLAG_CC}
-PLIST_SRC=		${WRKDIR}/PLIST
-
-.include "../../mk/bsd.prefs.mk"
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}			\
+			--with-docdir=${PREFIX}/share/doc/mutt		\
+			--without-included-gettext			\
+			--enable-pop					\
+			--enable-imap
 
 .if (${OPSYS} == "SunOS")
 CONFIGURE_ARGS+=	--without-wc-funcs
 .endif
 
-.if ${MUTT_USE_SLANG} == YES
-. include "../../devel/libslang/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
-.else
-. if ${MUTT_USE_NCURSES} == YES
-USE_NCURSES=		yes
-. endif
-. include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
-.endif
-
-# There is a problem using NetBSD's /bin/sh under old NetBSD releases,
-# so use /bin/ksh there.
+# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
+# there.
+#
 .if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
 CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 .endif
 
-.if ${MUTT_USE_SSL} == YES
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
-.else
-CONFIGURE_ARGS+=	--without-ssl
-.endif
-
-.if defined(USE_SASL) && ${USE_SASL} == "YES"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-.endif
+.include "options.mk"
 
-BUILD_DEFS+=		MUTT_USE_NCURSES MUTT_USE_SLANG MUTT_USE_SSL USE_SASL
+LDFLAGS+=		${_STRIPFLAG_CC}
 
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DOCDIR=			${PREFIX}/share/doc/mutt
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+FILES_SUBST+=		DOCDIR=${DOCDIR}
+
+.if exists(${WRKSRC}/mutt_dotlock)
+PLIST_SUBST+=		MUTT_DOTLOCK=
+.else
+PLIST_SUBST+=		MUTT_DOTLOCK="@comment "
+.endif
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
-post-extract:
-	${MV} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/mutt.man.in
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 
-pre-build:
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" \
-		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
-		< ${WRKSRC}/doc/mutt.man.in > ${WRKSRC}/doc/mutt.man
+# Fix some absolute paths in installed files.
+post-build:
+	for file in ${WRKSRC}/contrib/gpg.rc; do			\
+		${MV} -f $$file $$file.save;				\
+		${SED}	-e "s,/usr/bin/gpg,gpg,g"			\
+			$$file.save > $$file;				\
+	done
+	for file in ${WRKSRC}/doc/mutt.man; do				\
+		${MV} -f $$file $$file.save;				\
+		${SED}	-e "s,/etc/,${PKG_SYSCONFDIR}/,g"		\
+			-e "s,/usr/local/doc/mutt/,${DOCDIR}/,g"	\
+			-e "s,/usr/local/,${PREFIX}/,g"			\
+			$$file.save > $$file;				\
+	done
+
+# Pre-create some directories and symlinks used during the installation
+# process.
+#
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${RM} -f ${DOCDIR}/samples
+	${LN} -sf ${EGDIR} ${DOCDIR}/samples
 
-post-install:
-	${RM} -f ${PREFIX}/share/doc/mutt/samples
-	${LN} -f -s ${EGDIR} ${PREFIX}/share/doc/mutt/samples
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	@if [ -f ${PREFIX}/bin/mutt_dotlock ]; then \
-		${ECHO} "bin/mutt_dotlock" >> ${PLIST_SRC}; \
-	fi
 .if (${PKG_INSTALLATION_TYPE} == "pkgviews")
+post-install:
 	${MV} ${PREFIX}/man/man5/mutt-mbox.5 ${PREFIX}/man/man5/mbox.5
 .endif
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index b90c1c52e9d..d34c7147fc6 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2004/07/17 00:33:15 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/08/05 07:19:25 jlam Exp $
 bin/flea
 bin/mutt
 bin/muttbug
+${MUTT_DOTLOCK}bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
 man/man1/flea.1
@@ -31,7 +32,6 @@ share/doc/mutt/html/manual-7.html
 share/doc/mutt/html/manual.html
 share/doc/mutt/manual.txt
 share/doc/mutt/patch-notes.txt
-share/doc/mutt/samples
 share/examples/mutt/Mush.rc
 share/examples/mutt/Muttrc
 share/examples/mutt/Pine.rc
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 956cf739455..5453c5072e7 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.21 2004/07/17 00:33:15 schmonz Exp $
+$NetBSD: distinfo,v 1.22 2004/08/05 07:19:25 jlam Exp $
 
 SHA1 (mutt-1.4.2.1i.tar.gz) = 10fae2eef5a671d1ea6e17acd6e64cd1f37c3961
 Size (mutt-1.4.2.1i.tar.gz) = 2611253 bytes
 SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812
-SHA1 (patch-ab) = e0d3c5b90c94a501436aa037f5538c4ab12b04bc
+SHA1 (patch-ab) = af70e8e81b19b93cfcf753bfdcb3cdb62bd3797a
 SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
-SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
-SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
-SHA1 (patch-af) = 645b4f363ef47ac31335f15cdfc6e4c87542bcab
 SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1
 SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
 SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
new file mode 100644
index 00000000000..f0b073f8d58
--- /dev/null
+++ b/mail/mutt/options.mk
@@ -0,0 +1,57 @@
+# $NetBSD: options.mk,v 1.1 2004/08/05 07:19:25 jlam Exp $
+
+# Global and legacy options
+.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \
+    defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL)
+.  if !defined(PKG_OPTIONS.mutt)
+.    if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
+PKG_OPTIONS.mutt+=	slang
+.    endif
+.    if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
+PKG_OPTIONS.mutt+=	ncurses
+.    endif
+.    if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
+PKG_OPTIONS.mutt+=	ssl
+.    endif
+.    if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
+PKG_OPTIONS.mutt+=	sasl
+.    endif
+.  endif
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
+PKG_OPTIONS.mutt?=	ssl
+PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl
+.include "../../mk/bsd.options.mk"
+
+###
+### Slang and ncurses
+###
+.if !empty(PKG_OPTIONS:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
+.else
+.  if !empty(PKG_OPTIONS:Mncurses)
+USE_NCURSES=		yes
+.  endif
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
+.endif
+
+###
+### SASLv1
+###
+.if !empty(PKG_OPTIONS:Msasl)
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+.endif
+
+###
+### SSL
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=	--without-ssl
+.endif
diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab
index b62c781e548..8c64eaaef4d 100644
--- a/mail/mutt/patches/patch-ab
+++ b/mail/mutt/patches/patch-ab
@@ -1,26 +1,21 @@
-$NetBSD: patch-ab,v 1.10 2002/12/01 15:38:00 salo Exp $
+$NetBSD: patch-ab,v 1.11 2004/08/05 07:19:25 jlam Exp $
 
---- Makefile.in.orig	Wed May 29 11:31:04 2002
-+++ Makefile.in	Sun Dec  1 16:25:32 2002
-@@ -23,9 +23,11 @@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples/@PACKAGE@
-+realsysconfdir = @sysconfdir@
+--- Makefile.in.orig	Thu Feb 12 03:52:26 2004
++++ Makefile.in
+@@ -26,6 +26,7 @@ datadir = @datadir@
+ sysconfdir = @sysconfdir@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
 +localedir = $(prefix)/share/locale
  libdir = @libdir@
  infodir = @infodir@
  mandir = @mandir@
-@@ -139,7 +141,7 @@
+@@ -139,7 +140,7 @@ makedoc_DEPENDENCIES = 
  
  CPP = @CPP@
  
 -DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" 	-DHAVE_CONFIG_H=1
-+DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(realsysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H=1
++DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H=1
  
  
  INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad
deleted file mode 100644
index a3ebde7181a..00000000000
--- a/mail/mutt/patches/patch-ad
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2002/11/27 19:05:40 jmmv Exp $
-
---- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in
-@@ -12,6 +12,7 @@ libdir = @libdir@
- mandir = @mandir@
- srcdir = @srcdir@
- docdir = @docdir@
-+egdir = @datadir@/examples/@PACKAGE@
- top_srcdir = @top_srcdir@
- top_builddir = ..
- INSTALL = @INSTALL@
-@@ -37,12 +38,12 @@ distclean:
- check:
- 
- install:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(egdir) $(DESTDIR)$(egdir)/iconv
- 	for f in $(SAMPLES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
-+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(egdir) ;	\
- 	done
- 	for f in $(srcdir)/iconv/*.rc ; do					\
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-+		$(INSTALL) -m 644 $$f $(DESTDIR)$(egdir)/iconv	  ;	\
- 	done
- 
- # Nothing needs to be done - uninstall in doc removes samples as well.
diff --git a/mail/mutt/patches/patch-ae b/mail/mutt/patches/patch-ae
deleted file mode 100644
index 5578706213c..00000000000
--- a/mail/mutt/patches/patch-ae
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/05/29 12:13:53 tron Exp $
-
---- contrib/gpg.rc.orig	Tue Dec 11 10:33:57 2001
-+++ contrib/gpg.rc	Tue Apr 16 10:28:08 2002
-@@ -31,44 +31,44 @@
- # breaking PGP/MIME.
- 
- # decode application/pgp
--set pgp_decode_command="/usr/bin/gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
-+set pgp_decode_command="gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
- 
- # verify a pgp/mime signature
--set pgp_verify_command="/usr/bin/gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
-+set pgp_verify_command="gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
- 
- # decrypt a pgp/mime attachment
--set pgp_decrypt_command="/usr/bin/gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
-+set pgp_decrypt_command="gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
- 
- # create a pgp/mime signed attachment
--# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
--set pgp_sign_command="/usr/bin/gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-+# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-+set pgp_sign_command="gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
- 
- # create a application/pgp signed (old-style) message
--# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
--set pgp_clearsign_command="/usr/bin/gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-+# set pgp_clearsign_command="gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-+set pgp_clearsign_command="gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
- 
- # create a pgp/mime encrypted attachment
- # set pgp_encrypt_only_command="pgpewrap gpg-2comp  -v --batch  --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-+set pgp_encrypt_only_command="pgpewrap gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
- 
- # create a pgp/mime encrypted and signed attachment
- # set pgp_encrypt_sign_command="pgpewrap gpg-2comp  --passphrase-fd 0 -v --batch  --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-+set pgp_encrypt_sign_command="pgpewrap gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
- 
- # import a key into the public key ring
--set pgp_import_command="/usr/bin/gpg  --no-verbose --import -v %f"
-+set pgp_import_command="gpg  --no-verbose --import -v %f"
- 
- # export a key from the public key ring
--set pgp_export_command="/usr/bin/gpg   --no-verbose --export --armor %r"
-+set pgp_export_command="gpg   --no-verbose --export --armor %r"
- 
- # verify a key
--set pgp_verify_key_command="/usr/bin/gpg   --verbose --batch  --fingerprint --check-sigs %r"
-+set pgp_verify_key_command="gpg   --verbose --batch  --fingerprint --check-sigs %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
-+set pgp_list_pubring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
- 
- # read in the secret key ring
--set pgp_list_secring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
-+set pgp_list_secring_command="gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
- 
- # fetch keys
- # set pgp_getkeys_command="pkspxycwrap %r"
diff --git a/mail/mutt/patches/patch-af b/mail/mutt/patches/patch-af
deleted file mode 100644
index 4eb8811191e..00000000000
--- a/mail/mutt/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.4 2003/03/20 04:38:22 jschauma Exp $
-
---- doc/mutt.man.in.orig	Wed Mar 19 23:25:40 2003
-+++ doc/mutt.man.in	Wed Mar 19 23:27:11 2003
-@@ -124,21 +124,19 @@
- .PP
- .IP "~/.muttrc or ~/.mutt/muttrc"
- User configuration file.
--.IP "/etc/Muttrc"
-+.IP "@PKG_SYSCONFDIR@/Muttrc"
- System-wide configuration file.
- .IP "/tmp/muttXXXXXX"
- Temporary files created by Mutt.
- .IP "~/.mailcap"
- User definition for handling non-text MIME types.
--.IP "/etc/mailcap"
-+.IP "@PKG_SYSCONFDIR@/mailcap"
- System definition for handling non-text MIME types.
- .IP "~/.mime.types"
- User's personal mapping between MIME types and file extensions.
--.IP "/etc/mime.types"
-+.IP "@PKG_SYSCONFDIR@/mime.types"
- System mapping between MIME types and file extensions.
--.IP "/usr/local/bin/mutt_dotlock"
--The privileged dotlocking program.
--.IP "/usr/local/doc/mutt/manual.txt"
-+.IP "@PREFIX@/share/doc/mutt/manual.txt"
- The Mutt manual.
- .SH BUGS
- .PP
-@@ -174,7 +172,6 @@
- .BR mailcap (5),
- .BR maildir (5),
- .BR mbox (5),
--.BR mutt_dotlock (1),
- .BR muttrc (5),
- .BR ncurses (3),
- .BR sendmail (1),