diff options
| author | obache <obache@pkgsrc.org> | 2008-05-10 11:52:14 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2008-05-10 11:52:14 +0000 |
| commit | cdfbed07ad759e0adec707e86cc2db909f22891d (patch) | |
| tree | e43f157005797be3e8dc4200eef8139be11119a9 /mail | |
| parent | 3c622cd45eb4420807643262772509c9e36173c4 (diff) | |
| download | pkgsrc-cdfbed07ad759e0adec707e86cc2db909f22891d.tar.gz | |
Add DESTDIR support and clean up, based on PR 38520.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/metamail/Makefile | 11 | ||||
| -rw-r--r-- | mail/metamail/distinfo | 4 | ||||
| -rw-r--r-- | mail/metamail/patches/patch-aa | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile index 1bd64ce5cb2..e5b2a595a37 100644 --- a/mail/metamail/Makefile +++ b/mail/metamail/Makefile @@ -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 @@ COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions 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/showpicture bin/sun-audio-file bin/sun-message.csh 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 @@ post-patch: ${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 @@ pre-configure: ${SED} -e s/putenv.o//g Makefile.pre-sed >Makefile; \ fi -pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} - .include "../../mk/bsd.pkg.mk" diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo index fb273214069..3e0ab4725f6 100644 --- a/mail/metamail/distinfo +++ b/mail/metamail/distinfo @@ -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 --git a/mail/metamail/patches/patch-aa b/mail/metamail/patches/patch-aa index 7265a9e47df..61e188aa5ab 100644 --- a/mail/metamail/patches/patch-aa +++ b/mail/metamail/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.13 2006/07/21 08:24:29 tron Exp $ # Root of installation tree -INSTROOT = /usr/local -+INSTROOT = ${PREFIX} ++INSTROOT = ${DESTDIR}${PREFIX} # # This is where binaries should be copied LOCALBINDIR = ${INSTROOT}/bin |