From 827643d4bb8f5f83c28919b7df0d42108769e37d Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 15 Jun 2006 20:40:15 +0000 Subject: Split out deinstall portions of INSTALL scripts into DEINSTALL scripts. This avoids the need for a confusing line of the form: DEINSTALL_TEMPLATE+= path/to/INSTALL in the package Makefile, and actually removes the need to specify it altogether since by convention, the existence of the DEINSTALL script is enough to add it to DEINSTALL_TEMPLATE. --- mail/mutt/DEINSTALL | 7 +++++++ mail/mutt/INSTALL | 6 +----- mail/mutt/Makefile | 3 +-- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 mail/mutt/DEINSTALL (limited to 'mail/mutt') diff --git a/mail/mutt/DEINSTALL b/mail/mutt/DEINSTALL new file mode 100644 index 00000000000..37c6800c5a5 --- /dev/null +++ b/mail/mutt/DEINSTALL @@ -0,0 +1,7 @@ +# $NetBSD: DEINSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $ + +case ${STAGE} in +DEINSTALL) + ${RM} -f @DOCDIR@/samples + ;; +esac diff --git a/mail/mutt/INSTALL b/mail/mutt/INSTALL index cba0b055973..ce15b7d4513 100644 --- a/mail/mutt/INSTALL +++ b/mail/mutt/INSTALL @@ -1,12 +1,8 @@ -# $NetBSD: INSTALL,v 1.3 2004/08/05 07:19:25 jlam Exp $ +# $NetBSD: INSTALL,v 1.4 2006/06/15 20:40:16 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 d36c499eade..234b4b9f45b 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.140 2006/05/22 07:00:55 rillig Exp $ +# $NetBSD: Makefile,v 1.141 2006/06/15 20:40:16 jlam Exp $ DISTNAME= mutt-1.4.2.1i PKGNAME= ${DISTNAME:C/i$//} @@ -71,7 +71,6 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh LDFLAGS+= ${_STRIPFLAG_CC} -DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL DOCDIR= ${PREFIX}/share/doc/mutt EGDIR= ${PREFIX}/share/examples/mutt CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc -- cgit v1.2.3