[pkgsrc/trunk]: pkgsrc/mail/metamail Add DESTDIR support and clean up, based ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9481e5b14b7
branches:  trunk
changeset: 542265:b9481e5b14b7
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat May 10 11:52:14 2008 +0000

description:
Add DESTDIR support and clean up, based on PR 38520.

diffstat:

 mail/metamail/Makefile         |  11 +++++------
 mail/metamail/distinfo         |   4 ++--
 mail/metamail/patches/patch-aa |   4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diffs (82 lines):

diff -r 8b3d995d1c7d -r b9481e5b14b7 mail/metamail/Makefile
--- a/mail/metamail/Makefile    Sat May 10 09:07:21 2008 +0000
+++ b/mail/metamail/Makefile    Sat May 10 11:52:14 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/12/22 19:12:27 minskim Exp $
+# $NetBSD: Makefile,v 1.45 2008/05/10 11:52:14 obache Exp $
 
 DISTNAME=      mm2.7
 PKGNAME=       metamail-2.7
@@ -14,12 +14,13 @@
 CONFLICTS+=    elm>=2.5.5 mm-2.7
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 
 CFLAGS.Linux+= -DLINUX
 CFLAGS.SunOS+= -DSYSV
-MAKE_ENV+=     PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} CHMOD=${CHMOD:Q} SED=${SED:Q}
+MAKE_ENV+=     PKG_SYSCONFDIR=${PKG_SYSCONFDIR} CHMOD=${CHMOD:Q} SED=${SED:Q}
 
 EGDIR=         ${PREFIX}/share/examples/metamail
 CONF_FILES=    ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
@@ -36,7 +37,7 @@
 REPLACE_FILES.csh+=    bin/sun-to-mime
 REPLACE_FILES.csh+=    fonts/Xmailto-hebrew fonts/Xshownonascii
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 ${EGDIR}
 
 SUBST_CLASSES+=                awk sys
 SUBST_STAGE.awk=       post-patch
@@ -52,6 +53,7 @@
        ${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
 
 pre-configure:
+       set -e;                                                         \
        if ${GREP} putenv /usr/include/stdlib.h >/dev/null;             \
        then                                                            \
                cd ${WRKSRC}/metamail;                                  \
@@ -59,7 +61,4 @@
                ${SED} -e s/putenv.o//g Makefile.pre-sed >Makefile;     \
        fi
 
-pre-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff -r 8b3d995d1c7d -r b9481e5b14b7 mail/metamail/distinfo
--- a/mail/metamail/distinfo    Sat May 10 09:07:21 2008 +0000
+++ b/mail/metamail/distinfo    Sat May 10 11:52:14 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2006/09/16 15:29:35 hira Exp $
+$NetBSD: distinfo,v 1.22 2008/05/10 11:52:14 obache Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 RMD160 (mm2.7.tar.Z) = ae322cad0653140cbe7f0148ce48757df98c26b0
 Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = 48a10ec31e170ecc79be648c09c0fb25a4770a7b
+SHA1 (patch-aa) = 6f1d8f9cd5773deb3a050cecdc8a57718c953e0b
 SHA1 (patch-ab) = 15dd81405551f4d7d3c0e59cf49038857603a9eb
 SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e
 SHA1 (patch-ad) = 1f152ab38d3c2da42afdb3b3c6a1b218ac8d3996
diff -r 8b3d995d1c7d -r b9481e5b14b7 mail/metamail/patches/patch-aa
--- a/mail/metamail/patches/patch-aa    Sat May 10 09:07:21 2008 +0000
+++ b/mail/metamail/patches/patch-aa    Sat May 10 11:52:14 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.13 2006/07/21 08:24:29 tron Exp $
+$NetBSD: patch-aa,v 1.14 2008/05/10 11:52:14 obache Exp $
 
 --- Makefile.orig      1994-01-26 11:32:33.000000000 -0600
 +++ Makefile   2006-07-20 22:10:32.000000000 -0500
@@ -51,7 +51,7 @@
  
  # Root of installation tree
 -INSTROOT = /usr/local
-+INSTROOT = ${PREFIX}
++INSTROOT = ${DESTDIR}${PREFIX}
  #
  # This is where binaries should be copied
  LOCALBINDIR = ${INSTROOT}/bin