pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/mutt Make the mail/mutt and mail/mutt-devel packa...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b63514f47219
branches: trunk
changeset: 479116:b63514f47219
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Aug 05 07:19:25 2004 +0000
description:
Make the mail/mutt and mail/mutt-devel packages more closely resemble each
other to facilitate easier updates of the mail/mutt package when the next
mutt is released. The changes to mail/mutt include:
* convert mail/mutt to use bsd.options.mk
* remove unnecessary patches and use subst.mk instead
Approved by <tron>.
diffstat:
mail/mutt/INSTALL | 12 ++++
mail/mutt/Makefile | 110 ++++++++++++++++++++++----------------------
mail/mutt/PLIST | 4 +-
mail/mutt/distinfo | 7 +--
mail/mutt/options.mk | 57 +++++++++++++++++++++++
mail/mutt/patches/patch-ab | 19 ++----
mail/mutt/patches/patch-ad | 28 -----------
mail/mutt/patches/patch-ae | 63 -------------------------
mail/mutt/patches/patch-af | 38 ---------------
9 files changed, 135 insertions(+), 203 deletions(-)
diffs (truncated from 442 to 300 lines):
diff -r 02d936b79ef8 -r b63514f47219 mail/mutt/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/INSTALL Thu Aug 05 07:19:25 2004 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.3 2004/08/05 07:19:25 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+ ${RM} -f @DOCDIR@/samples
+ ${LN} -sf ../../examples/mutt @DOCDIR@/samples
+ ;;
+
+DEINSTALL)
+ ${RM} -f @DOCDIR@/samples
+ ;;
+esac
diff -r 02d936b79ef8 -r b63514f47219 mail/mutt/Makefile
--- a/mail/mutt/Makefile Thu Aug 05 05:40:51 2004 +0000
+++ b/mail/mutt/Makefile Thu Aug 05 07:19:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2004/07/17 00:33:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.121 2004/08/05 07:19:25 jlam Exp $
DISTNAME= mutt-1.4.2.1i
PKGNAME= ${DISTNAME:C/i$//}
@@ -13,83 +13,83 @@
HOMEPAGE= http://www.mutt.org/
COMMENT= Text-based MIME mail client with PGP support
-BUILD_USES_MSGFMT= yes
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_INSTALLATION_TYPES= overwrite pkgviews
+.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//}
+BUILD_USES_MSGFMT= yes
USE_BUILDLINK3= yes
-USE_PKGINSTALL= yes
-GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
- --with-docdir=${PREFIX}/share/doc/mutt \
- --without-included-gettext \
- --enable-pop --enable-imap
-LDFLAGS+= ${_STRIPFLAG_CC}
-PLIST_SRC= ${WRKDIR}/PLIST
-
-.include "../../mk/bsd.prefs.mk"
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
+ --with-docdir=${PREFIX}/share/doc/mutt \
+ --without-included-gettext \
+ --enable-pop \
+ --enable-imap
.if (${OPSYS} == "SunOS")
CONFIGURE_ARGS+= --without-wc-funcs
.endif
-.if ${MUTT_USE_SLANG} == YES
-. include "../../devel/libslang/buildlink3.mk"
-CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
-.else
-. if ${MUTT_USE_NCURSES} == YES
-USE_NCURSES= yes
-. endif
-. include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
-.endif
-
-# There is a problem using NetBSD's /bin/sh under old NetBSD releases,
-# so use /bin/ksh there.
+# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
+# there.
+#
.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh
.endif
-.if ${MUTT_USE_SSL} == YES
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
+.include "options.mk"
+
+LDFLAGS+= ${_STRIPFLAG_CC}
-.if defined(USE_SASL) && ${USE_SASL} == "YES"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-.endif
-
-BUILD_DEFS+= MUTT_USE_NCURSES MUTT_USE_SLANG MUTT_USE_SSL USE_SASL
-
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
+INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
+DOCDIR= ${PREFIX}/share/doc/mutt
EGDIR= ${PREFIX}/share/examples/mutt
CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
SUPPORT_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-
-post-extract:
- ${MV} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/mutt.man.in
+FILES_SUBST+= DOCDIR=${DOCDIR}
-pre-build:
- ${SED} -e "s|@PREFIX@|${PREFIX}|g" \
- -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
- < ${WRKSRC}/doc/mutt.man.in > ${WRKSRC}/doc/mutt.man
+.if exists(${WRKSRC}/mutt_dotlock)
+PLIST_SUBST+= MUTT_DOTLOCK=
+.else
+PLIST_SUBST+= MUTT_DOTLOCK="@comment "
+.endif
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+# Fix some absolute paths in installed files.
+post-build:
+ for file in ${WRKSRC}/contrib/gpg.rc; do \
+ ${MV} -f $$file $$file.save; \
+ ${SED} -e "s,/usr/bin/gpg,gpg,g" \
+ $$file.save > $$file; \
+ done
+ for file in ${WRKSRC}/doc/mutt.man; do \
+ ${MV} -f $$file $$file.save; \
+ ${SED} -e "s,/etc/,${PKG_SYSCONFDIR}/,g" \
+ -e "s,/usr/local/doc/mutt/,${DOCDIR}/,g" \
+ -e "s,/usr/local/,${PREFIX}/,g" \
+ $$file.save > $$file; \
+ done
+
+# Pre-create some directories and symlinks used during the installation
+# process.
+#
+pre-install:
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${RM} -f ${DOCDIR}/samples
+ ${LN} -sf ${EGDIR} ${DOCDIR}/samples
+
+.if (${PKG_INSTALLATION_TYPE} == "pkgviews")
post-install:
- ${RM} -f ${PREFIX}/share/doc/mutt/samples
- ${LN} -f -s ${EGDIR} ${PREFIX}/share/doc/mutt/samples
- ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
- @if [ -f ${PREFIX}/bin/mutt_dotlock ]; then \
- ${ECHO} "bin/mutt_dotlock" >> ${PLIST_SRC}; \
- fi
-.if (${PKG_INSTALLATION_TYPE} == "pkgviews")
${MV} ${PREFIX}/man/man5/mutt-mbox.5 ${PREFIX}/man/man5/mbox.5
.endif
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 02d936b79ef8 -r b63514f47219 mail/mutt/PLIST
--- a/mail/mutt/PLIST Thu Aug 05 05:40:51 2004 +0000
+++ b/mail/mutt/PLIST Thu Aug 05 07:19:25 2004 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2004/07/17 00:33:15 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/08/05 07:19:25 jlam Exp $
bin/flea
bin/mutt
bin/muttbug
+${MUTT_DOTLOCK}bin/mutt_dotlock
bin/pgpewrap
bin/pgpring
man/man1/flea.1
@@ -31,7 +32,6 @@
share/doc/mutt/html/manual.html
share/doc/mutt/manual.txt
share/doc/mutt/patch-notes.txt
-share/doc/mutt/samples
share/examples/mutt/Mush.rc
share/examples/mutt/Muttrc
share/examples/mutt/Pine.rc
diff -r 02d936b79ef8 -r b63514f47219 mail/mutt/distinfo
--- a/mail/mutt/distinfo Thu Aug 05 05:40:51 2004 +0000
+++ b/mail/mutt/distinfo Thu Aug 05 07:19:25 2004 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.21 2004/07/17 00:33:15 schmonz Exp $
+$NetBSD: distinfo,v 1.22 2004/08/05 07:19:25 jlam Exp $
SHA1 (mutt-1.4.2.1i.tar.gz) = 10fae2eef5a671d1ea6e17acd6e64cd1f37c3961
Size (mutt-1.4.2.1i.tar.gz) = 2611253 bytes
SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812
-SHA1 (patch-ab) = e0d3c5b90c94a501436aa037f5538c4ab12b04bc
+SHA1 (patch-ab) = af70e8e81b19b93cfcf753bfdcb3cdb62bd3797a
SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
-SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
-SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
-SHA1 (patch-af) = 645b4f363ef47ac31335f15cdfc6e4c87542bcab
SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1
SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
diff -r 02d936b79ef8 -r b63514f47219 mail/mutt/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mutt/options.mk Thu Aug 05 07:19:25 2004 +0000
@@ -0,0 +1,57 @@
+# $NetBSD: options.mk,v 1.1 2004/08/05 07:19:25 jlam Exp $
+
+# Global and legacy options
+.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \
+ defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL)
+. if !defined(PKG_OPTIONS.mutt)
+. if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
+PKG_OPTIONS.mutt+= slang
+. endif
+. if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
+PKG_OPTIONS.mutt+= ncurses
+. endif
+. if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
+PKG_OPTIONS.mutt+= ssl
+. endif
+. if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
+PKG_OPTIONS.mutt+= sasl
+. endif
+. endif
+.endif
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
+PKG_OPTIONS.mutt?= ssl
+PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl
+.include "../../mk/bsd.options.mk"
+
+###
+### Slang and ncurses
+###
+.if !empty(PKG_OPTIONS:Mslang)
+. include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
+.else
+. if !empty(PKG_OPTIONS:Mncurses)
+USE_NCURSES= yes
+. endif
+. include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
+.endif
+
+###
+### SASLv1
+###
+.if !empty(PKG_OPTIONS:Msasl)
+. include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+.endif
+
+###
+### SSL
+###
+.if !empty(PKG_OPTIONS:Mssl)
+. include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+= --without-ssl
+.endif
diff -r 02d936b79ef8 -r b63514f47219 mail/mutt/patches/patch-ab
--- a/mail/mutt/patches/patch-ab Thu Aug 05 05:40:51 2004 +0000
+++ b/mail/mutt/patches/patch-ab Thu Aug 05 07:19:25 2004 +0000
@@ -1,26 +1,21 @@
-$NetBSD: patch-ab,v 1.10 2002/12/01 15:38:00 salo Exp $
+$NetBSD: patch-ab,v 1.11 2004/08/05 07:19:25 jlam Exp $
---- Makefile.in.orig Wed May 29 11:31:04 2002
-+++ Makefile.in Sun Dec 1 16:25:32 2002
-@@ -23,9 +23,11 @@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples/@PACKAGE@
-+realsysconfdir = @sysconfdir@
+--- Makefile.in.orig Thu Feb 12 03:52:26 2004
++++ Makefile.in
+@@ -26,6 +26,7 @@ datadir = @datadir@
+ sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
+localedir = $(prefix)/share/locale
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
-@@ -139,7 +141,7 @@
+@@ -139,7 +140,7 @@ makedoc_DEPENDENCIES =
CPP = @CPP@
-DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H=1
-+DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(realsysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H=1
++DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H=1
Home |
Main Index |
Thread Index |
Old Index