Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/mail/nmh/Makefile	1999/05/03 23:39:22	1.26
+++ pkgsrc/mail/nmh/Makefile	2000/03/02 05:23:54	1.35
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.26 1999/05/03 23:39:22 tv Exp $
+# $NetBSD: Makefile,v 1.35 2000/03/02 05:23:54 kim Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
-DISTNAME=	nmh-1.0
+DISTNAME=	nmh-1.0.3
 CATEGORIES=	mail
-MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/nmh/
+MASTER_SITES=	ftp://ftp.mhost.com/pub/nmh/ \
+		ftp://ftp.gw.com/pub/unix/mail/mh/nmh/
 
-MAINTAINER=     kim@tac.nyc.ny.us
+MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.math.gatech.edu/nmh/
 
+CONFLICTS=	ja-mh-*
+
 # We choose DOT_LOCKING in our patches because ".lock" files are
 # the most common locking mechanism supported by mail software.
 # It also works well over NFS.
@@ -28,20 +31,24 @@ CONFIGURE_ARGS+= \
 		--with-mts=${NMH_MTA}
 
 .ifdef NMH_EDITOR
-CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR}
+CONFIGURE_ARGS+=--with-editor=${NMH_EDITOR}
 .endif
 
 .ifdef NMH_PAGER
-CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
+CONFIGURE_ARGS+=--with-pager=${NMH_PAGER}
 .endif
 
-.if defined(USE_KERBEROS4)
+.if defined(KERBEROS) && ${KERBEROS} == 4
+USE_KERBEROS=	yes
 CONFIGURE_ARGS+=--with-krb4=yes
-RESTRICTED=	uses Kerberos encryption code
+.else
+CONFIGURE_ARGS+=--with-krb4=no
 .endif
 
 DOCDIR=		share/doc/nmh
 
+BUILD_DEFS+=	NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
+
 # Since we patch the autoconf files as well as their outputs, avoid attempt
 # to regenerate header input files with 'autoheader' by Makefile.
 post-patch:
@@ -54,12 +61,31 @@ post-configure:
 	    < ${WRKSRC}/config.h.bak > ${WRKSRC}/config.h
 .endif
 
+# ABOUT CONFIGURATION FILES:
+# - mhn.defaults is generated by nmh during make; we don't use that
+#   copy because its contents depend on what happened to be installed
+#   on the build system; we want a reliably reconstructable package
+# - mhn.defaults and mts.conf are only created if they don't exist;
+#   the PLIST only has mhn.defaults.dist and mts.conf.dist, so that
+#   local modifications to the configuration files won't get lost on
+#   upgrading the package
+
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
 	@for f in `grep '^${DOCDIR}/' ${PKGDIR}/PLIST`; do \
 	    ${INSTALL_DATA} ${WRKSRC}/`basename $$f` ${PREFIX}/${DOCDIR}; \
 	done
-	@${INSTALL_DATA} ${FILESDIR}/mhn.defaults ${PREFIX}/etc/nmh
-	@PKG_PREFIX='${PREFIX}' sh -f ${PKGDIR}/INSTALL
+	@${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist ${PREFIX}/etc/nmh
+	@if [ ! -f ${PREFIX}/etc/nmh/mhn.defaults ]; then \
+	    cp -p \
+		${PREFIX}/etc/nmh/mhn.defaults.dist \
+		${PREFIX}/etc/nmh/mhn.defaults; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/nmh/mts.conf ]; then \
+	    cp -p \
+		${PREFIX}/etc/nmh/mts.conf.dist \
+		${PREFIX}/etc/nmh/mts.conf; \
+	fi
+	@PKG_PREFIX='${PREFIX}' ${SH} -f ${PKGDIR}/INSTALL
 
 .include "../../mk/bsd.pkg.mk"