- Update from 1.0.4 (Apr 2000) to 1.3 (Jun 2008) (whew!).

  - many bug fixes
  - MM_CHARSET no longer needed; now uses iconv to decode RFC2047-encoded
    headers and convert to current locale.
  - various MIME improvements

- Take maintainership (ok'd by kim@).

- Replace DESCR with text from web site.

- Support user-destdir.

- Use --with-hash-backup instead of hacking config.h post-configure.

- Drop IRIX-specific part of fmt_scan.c patch-cd, and therefore drop patch-ck
  and IRIX bits in Makefile.

- A tmac.h conf file (wtf?) is no longer installed.

- Update what's installed to share/doc/nmh.

- Update PLIST for added/removed/renamed files.

- Patches:
  - Update patch-ca and patch-cd.

  - Remove errno patches, upstream since XXX: patch-aa, patch-ab, patch-ad,
    patch-ae, patch-ag, patch-ah, patch-ai, patch-aj, patch-ak, patch-al,
    patch-am, patch-an patch-ao, patch-ap, patch-aq, patch-ar, patch-as,
    patch-at, patch-au, patch-av, patch-aw, patch-ax, patch-az, patch-ba,
    patch-bb, patch-bc, patch-bd, patch-be, patch-bf, patch-bg, patch-bh,
    patch-bi

  - patch-aa also had a patch for some fgetstr problem on NetBSD which no
    longer seems to happen.

  - Remove patch-cb; GCOS_HACK is referenced nowhere in nmh code (only
    apparently outdated docs) or in any other pkgsrc patch; HAVE_SYS_PARAM_H
    is already elsewhere in config.h, and sys/param.h is included in nmh.h.

  - Remove patch-ce (http://savannah.nongnu.org/bugs/?1393 fixed in
    uip/sortm.c r1.7).

  - Remove patch-ci (fixed in uip/show.c r1.6).

  - Remove patch-cj; $(etcdir)/tmac.h is gone and the folders/flists problems
    were fixed (differently) in 2000.

  - Remove patch-ck (CPPFLAGS support for the IRIX-specific part of patch-cd.

1 files changed, 14 insertions, 17 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 20ddd8a3ebf..65137a089fb 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.67 2008/03/11 18:47:40 tnn Exp $
+# $NetBSD: Makefile,v 1.68 2008/08/08 23:41:22 epg Exp $
 
-DISTNAME=		nmh-1.0.4
-PKGREVISION=		7
+DISTNAME=		nmh-1.3
 CATEGORIES=		mail
-MASTER_SITES=		ftp://ftp.mhost.com/pub/nmh/ \
-			ftp://ftp.gw.com/pub/unix/mail/mh/nmh/
+MASTER_SITES=		http://savannah.nongnu.org/download/nmh/
 
-MAINTAINER=		kim@tac.nyc.ny.us
+MAINTAINER=		epg@NetBSD.org
 HOMEPAGE=		http://www.nongnu.org/nmh/
 COMMENT=		Cleaned up MH mailer suite
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		ja-mh-[0-9]*
 CONFLICTS+=		ja-mh6-[0-9]*
 
@@ -27,10 +27,6 @@ USE_TOOLS+=		lex
 CFLAGS+=		-O1
 .endif
 
-.if !empty(MACHINE_PLATFORM:MIRIX-5*)
-CPPFLAGS+=		-DIRIX5 # for a patch with extra typedefs
-.endif
-
 .include "options.mk"
 
 # Mail Transport Agent - either "smtp" or "sendmail"
@@ -62,7 +58,7 @@ CONFIGURE_ARGS+=	--without-krb4
 .endif
 
 DOCDIR=			share/doc/nmh
-EGDIR=		${PREFIX}/share/examples/nmh
+EGDIR=			${PREFIX}/share/examples/nmh
 
 BUILD_DEFS+=		NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
 
@@ -93,20 +89,21 @@ CONF_FILES=		# empty
 			scan.size		\
 			scan.time		\
 			scan.timely		\
-			scan.unseen		\
-			tmac.h
+			scan.unseen
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 # This hopefully makes sure the permissions and ownership are right.
 pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
 	for f in `${GREP} '^${DOCDIR}/' ${PKGDIR}/PLIST`; do \
-	    ${INSTALL_DATA} ${WRKSRC}/`${BASENAME} $$f` ${PREFIX}/${DOCDIR}; \
+	    ${INSTALL_DATA} ${WRKSRC}/docs/`${BASENAME} $$f` \
+		${DESTDIR}${PREFIX}/${DOCDIR}; \
 	done
-	${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist ${EGDIR}/mhn.defaults
+	${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist \
+	    ${DESTDIR}${EGDIR}/mhn.defaults
 
 .include "../../mk/bsd.pkg.mk"