From 6fce2389370d1ab263035bd8b611137cffac8ecf Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 30 Jan 2002 23:05:45 +0000 Subject: * Use the general INSTALL/DEINSTALL scripts * Honor ${PKG_SYSCONFDIR} for the location of the config files (Muttrc, mime.types). * Rearrange lines slightly to minimize differences between mutt/Makefile and mutt-devel/Makefile to simplify updating mutt when the next release (1.4?) is released. --- mail/mutt-devel/DEINSTALL | 68 ----------------------------------------------- mail/mutt-devel/INSTALL | 57 --------------------------------------- mail/mutt-devel/Makefile | 28 +++++++------------ mail/mutt/DEINSTALL | 68 ----------------------------------------------- mail/mutt/INSTALL | 57 --------------------------------------- mail/mutt/Makefile | 30 +++++++-------------- 6 files changed, 19 insertions(+), 289 deletions(-) delete mode 100644 mail/mutt-devel/DEINSTALL delete mode 100644 mail/mutt-devel/INSTALL delete mode 100644 mail/mutt/DEINSTALL delete mode 100644 mail/mutt/INSTALL diff --git a/mail/mutt-devel/DEINSTALL b/mail/mutt-devel/DEINSTALL deleted file mode 100644 index 518190853f6..00000000000 --- a/mail/mutt-devel/DEINSTALL +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:00:39 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/doc/mutt/samples -CONFDIR=${PKG_PREFIX}/etc -CONFFILES="Muttrc" -NONCONFFILES="mime.types" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - if [ -n "${modified_files}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/mutt-devel/INSTALL b/mail/mutt-devel/INSTALL deleted file mode 100644 index f042d86359c..00000000000 --- a/mail/mutt-devel/INSTALL +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 01:00:39 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/doc/mutt/samples -CONFDIR=${PKG_PREFIX}/etc -CONFFILES="Muttrc" -NONCONFFILES="mime.types" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - echo "Installing configuration files:" - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if [ -f ${FILE} ] - then - echo " ${FILE} already exists" - else - echo " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - done - ${CAT} << EOF - -=========================================================================== -Some files you might need to customize include the following: - -EOF - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - echo " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 70047427e13..825f7870a27 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/01/25 14:15:59 tron Exp $ +# $NetBSD: Makefile,v 1.21 2002/01/30 23:05:47 jlam Exp $ DISTNAME= mutt-1.3.27i PKGNAME= ${DISTNAME:C/i$//} @@ -17,7 +17,8 @@ BUILD_USES_MSGFMT= YES USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/mutt \ +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ + --with-docdir=${PREFIX}/share/doc/mutt \ --without-included-gettext \ --enable-pop --enable-imap @@ -27,13 +28,11 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//} .include "../../mk/bsd.prefs.mk" .if defined(MUTT_USE_SLANG) && ${MUTT_USE_SLANG} != NO -CONFIGURE_ARGS+= --with-slang=${BUILDLINK_DIR} - .include "../../devel/libslang/buildlink.mk" +CONFIGURE_ARGS+= --with-slang=${BUILDLINK_DIR} .else -CONFIGURE_ARGS+= --with-curses=${BUILDLINK_DIR} - .include "../../devel/ncurses/buildlink.mk" +CONFIGURE_ARGS+= --with-curses=${BUILDLINK_DIR} .endif # There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead. @@ -51,26 +50,17 @@ CONFIGURE_ARGS+= --without-ssl .endif BUILD_DEFS+= MUTT_USE_SLANG MUTT_USE_SSL -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -FILES_SUBST= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} - -pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} +EGDIR= ${PREFIX}/share/doc/mutt/samples +CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc +SUPPORT_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types post-install: ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples ${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../converters/libiconv/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mutt/DEINSTALL b/mail/mutt/DEINSTALL deleted file mode 100644 index 4f319ee3d78..00000000000 --- a/mail/mutt/DEINSTALL +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:00:37 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/doc/mutt/samples -CONFDIR=${PKG_PREFIX}/etc -CONFFILES="Muttrc" -NONCONFFILES="mime.types" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - if [ -n "${modified_files}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/mutt/INSTALL b/mail/mutt/INSTALL deleted file mode 100644 index 80abc193485..00000000000 --- a/mail/mutt/INSTALL +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 01:00:37 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/doc/mutt/samples -CONFDIR=${PKG_PREFIX}/etc -CONFFILES="Muttrc" -NONCONFFILES="mime.types" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - echo "Installing configuration files:" - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if [ -f ${FILE} ] - then - echo " ${FILE} already exists" - else - echo " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - done - ${CAT} << EOF - -=========================================================================== -Some files you might need to customize include the following: - -EOF - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - echo " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 9511afe2621..8272b8c9ea7 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2002/01/02 08:36:55 tron Exp $ +# $NetBSD: Makefile,v 1.77 2002/01/30 23:05:46 jlam Exp $ DISTNAME= mutt-1.2.5.1 CATEGORIES= mail @@ -17,13 +17,14 @@ BUILD_USES_MSGFMT= YES USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/mutt \ - --enable-pop --enable-imap \ - --without-included-gettext +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ + --with-docdir=${PREFIX}/share/doc/mutt \ + --without-included-gettext \ + --enable-pop --enable-imap CONFIGURE_ARGS+= --with-curses=${BUILDLINK_DIR} LDFLAGS+= ${STRIPFLAG} -WRKSRC= ${WRKDIR}/${DISTNAME:S/i//} +WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//} .include "../../mk/bsd.prefs.mk" @@ -35,7 +36,6 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh MUTT_USE_SSL?= YES .if defined(MUTT_USE_SSL) && ${MUTT_USE_SSL} == "YES" -#USE_SSL= YES .include "../../security/openssl/buildlink.mk" CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} .else @@ -44,26 +44,16 @@ CONFIGURE_ARGS+= --without-ssl BUILD_DEFS+= MUTT_USE_SSL -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} - -pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} +EGDIR= ${PREFIX}/share/doc/mutt/samples +CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc +SUPPORT_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types post-install: ${TOUCH} ${TOUCH_FLAGS} ${PREFIX}/share/mutt/.directory ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples ${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3